more test fixes

Author: zth

jscomp/others/js_typed_array.res

@@ -5,15 +5,15 @@ let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
 open Belt
 let mockMap = MutableMap.Int.make()
 let add = id => {
-  (mockMap->MutableMap.Int.set)(id, id)
+  MutableMap.Int.set(mockMap, id, id)
   id
 }
-let remove = id => (mockMap->MutableMap.Int.remove)(id)
+let remove = id => MutableMap.Int.remove(mockMap, id)
 let _ = add(1726)
 let n = add(6667)
 let _ = add(486)
 let _ = remove(1726)
-let n1 = (mockMap->MutableMap.Int.getExn)(6667)
+let n1 = MutableMap.Int.getExn(mockMap, 6667)
 
 eq(__LOC__, n, n1)
 

jscomp/test/gpr_4265_test.js

@@ -6,7 +6,7 @@ let f = () => {
   let tbl = Hashtbl.create(17)
   add(tbl, 1, '1')
   add(tbl, 2, '2')
-  \"@@"(List.sort(((a: int, _), (b, _)) => compare(a, b)), to_list(tbl))
+  \"@@"(l => List.sort(((a: int, _), (b, _)) => compare(a, b), l), to_list(tbl))
 }
 
 let g = count => {
@@ -18,7 +18,7 @@ let g = count => {
     replace(tbl, i * 2, string_of_int(i))
   }
   let v = to_list(tbl)
-  let v = \"@@"(List.sort(((x, _), (y: int, _)) => compare(x, y)), v)
+  let v = \"@@"(l => List.sort(((x, _), (y: int, _)) => compare(x, y), l), v)
   Array.of_list(v)
 }
 

jscomp/test/gpr_4265_test.res

@@ -23,7 +23,8 @@ let generic_basename = (is_dir_sep, current_dir_name, name) => {
   }
 }
 
-let basename = generic_basename((s, i) => String.get(s, i) == '/', Filename.current_dir_name)
+let basename = l =>
+  generic_basename((s, i) => String.get(s, i) == '/', Filename.current_dir_name, l)
 
 let suites = {
   open Mt

jscomp/test/hashtbl_test.js

@@ -199,52 +199,45 @@ let simple_divs = [
 /* let f a b = a,b, div a b, rem a b;; */
 
 let from = xs =>
-  xs
-  |> Array.to_list
-  |> List.mapi((i, (a, b, c, d)) => (
-    "small_divs " ++ __unsafe_cast(i),
-    _ => Mt.Eq((c, d), (Int64.div(a, b), Int64.rem(a, b))),
-  ))
+  List.mapi(
+    (i, (a, b, c, d)) => (
+      "small_divs " ++ __unsafe_cast(i),
+      _ => Mt.Eq((c, d), (Int64.div(a, b), Int64.rem(a, b))),
+    ),
+    Array.to_list(xs),
+  )
 let to_string = [(0L, "0")]
 
 let int64_compare_tests = [(1L, 2L, -1), (2L, 1L, 1), (2L, 1L, 1)]
 
 let from_compare = xs =>
-  xs
-  |> Array.to_list
-  |> List.mapi((i, (a, b, c)) => (
-    "int64_compare " ++ __unsafe_cast(i),
-    _ => Mt.Eq(c, Int64.compare(a, b)),
-  ))
+  List.mapi(
+    (i, (a, b, c)) => ("int64_compare " ++ __unsafe_cast(i), _ => Mt.Eq(c, Int64.compare(a, b))),
+    Array.to_list(xs),
+  )
 
 let from_to_string = xs =>
-  xs
-  |> Array.to_list
-  |> List.mapi((i, (a, str_a)) => (
-    "to_string " ++ __unsafe_cast(i),
-    _ => Mt.Eq(str_a, Int64.to_string(a)),
-  ))
+  List.mapi(
+    (i, (a, str_a)) => ("to_string " ++ __unsafe_cast(i), _ => Mt.Eq(str_a, Int64.to_string(a))),
+    Array.to_list(xs),
+  )
 
 \"@@"(
-  Mt.from_pair_suites(__MODULE__),
+  l => Mt.from_pair_suites(__MODULE__, l),
   \"@"(
     from_pairs("random", pairs),
     \"@"(
       from_pairs("small", small_pairs),
       \"@"(
-        to_floats
-        |> Array.to_list
-        |> List.mapi((i, (i64, f)) => (
-          "to_float_" ++ __unsafe_cast(i),
-          _ => Mt.Eq(Int64.to_float(i64), f),
-        )),
+        List.mapi(
+          (i, (i64, f)) => ("to_float_" ++ __unsafe_cast(i), _ => Mt.Eq(Int64.to_float(i64), f)),
+          Array.to_list(to_floats),
+        ),
         \"@"(
-          of_float_pairs
-          |> Array.to_list
-          |> List.mapi((i, (f, i64)) => (
-            "of_float_" ++ __unsafe_cast(i),
-            _ => Mt.Eq(Int64.of_float(f), i64),
-          )),
+          List.mapi(
+            (i, (f, i64)) => ("of_float_" ++ __unsafe_cast(i), _ => Mt.Eq(Int64.of_float(f), i64)),
+            Array.to_list(of_float_pairs),
+          ),
           \"@"(
             list{
               (