adding a few user experience enhancments (#5072)

* make CI error easier to spot

* add some note

* remove unused code

* adapt the error message

* fix a few small regressions (include syntax/ocaml repo)

* updates

Author: bobzhang

jscomp/bsb/bsb_exception.ml

@@ -68,7 +68,7 @@ let print (fmt : Format.formatter) (x : error) =
         "File \"bsconfig.json\", line 1\n\
          @{<error>Error:@} package @{<error>%s@} not found or built %s\n\
          - Did you install it?\n\
-         - If you did, did you run `bsb -make-world`?"
+         - If you did, did you run `rescript build -with-deps`?"
         name
         in_json
 

jscomp/build_tests/super_errors/expected/modules1.re.expected

@@ -8,6 +8,6 @@
   The module or file Foo can't be found.
   - If it's a third-party dependency:
     - Did you list it in bsconfig.json?
-    - Did you run `bsb` instead of `bsb -make-world`
+    - Did you run `rescript build` instead of `rescript build -with-deps`
       (latter builds third-parties)?
   - Did you include the file's directory in bsconfig.json?

jscomp/build_tests/super_errors/expected/syntaxErrors1.re.expected

@@ -1,4 +1,4 @@
-File "/.../fixtures/syntaxErrors1.re", line 1, characters 10-12:
+File "/.../fixtures/syntaxErrors1.re", line 1, characters 11-13:
 Error: syntax error, consider adding a `;' before
 
   We've found a bug for you!

jscomp/build_tests/super_errors/expected/syntaxErrors2.re.expected

@@ -1,4 +1,4 @@
-File "/.../fixtures/syntaxErrors2.re", line 2, characters 40-41:
+File "/.../fixtures/syntaxErrors2.re", line 2, characters 41-42:
 Error: Syntax error
 
   We've found a bug for you!

jscomp/build_tests/super_errors/expected/syntaxErrors3.re.expected

@@ -1,4 +1,4 @@
-File "/.../fixtures/syntaxErrors3.re", line 1, characters 19-20:
+File "/.../fixtures/syntaxErrors3.re", line 1, characters 20-21:
 Error: Unclosed "(" (opened line 1, column 18)
 
   We've found a bug for you!

jscomp/build_tests/super_errors/expected/syntaxErrors5.re.expected

@@ -1,4 +1,4 @@
-File "/.../fixtures/syntaxErrors5.re", line 2, characters 0-0:
+File "/.../fixtures/syntaxErrors5.re", line 2, characters 1-1:
 Error: Unclosed "(" (opened line 1, column 8)
 
   We've found a bug for you!

jscomp/main/builtin_cmj_datasets.ml

@@ -69,7 +69,7 @@ let report_error env ppf = function
                               @{<info>The module or file %a can't be found.@}@,\
                               @[<v 2>- If it's a third-party dependency:@,\
                               - Did you list it in bsconfig.json?@,\
-                              - @[Did you run `bsb` instead of `bsb -make-world`@ (latter builds third-parties)@]?\
+                              - @[Did you run `rescript build` instead of `rescript build -with-deps`@ (latter builds third-parties)@]?\
                               @]@,\
                               - Did you include the file's directory in bsconfig.json?@]\
                               @]"

jscomp/super_errors/super_typetexp.ml

@@ -18,8 +18,8 @@ function f(x, y) {
   return x + y | 0;
 }
 
-function add(prim, prim$1) {
-  return prim + prim$1 | 0;
+function add(prim0, prim1) {
+  return prim0 + prim1 | 0;
 }
 
 function h(u) {

jscomp/test/arity.js

@@ -250,8 +250,8 @@ var array_suites_1 = {
                                 26,
                                 27,
                                 28
-                              ], (function (prim, prim$1) {
-                                  return prim === prim$1;
+                              ], (function (prim0, prim1) {
+                                  return prim0 === prim1;
                                 }))
                         };
                 })
@@ -294,8 +294,8 @@ var array_suites_1 = {
                                   18,
                                   19,
                                   20
-                                ], (function (prim, prim$1) {
-                                    return prim === prim$1;
+                                ], (function (prim0, prim1) {
+                                    return prim0 === prim1;
                                   }))
                           };
                   })

jscomp/test/array_test.js

@@ -231,13 +231,7 @@ let main () =
     succeeded := !succeeded && test_hwb bdd (random_vars n)
   done;
   assert !succeeded
-(*
-  if !succeeded
-  then print_string "OK\n"
-  else print_string "FAILED\n";
-Format.eprintf "%d@." !nodeC;
-  exit 0
-*)
+
 
 let _ = main()
 

jscomp/test/bdd.ml

@@ -52,8 +52,8 @@ function f2(param) {
   var b = map((function (i) {
           return i + i - 1;
         }), arr);
-  var v = fold_left((function (prim, prim$1) {
-          return prim + prim$1;
+  var v = fold_left((function (prim0, prim1) {
+          return prim0 + prim1;
         }), 0, b);
   console.log(Pervasives.string_of_float(v));
 

jscomp/test/bench.js

@@ -344,24 +344,24 @@ b("File \"bs_array_test.ml\", line 93, characters 4-11", Caml_obj.caml_equal(Bel
 
 b("File \"bs_array_test.ml\", line 94, characters 4-11", Caml_obj.caml_equal(Belt_Array.rangeBy(3, 3, 1), [3]));
 
-eq("File \"bs_array_test.ml\", line 99, characters 5-12", Belt_Array.reduceReverse([], 100, (function (prim, prim$1) {
-            return prim - prim$1 | 0;
+eq("File \"bs_array_test.ml\", line 99, characters 5-12", Belt_Array.reduceReverse([], 100, (function (prim0, prim1) {
+            return prim0 - prim1 | 0;
           })), 100);
 
 eq("File \"bs_array_test.ml\", line 100, characters 5-12", Belt_Array.reduceReverse([
           1,
           2
-        ], 100, (function (prim, prim$1) {
-            return prim - prim$1 | 0;
+        ], 100, (function (prim0, prim1) {
+            return prim0 - prim1 | 0;
           })), 97);
 
 eq("File \"bs_array_test.ml\", line 101, characters 5-12", Belt_Array.reduceReverse([
           1,
           2,
           3,
           4
-        ], 100, (function (prim, prim$1) {
-            return prim - prim$1 | 0;
+        ], 100, (function (prim0, prim1) {
+            return prim0 - prim1 | 0;
           })), 90);
 
 eq("File \"bs_array_test.ml\", line 102, characters 5-12", Belt_Array.reduceWithIndex([
@@ -1124,8 +1124,8 @@ eq("File \"bs_array_test.ml\", line 258, characters 5-12", Belt_Array.zipBy([
           1,
           2,
           3
-        ], (function (prim, prim$1) {
-            return prim - prim$1 | 0;
+        ], (function (prim0, prim1) {
+            return prim0 - prim1 | 0;
           })), [
       1,
       1,
@@ -1141,8 +1141,8 @@ eq("File \"bs_array_test.ml\", line 259, characters 5-12", Belt_Array.zipBy([
           3,
           4,
           1
-        ], (function (prim, prim$1) {
-            return prim - prim$1 | 0;
+        ], (function (prim0, prim1) {
+            return prim0 - prim1 | 0;
           })), Belt_Array.map([
           1,
           1,
@@ -1226,8 +1226,8 @@ b("File \"bs_array_test.ml\", line 273, characters 4-11", !Belt_Array.some([
 b("File \"bs_array_test.ml\", line 274, characters 4-11", !Belt_Array.eq([
           0,
           1
-        ], [1], (function (prim, prim$1) {
-            return prim === prim$1;
+        ], [1], (function (prim0, prim1) {
+            return prim0 === prim1;
           })));
 
 var c$1 = {

jscomp/test/bs_array_test.js

@@ -80,8 +80,8 @@ function add3(x, y, z) {
 }
 
 function h2(x) {
-  return ff(x, (function (prim, prim$1) {
-                return prim + prim$1 | 0;
+  return ff(x, (function (prim0, prim1) {
+                return prim0 + prim1 | 0;
               }));
 }
 

jscomp/test/bs_auto_uncurry.js

@@ -90,8 +90,8 @@ eq("File \"bs_auto_uncurry_test.ml\", line 40, characters 7-14", [
         1,
         2,
         3
-      ].reduce((function (prim, prim$1) {
-            return prim + prim$1 | 0;
+      ].reduce((function (prim0, prim1) {
+            return prim0 + prim1 | 0;
           }), 0), 6);
 
 eq("File \"bs_auto_uncurry_test.ml\", line 44, characters 7-14", [

jscomp/test/bs_auto_uncurry_test.js

@@ -38,8 +38,8 @@ var Y = Belt_Id.hashable(hash, eq);
 
 var empty = Belt_internalBucketsType.make(Y.hash, Y.eq, 30);
 
-function add(prim, prim$1) {
-  return prim + prim$1 | 0;
+function add(prim0, prim1) {
+  return prim0 + prim1 | 0;
 }
 
 Belt_HashMap.mergeMany(empty, [