Improve error messages for function arity errors (#6990)

cknitt · web-flow · commit 70900aa37274 · 2024-08-30T16:15:13.000+02:00
* Improve some error texts ("uncurried function" -&gt; "function")

* CHANGELOG
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -120,6 +120,7 @@
 - Fix `Js.Types.JSBigInt` payload to use native `bigint` type. https://github.com/rescript-lang/rescript-compiler/pull/6911
 - Deprecate `%external` extension, which has never been officially introduced. https://github.com/rescript-lang/rescript-compiler/pull/6906
 - Deprecate `xxxU` functions in Belt. https://github.com/rescript-lang/rescript-compiler/pull/6941
+- Improve error messages for function arity errors. https://github.com/rescript-lang/rescript-compiler/pull/6990
 
 # 11.1.3
 
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch.res.expected
@@ -6,5 +6,5 @@
   [1;31m2[0m [2m│[0m let makeVariables = [1;31mmakeVar[0m(.~f=f => f)
   3 [2m│[0m 
 
-  This uncurried function has type (~f: 'a => 'a, unit) => int
+  This function has type (~f: 'a => 'a, unit) => int
   It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch2.res.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch2.res.expected
@@ -6,5 +6,5 @@
   [1;31m2[0m [2m│[0m let makeVariables = [1;31mmakeVar[0m(. 1, 2, 3)
   3 [2m│[0m 
 
-  This uncurried function has type ('a, unit) => int
+  This function has type ('a, unit) => int
   It is applied with [1;31m3[0m arguments but it requires [1;33m2[0m.
diff --git a/jscomp/build_tests/super_errors/expected/method_arity_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/method_arity_mismatch.res.expected
@@ -8,5 +8,5 @@
   4 [2m│[0m }
   5 [2m│[0m 
 
-  This uncurried function has type (int, int) => unit
+  This function has type (int, int) => unit
   It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments1.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments1.res.expected
@@ -6,5 +6,5 @@
   [1;31m2[0m [2m│[0m let y = [1;31mx[0m(~a=2) + 2
   3 [2m│[0m 
 
-  This uncurried function has type (~a: int, ~b: int) => int
+  This function has type (~a: int, ~b: int) => int
   It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments2.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments2.res.expected
@@ -6,5 +6,5 @@
   [1;31m2[0m [2m│[0m let y = [1;31mx[0m(2) + 2
   3 [2m│[0m 
 
-  This uncurried function has type (int, int) => int
+  This function has type (int, int) => int
   It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments3.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments3.res.expected
@@ -6,5 +6,5 @@
   [1;31m2[0m [2m│[0m let y = [1;31mx[0m(2) + 2
   3 [2m│[0m 
 
-  This uncurried function has type (int, int, 'a, 'b) => int
+  This function has type (int, int, 'a, 'b) => int
   It is applied with [1;31m1[0m arguments but it requires [1;33m4[0m.
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments4.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments4.res.expected
@@ -6,5 +6,5 @@
   [1;31m2[0m [2m│[0m let y = [1;31mx[0m(2) + 2
   3 [2m│[0m 
 
-  This uncurried function has type (int, ~b: int, ~c: 'a, ~d: 'b) => int
+  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.
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments5.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments5.res.expected
@@ -7,5 +7,5 @@
   [1;31m5[0m [2m│[0m let y = [1;31mx[0m(2).Sub.a
   6 [2m│[0m 
 
-  This uncurried function has type (int, 'a, 'b, 'c) => Sub.a
+  This function has type (int, 'a, 'b, 'c) => Sub.a
   It is applied with [1;31m1[0m arguments but it requires [1;33m4[0m.
diff --git a/jscomp/build_tests/super_errors/expected/partial_app.res.expected b/jscomp/build_tests/super_errors/expected/partial_app.res.expected
@@ -7,5 +7,5 @@
   [1;31m5[0m [2m│[0m [1;31mf[0m(1, 2)
   6 [2m│[0m 
 
-  This uncurried function has type (int, int, int) => int
+  This function has type (int, int, int) => int
   It is applied with [1;31m2[0m arguments but it requires [1;33m3[0m.
diff --git a/jscomp/build_tests/super_errors/expected/primitives3.res.expected b/jscomp/build_tests/super_errors/expected/primitives3.res.expected
@@ -7,5 +7,5 @@
   [1;31m3[0m [2m│[0m [1;31mx[0m(2, 4)
   4 [2m│[0m 
 
-  This uncurried function has type int => int
+  This function has type int => int
   It is applied with [1;31m2[0m arguments but it requires [1;33m1[0m.
diff --git a/jscomp/build_tests/super_errors/expected/recursive_type.res.expected b/jscomp/build_tests/super_errors/expected/recursive_type.res.expected
@@ -8,6 +8,6 @@
   36 [2m│[0m   assert(false)
   37 [2m│[0m }
 
-  This uncurried function has type
+  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.
diff --git a/jscomp/build_tests/super_errors/expected/warnings1.res.expected b/jscomp/build_tests/super_errors/expected/warnings1.res.expected
@@ -8,5 +8,5 @@
   4 [2m│[0m   10
   5 [2m│[0m }
 
-  This uncurried function has type (int, int) => int
+  This function has type (int, int) => int
   It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.
diff --git a/jscomp/ml/typecore.ml b/jscomp/ml/typecore.ml
@@ -4011,7 +4011,7 @@ let report_error env ppf = function
   | Empty_record_literal ->
       fprintf ppf  "Empty record literal {} should be type annotated or used in a record context."
   | Uncurried_arity_mismatch (typ, arity, args) ->
-    fprintf ppf "@[<v>@[<2>This uncurried function has type@ %a@]"
+    fprintf ppf "@[<v>@[<2>This function has type@ %a@]"
       type_expr typ;
     fprintf ppf "@ @[It is applied with @{<error>%d@} argument%s but it requires @{<info>%d@}.@]@]"
       args (if args = 0 then "" else "s") arity

-Original file line number
+Diff line change
   [1;31m2[0m [2m│[0m let makeVariables = [1;31mmakeVar[0m(.~f=f => f)
 [2m│[0m
 -  This uncurried function has type (~f: 'a => 'a, unit) => int
 +  This function has type (~f: 'a => 'a, unit) => int
   It is applied with [1;31m1[0m arguments but it requires [1;33m2[0m.