Ignore -uncurried compiler flag.

Author: cristianoc

CHANGELOG.md

@@ -66,6 +66,7 @@
 - Avoid generating calls to Curry when adjusting arity of uncurried functions. https://github.com/rescript-lang/rescript-compiler/pull/6870
 - Remove `@@uncurried.swap`, which was used for internal tests. https://github.com/rescript-lang/rescript-compiler/pull/6875
 - Build the compiler libraries/tests in uncurried mode. https://github.com/rescript-lang/rescript-compiler/pull/6864
+- Ignore `-uncurried` command-line flag. https://github.com/rescript-lang/rescript-compiler/pull/6885
 
 #### :nail_care: Polish
 

jscomp/bsc/rescript_compiler_main.ml

@@ -40,7 +40,6 @@ let process_file sourcefile ?(kind ) ppf =
      The {!Location.input_name} relies on that we write the binary ast 
      properly
   *)
-  let uncurried = !Config.uncurried in
   setup_outcome_printer ();
   let kind =
     match kind with 
@@ -78,11 +77,9 @@ let process_file sourcefile ?(kind ) ppf =
   | Unknown -> 
     Bsc_args.bad_arg ("don't know what to do with " ^ sourcefile)
   in
-  Config.uncurried := uncurried;
   res
 
 let reprint_source_file sourcefile = 
-  let uncurried = !Config.uncurried in
   let kind = Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile) in
   let sourcefile = set_abs_input_name sourcefile in
   let res = match kind with 
@@ -119,7 +116,6 @@ let reprint_source_file sourcefile =
     print_endline ("Invalid input for reprinting ReScript source. Must be a ReScript file: " ^ sourcefile);
     exit 2
   in
-  Config.uncurried := uncurried;
   res
 
 let usage = "Usage: bsc <options> <files>\nOptions are:"
@@ -406,8 +402,8 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
 
     "-nopervasives", set Clflags.nopervasives, 
     "*internal*";
-    "-uncurried", unit_call (fun () -> Config.uncurried := Uncurried),
-    "*internal* Set jsx module";
+    "-uncurried", unit_call (fun () -> ()),
+    "*internal* deprecated";
     "-v", unit_call print_version_string,
     "Print compiler version and location of standard library and exit";  
 

jscomp/build_tests/super_errors/expected/warnings3.res.expected

@@ -6,7 +6,7 @@
   2 │ let _ = string_of_float(34.)
   3 │ let _ = string_of_float(34.)
 
-  deprecated: PervasivesU.string_of_float
+  deprecated: Pervasives.string_of_float
   Please use Js.Float.toString instead, string_of_float generates unparseable floats
 
 
@@ -18,7 +18,7 @@
   3 │ let _ = string_of_float(34.)
   4 │ 
 
-  deprecated: PervasivesU.string_of_float
+  deprecated: Pervasives.string_of_float
   Please use Js.Float.toString instead, string_of_float generates unparseable floats
 
 
@@ -30,5 +30,5 @@
   3 │ let _ = string_of_float(34.)
   4 │ 
 
-  deprecated: PervasivesU.string_of_float
+  deprecated: Pervasives.string_of_float
   Please use Js.Float.toString instead, string_of_float generates unparseable floats

jscomp/build_tests/uncurried_printer/input.js

@@ -53,7 +53,7 @@ let initial_env ?(modulename) () =
   let initial = Env.initial_safe_string in
   let env =
     if !Clflags.nopervasives then initial
-    else open_implicit_module (if !Config.uncurried = Uncurried then "PervasivesU" else "Pervasives") initial
+    else open_implicit_module "Pervasives" initial
   in
   List.fold_left
     (fun env m -> open_implicit_module m env)

jscomp/build_tests/uncurried_printer/rescript.json

@@ -12,9 +12,8 @@ let bs_only = ref true
 let unsafe_empty_array = ref false
 
 type uncurried = Legacy | Uncurried
-let uncurried = ref Legacy
 
-and cmi_magic_number = "Caml1999I022"
+let cmi_magic_number = "Caml1999I022"
 
 and ast_impl_magic_number = "Caml1999M022"
 

jscomp/build_tests/uncurried_printer/src/a.res

@@ -43,4 +43,3 @@ val cmt_magic_number : string
 val print_config : out_channel -> unit
 
 type uncurried = Legacy | Uncurried
-val uncurried : uncurried ref

jscomp/core/res_compmisc.ml

@@ -188,16 +188,13 @@ let iter_process_bs_string_int_unwrap_uncurry (attrs : t) =
       st := v)
     else Bs_syntaxerr.err loc Conflict_attributes
   in
-  Ext_list.iter attrs (fun (({txt; loc = _}, (payload : _)) as attr) ->
+  Ext_list.iter attrs (fun (({txt; loc = _}, _) as attr) ->
       match txt with
       | "string" -> assign `String attr
       | "int" -> assign `Int attr
       | "ignore" -> assign `Ignore attr
       | "unwrap" -> assign `Unwrap attr
-      | "uncurry" ->
-        if !Config.uncurried = Uncurried then
-          Used_attributes.mark_used_attribute attr
-        else assign (`Uncurry (Ast_payload.is_single_int payload)) attr
+      | "uncurry" -> Used_attributes.mark_used_attribute attr
       | _ -> ());
   !st