Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/bsb/bsb_exception.ml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ let print (fmt : Format.formatter) (x : error) =
"File \"rescript.json\", line 1\n\
@{<error>Error:@} package @{<error>%s@} is not found\n\
It's the basic, required package. If you have it installed globally,\n\
Please run `npm link rescript` to make it available"
Run `npm link rescript` to make it available."
name
else
Format.fprintf fmt
Expand All @@ -64,7 +64,7 @@ let print (fmt : Format.formatter) (x : error) =
Format.fprintf fmt
"File %S, line %d:\n\
@{<error>Error:@} %s \n\
For more details, please check out the schema at \
For more details, check out the schema at \
https://rescript-lang.org/docs/manual/latest/build-configuration-schema"
pos.pos_fname pos.pos_lnum s
| Invalid_spec s ->
Expand Down
2 changes: 1 addition & 1 deletion compiler/core/js_packages_info.ml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ let get_output_dir (info : t) ~package_dir module_system =

let add_npm_package_path (packages_info : t) (s : string) : t =
if is_empty packages_info then
Bsc_args.bad_arg "please set package name first using -bs-package-name "
Bsc_args.bad_arg "Set package name first using -bs-package-name"
else
let handle_module_system module_system =
match module_system_of_string module_system with
Expand Down
2 changes: 1 addition & 1 deletion compiler/depends/bs_exception.ml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ let report_error ppf = function
| Bs_main_not_exist main -> Format.fprintf ppf "File %s not found " main
| Bs_package_not_found package ->
Format.fprintf ppf
"Package %s not found or %s/lib/ocaml does not exist or please set \
"Package %s not found or %s/lib/ocaml does not exist or set \
npm_config_prefix correctly"
package package
| Bs_invalid_path path -> Format.pp_print_string ppf ("Invalid path: " ^ path)
Expand Down
4 changes: 2 additions & 2 deletions compiler/ext/warnings.ml
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,11 @@ let message = function
| Unused_rec_flag -> "unused rec flag."
| Ambiguous_name ([s], tl, false) ->
s ^ " belongs to several types: " ^ String.concat " " tl
^ "\nThe first one was selected. Please disambiguate if this is wrong."
^ "\nThe first one was selected. Disambiguate if this is wrong."
| Ambiguous_name (_, _, false) -> assert false
| Ambiguous_name (_slist, tl, true) ->
"these field labels belong to several types: " ^ String.concat " " tl
^ "\nThe first one was selected. Please disambiguate if this is wrong."
^ "\nThe first one was selected. Disambiguate if this is wrong."
| Nonoptional_label s -> "the label " ^ s ^ " is not optional."
| Open_shadow_identifier (kind, s) ->
Printf.sprintf
Expand Down
2 changes: 1 addition & 1 deletion compiler/frontend/bs_ast_invariant.ml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let emit_external_warnings : iterator =
[{ptype_kind = Ptype_variant ({pcd_res = Some _} :: _)}] ) ->
Location.raise_errorf ~loc:str_item.pstr_loc
"GADTs require recursive type syntax.\n\
Please define your type using `type rec` instead of `type`.\n\
Define your type using `type rec` instead of `type`.\n\
Example: type rec t = ..."
| _ -> super.structure_item self str_item);
expr =
Expand Down
2 changes: 1 addition & 1 deletion compiler/ml/typemod.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@ let report_error ppf = function
| Cannot_eliminate_dependency mty ->
fprintf ppf
"@[This functor has type@ %a@ The parameter cannot be eliminated in the \
result type.@ Please bind the argument to a module identifier.@]"
result type.@ Bind the argument to a module identifier.@]"
modtype mty
| Signature_expected -> fprintf ppf "This module type is not a signature"
| Structure_expected mty ->
Expand Down
3 changes: 1 addition & 2 deletions compiler/syntax/src/jsx_v4.ml
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,7 @@ let map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding =
| Pexp_fun {arg_label = Labelled _ | Optional _} ->
Location.raise_errorf ~loc:expr.pexp_loc
"Components using React.forwardRef cannot use \
@react.componentWithProps. Please use @react.component \
instead."
@react.componentWithProps. Use @react.component instead."
| Pexp_fun {arg_label = Nolabel; rhs = body} ->
check_invalid_forward_ref body
| _ -> ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
9 │

GADTs require recursive type syntax.
Please define your type using `type rec` instead of `type`.
Define your type using `type rec` instead of `type`.
Example: type rec t = ...
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
14 │ )
15 │ }

Components using React.forwardRef cannot use @react.componentWithProps. Please use @react.component instead.
Components using React.forwardRef cannot use @react.componentWithProps. Use @react.component instead.
Loading