singular on 1 args

rescript-lang · Feb 7, 2025 · 1607d1b · 1607d1b
1 parent 69c8067
commit 1607d1b
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 12 deletions.
diff --git a/compiler/ml/typecore.ml b/compiler/ml/typecore.ml
@@ -4464,7 +4464,7 @@ let report_error env ppf error =
       "@ @[It is applied with @{<error>%d@} argument%s but it requires \
        @{<info>%d@}.@]@]"
       args
-      (if args = 0 then "" else "s")
+      (if args = 1 then "" else "s")
       arity
   | Field_not_optional (name, typ) ->
     fprintf ppf "Field @{<info>%s@} is not optional in type %a. Use without ?"

diff --git a/tests/build_tests/super_errors/expected/arity_mismatch.res.expected b/tests/build_tests/super_errors/expected/arity_mismatch.res.expected
@@ -7,4 +7,4 @@
   3 [2m│[0m 
 
   This function has type (~f: 'a => 'a, unit) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/expected/method_arity_mismatch.res.expected b/tests/build_tests/super_errors/expected/method_arity_mismatch.res.expected
@@ -9,4 +9,4 @@
   5 [2m│[0m 
 
   This function has type (int, int) => unit
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/expected/moreArguments1.res.expected b/tests/build_tests/super_errors/expected/moreArguments1.res.expected
@@ -7,4 +7,4 @@
   3 [2m│[0m 
 
   This function has type (~a: int, ~b: int) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/expected/moreArguments2.res.expected b/tests/build_tests/super_errors/expected/moreArguments2.res.expected
@@ -7,4 +7,4 @@
   3 [2m│[0m 
 
   This function has type (int, int) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/expected/moreArguments3.res.expected b/tests/build_tests/super_errors/expected/moreArguments3.res.expected
@@ -7,4 +7,4 @@
   3 [2m│[0m 
 
   This function has type (int, int, 'a, 'b) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m4[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m4[0m.
diff --git a/tests/build_tests/super_errors/expected/moreArguments4.res.expected b/tests/build_tests/super_errors/expected/moreArguments4.res.expected
@@ -7,4 +7,4 @@
   3 [2m│[0m 
 
   This function has type (int, ~b: int, ~c: 'a, ~d: 'b) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m4[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m4[0m.
diff --git a/tests/build_tests/super_errors/expected/moreArguments5.res.expected b/tests/build_tests/super_errors/expected/moreArguments5.res.expected
@@ -8,4 +8,4 @@
   6 [2m│[0m 
 
   This function has type (int, 'a, 'b, 'c) => Sub.a
-  It is applied with [1;31m1[0m arguments but it requires [1;33m4[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m4[0m.
diff --git a/tests/build_tests/super_errors/expected/opt_args_arity.res.expected b/tests/build_tests/super_errors/expected/opt_args_arity.res.expected
@@ -4,6 +4,7 @@
 
   1 [2m│[0m let f = (~a=0, b, c) => a + b + c
   [1;31m2[0m [2m│[0m let x = [1;31mf[0m(42)
+  3 [2m│[0m 
 
   This function has type (~a: int=?, int, int) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/expected/recursive_type.res.expected b/tests/build_tests/super_errors/expected/recursive_type.res.expected
@@ -10,4 +10,4 @@
 
   This function has type
     ((option<'a>, ([> #List(list<'b>)] as 'b)) => 'c, 'd) => 'c
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/expected/warnings1.res.expected b/tests/build_tests/super_errors/expected/warnings1.res.expected
@@ -9,4 +9,4 @@
   5 [2m│[0m }
 
   This function has type (int, int) => int
-  It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
+  It is applied with [1;31m1[0m argument but it requires [1;33m2[0m.
diff --git a/tests/build_tests/super_errors/fixtures/opt_args_arity.res b/tests/build_tests/super_errors/fixtures/opt_args_arity.res
@@ -1,2 +1,2 @@
 let f = (~a=0, b, c) => a + b + c
-let x = f(42)
+let x = f(42)