From 66a0601329046122955ffb02bed8e972c5e02d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Wed, 27 Sep 2023 17:18:53 +0200 Subject: [PATCH 1/8] fix error msg on curried/uncurried sig mismatch --- ..._of_uncurried_in_curried_mode.res.expected | 28 ++++++++++++++++++ ...f_uncurried_in_uncurried_mode.res.expected | 29 +++++++++++++++++++ ...ad_of_curried_in_curried_mode.res.expected | 28 ++++++++++++++++++ ..._of_curried_in_uncurried_mode.res.expected | 28 ++++++++++++++++++ ...e_instead_of_uncurried_in_curried_mode.res | 5 ++++ ...instead_of_uncurried_in_uncurried_mode.res | 8 +++++ ...lue_instead_of_curried_in_curried_mode.res | 5 ++++ ...e_instead_of_curried_in_uncurried_mode.res | 8 +++++ jscomp/syntax/src/res_uncurried.ml | 2 +- 9 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected create mode 100644 jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected create mode 100644 jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected create mode 100644 jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected create mode 100644 jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_curried_mode.res create mode 100644 jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res create mode 100644 jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_curried_mode.res create mode 100644 jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected new file mode 100644 index 0000000000..c09de31556 --- /dev/null +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected @@ -0,0 +1,28 @@ + + We've found a bug for you! + /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:3:5-5:1 + + 1 │ module Foo: { + 2 │ let add: (. int, int) => int + 3 │ } = { + 4 │  let add = (a, b) => a + b + 5 │ } + 6 │ + + Signature mismatch: + Modules do not match: + { + let add: (int, int) => int +} + is not included in + { + let add: (. int, int) => int +} + Values do not match: + let add: (int, int) => int + is not included in + let add: (. int, int) => int + /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:2:3-30: + Expected declaration + /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:4:7-9: + Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected new file mode 100644 index 0000000000..e60e1859e6 --- /dev/null +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected @@ -0,0 +1,29 @@ + + We've found a bug for you! + /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:5:5-8:1 + + 3 │ module Foo: { + 4 │ let add: (int, int) => int + 5 │ } = { + 6 │  @@uncurried.swap + 7 │  let add = (. a, b) => a + b + 8 │ } + 9 │ + + Signature mismatch: + Modules do not match: + { + let add: (. int, int) => int +} + is not included in + { + let add: (int, int) => int +} + Values do not match: + let add: (. int, int) => int + is not included in + let add: (int, int) => int + /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:4:3-28: + Expected declaration + /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:7:7-9: + Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected new file mode 100644 index 0000000000..66dd74e912 --- /dev/null +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected @@ -0,0 +1,28 @@ + + We've found a bug for you! + /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:3:5-5:1 + + 1 │ module Foo: { + 2 │ let add: (int, int) => int + 3 │ } = { + 4 │  let add = (. a, b) => a + b + 5 │ } + 6 │ + + Signature mismatch: + Modules do not match: + { + let add: (. int, int) => int +} + is not included in + { + let add: (int, int) => int +} + Values do not match: + let add: (. int, int) => int + is not included in + let add: (int, int) => int + /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:2:3-28: + Expected declaration + /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:4:7-9: + Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected new file mode 100644 index 0000000000..06837cf94d --- /dev/null +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected @@ -0,0 +1,28 @@ + + We've found a bug for you! + /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:6:5-8:1 + + 4 │ @@uncurried.swap + 5 │ let add: (. int, int) => int + 6 │ } = { + 7 │  let add = (a, b) => a + b + 8 │ } + 9 │ + + Signature mismatch: + Modules do not match: + { + let add: (int, int) => int +} + is not included in + { + let add: (. int, int) => int +} + Values do not match: + let add: (int, int) => int + is not included in + let add: (. int, int) => int + /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:5:3-30: + Expected declaration + /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:7:7-9: + Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_curried_mode.res b/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_curried_mode.res new file mode 100644 index 0000000000..ed0ff1515d --- /dev/null +++ b/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_curried_mode.res @@ -0,0 +1,5 @@ +module Foo: { + let add: (. int, int) => int +} = { + let add = (a, b) => a + b +} diff --git a/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res b/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res new file mode 100644 index 0000000000..844400218c --- /dev/null +++ b/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res @@ -0,0 +1,8 @@ +@@uncurried + +module Foo: { + let add: (int, int) => int +} = { + @@uncurried.swap + let add = (. a, b) => a + b +} diff --git a/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_curried_mode.res b/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_curried_mode.res new file mode 100644 index 0000000000..f1da111c85 --- /dev/null +++ b/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_curried_mode.res @@ -0,0 +1,5 @@ +module Foo: { + let add: (int, int) => int +} = { + let add = (. a, b) => a + b +} diff --git a/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res b/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res new file mode 100644 index 0000000000..85e59dbaef --- /dev/null +++ b/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res @@ -0,0 +1,8 @@ +@@uncurried + +module Foo: { + @@uncurried.swap + let add: (. int, int) => int +} = { + let add = (a, b) => a + b +} diff --git a/jscomp/syntax/src/res_uncurried.ml b/jscomp/syntax/src/res_uncurried.ml index 1a777e1599..86f9238bcb 100644 --- a/jscomp/syntax/src/res_uncurried.ml +++ b/jscomp/syntax/src/res_uncurried.ml @@ -8,4 +8,4 @@ let fromDotted ~dotted = function let getDotted ~uncurried = function | Config.Legacy -> uncurried | Swap -> not uncurried - | Uncurried -> false + | Uncurried -> not uncurried From b6efc4c197c0ffd2c251f6cbf5ff8a6914e00127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Fri, 29 Sep 2023 12:44:03 +0200 Subject: [PATCH 2/8] mark function curry kind in value mismatch --- ...stead_of_uncurried_in_curried_mode.res.expected | 4 ++-- ...ead_of_uncurried_in_uncurried_mode.res.expected | 6 +++--- ...instead_of_curried_in_curried_mode.res.expected | 4 ++-- ...stead_of_curried_in_uncurried_mode.res.expected | 6 +++--- jscomp/ml/includemod.ml | 14 ++++++++++++++ jscomp/syntax/src/res_uncurried.ml | 2 +- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected index c09de31556..a5bb4f259a 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected @@ -19,9 +19,9 @@ let add: (. int, int) => int } Values do not match: - let add: (int, int) => int + let add: (int, int) => int (curried) is not included in - let add: (. int, int) => int + let add: (. int, int) => int (uncurried) /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:2:3-30: Expected declaration /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:4:7-9: diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected index e60e1859e6..4e36379911 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected @@ -13,16 +13,16 @@ Signature mismatch: Modules do not match: { - let add: (. int, int) => int + let add: (int, int) => int } is not included in { let add: (int, int) => int } Values do not match: - let add: (. int, int) => int + let add: (int, int) => int (curried) is not included in - let add: (int, int) => int + let add: (int, int) => int (uncurried) /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:4:3-28: Expected declaration /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:7:7-9: diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected index 66dd74e912..f8657b49f9 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected @@ -19,9 +19,9 @@ let add: (int, int) => int } Values do not match: - let add: (. int, int) => int + let add: (. int, int) => int (uncurried) is not included in - let add: (int, int) => int + let add: (int, int) => int (curried) /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:2:3-28: Expected declaration /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:4:7-9: diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected index 06837cf94d..e2e340e711 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected @@ -16,12 +16,12 @@ } is not included in { - let add: (. int, int) => int + let add: (int, int) => int } Values do not match: - let add: (int, int) => int + let add: (int, int) => int (uncurried) is not included in - let add: (. int, int) => int + let add: (int, int) => int (curried) /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:5:3-30: Expected declaration /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:7:7-9: diff --git a/jscomp/ml/includemod.ml b/jscomp/ml/includemod.ml index 0fcfa8a508..987116ea82 100644 --- a/jscomp/ml/includemod.ml +++ b/jscomp/ml/includemod.ml @@ -537,6 +537,20 @@ let include_err ppf = function | Missing_field (id, loc, kind) -> fprintf ppf "The %s `%a' is required but not provided" kind ident id; show_loc "Expected declaration" ppf loc + | Value_descriptions(id, + ({ val_type = { desc = Tlink { desc = Tconstr (Pident {name = "function$"},_,_) }}} as d1), + ({ val_type = { desc = Tarrow _ }} as d2)) -> + fprintf ppf + "@[Values do not match:@ %a (uncurried)@;<1 -2>is not included in@ %a (curried)@]" + (value_description id) d1 (value_description id) d2; + show_locs ppf (d1.val_loc, d2.val_loc) + | Value_descriptions(id, + ({ val_type = { desc = Tlink { desc = Tarrow _ }}} as d1), + ({ val_type = { desc = Tconstr (Pident {name = "function$"},_,_)}} as d2)) -> + fprintf ppf + "@[Values do not match:@ %a (curried)@;<1 -2>is not included in@ %a (uncurried)@]" + (value_description id) d1 (value_description id) d2; + show_locs ppf (d1.val_loc, d2.val_loc) | Value_descriptions(id, d1, d2) -> fprintf ppf "@[Values do not match:@ %a@;<1 -2>is not included in@ %a@]" diff --git a/jscomp/syntax/src/res_uncurried.ml b/jscomp/syntax/src/res_uncurried.ml index 86f9238bcb..1a777e1599 100644 --- a/jscomp/syntax/src/res_uncurried.ml +++ b/jscomp/syntax/src/res_uncurried.ml @@ -8,4 +8,4 @@ let fromDotted ~dotted = function let getDotted ~uncurried = function | Config.Legacy -> uncurried | Swap -> not uncurried - | Uncurried -> not uncurried + | Uncurried -> false From 018b17d9d9e995cc0676f509cfaa664ef9f5fadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Fri, 29 Sep 2023 13:29:23 +0200 Subject: [PATCH 3/8] use expand_head to check type of functions --- jscomp/ml/includemod.ml | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/jscomp/ml/includemod.ml b/jscomp/ml/includemod.ml index 987116ea82..1f73880917 100644 --- a/jscomp/ml/includemod.ml +++ b/jscomp/ml/includemod.ml @@ -533,28 +533,22 @@ let show_locs ppf (loc1, loc2) = show_loc "Expected declaration" ppf loc2; show_loc "Actual declaration" ppf loc1 -let include_err ppf = function +let include_err ~env ppf = function | Missing_field (id, loc, kind) -> fprintf ppf "The %s `%a' is required but not provided" kind ident id; show_loc "Expected declaration" ppf loc - | Value_descriptions(id, - ({ val_type = { desc = Tlink { desc = Tconstr (Pident {name = "function$"},_,_) }}} as d1), - ({ val_type = { desc = Tarrow _ }} as d2)) -> - fprintf ppf - "@[Values do not match:@ %a (uncurried)@;<1 -2>is not included in@ %a (curried)@]" - (value_description id) d1 (value_description id) d2; - show_locs ppf (d1.val_loc, d2.val_loc) - | Value_descriptions(id, - ({ val_type = { desc = Tlink { desc = Tarrow _ }}} as d1), - ({ val_type = { desc = Tconstr (Pident {name = "function$"},_,_)}} as d2)) -> - fprintf ppf - "@[Values do not match:@ %a (curried)@;<1 -2>is not included in@ %a (uncurried)@]" - (value_description id) d1 (value_description id) d2; - show_locs ppf (d1.val_loc, d2.val_loc) | Value_descriptions(id, d1, d2) -> + let curry_kind_1, curry_kind_2 = + match (Ctype.expand_head env d1.val_type, Ctype.expand_head env d2.val_type ) with + | { desc = Tarrow _ }, + { desc = Tconstr (Pident {name = "function$"},_,_)} -> (" (curried)", " (uncurried)") + | { desc = Tconstr (Pident {name = "function$"},_,_)}, + { desc = Tarrow _ } -> (" (uncurried)", " (curried)") + | _ -> ("", "") + in fprintf ppf - "@[Values do not match:@ %a@;<1 -2>is not included in@ %a@]" - (value_description id) d1 (value_description id) d2; + "@[Values do not match:@ %a%s@;<1 -2>is not included in@ %a%s@]" + (value_description id) d1 curry_kind_1 (value_description id) d2 curry_kind_2; show_locs ppf (d1.val_loc, d2.val_loc); | Type_declarations(id, d1, d2, errs) -> fprintf ppf "@[@[%s:@;<1 2>%a@ %s@;<1 2>%a@]%a%a@]" @@ -647,7 +641,7 @@ let context ppf cxt = let include_err ppf (cxt, env, err) = Printtyp.wrap_printing_env env (fun () -> - fprintf ppf "@[%a%a@]" context (List.rev cxt) include_err err) + fprintf ppf "@[%a%a@]" context (List.rev cxt) (include_err ~env) err) let buffer = ref Bytes.empty let is_big obj = From 1f1b4b8d308f0a8b11e7b6d6a077f027f7741fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Wed, 4 Oct 2023 16:38:21 +0200 Subject: [PATCH 4/8] try passing tests in CI --- ...lue_instead_of_uncurried_in_curried_mode.res.expected | 9 +-------- ...e_instead_of_uncurried_in_uncurried_mode.res.expected | 9 +-------- ...value_instead_of_curried_in_curried_mode.res.expected | 9 +-------- ...lue_instead_of_curried_in_uncurried_mode.res.expected | 9 +-------- 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected index a5bb4f259a..32be71fd9d 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected @@ -10,14 +10,7 @@ 6 │ Signature mismatch: - Modules do not match: - { - let add: (int, int) => int -} - is not included in - { - let add: (. int, int) => int -} + ... Values do not match: let add: (int, int) => int (curried) is not included in diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected index 4e36379911..e9de36c42a 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected @@ -11,14 +11,7 @@ 9 │ Signature mismatch: - Modules do not match: - { - let add: (int, int) => int -} - is not included in - { - let add: (int, int) => int -} + ... Values do not match: let add: (int, int) => int (curried) is not included in diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected index f8657b49f9..73f28a0fd7 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected @@ -10,14 +10,7 @@ 6 │ Signature mismatch: - Modules do not match: - { - let add: (. int, int) => int -} - is not included in - { - let add: (int, int) => int -} + ... Values do not match: let add: (. int, int) => int (uncurried) is not included in diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected index e2e340e711..407b3ca991 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected @@ -10,14 +10,7 @@ 9 │ Signature mismatch: - Modules do not match: - { - let add: (int, int) => int -} - is not included in - { - let add: (int, int) => int -} + ... Values do not match: let add: (int, int) => int (uncurried) is not included in From 04fd10805066e77067016d8e6d672bd8a3a1439e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Wed, 4 Oct 2023 17:04:26 +0200 Subject: [PATCH 5/8] Revert "try passing tests in CI" This reverts commit 1f1b4b8d308f0a8b11e7b6d6a077f027f7741fbb. --- ...lue_instead_of_uncurried_in_curried_mode.res.expected | 9 ++++++++- ...e_instead_of_uncurried_in_uncurried_mode.res.expected | 9 ++++++++- ...value_instead_of_curried_in_curried_mode.res.expected | 9 ++++++++- ...lue_instead_of_curried_in_uncurried_mode.res.expected | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected index 32be71fd9d..a5bb4f259a 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected @@ -10,7 +10,14 @@ 6 │ Signature mismatch: - ... + Modules do not match: + { + let add: (int, int) => int +} + is not included in + { + let add: (. int, int) => int +} Values do not match: let add: (int, int) => int (curried) is not included in diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected index e9de36c42a..4e36379911 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected @@ -11,7 +11,14 @@ 9 │ Signature mismatch: - ... + Modules do not match: + { + let add: (int, int) => int +} + is not included in + { + let add: (int, int) => int +} Values do not match: let add: (int, int) => int (curried) is not included in diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected index 73f28a0fd7..f8657b49f9 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected @@ -10,7 +10,14 @@ 6 │ Signature mismatch: - ... + Modules do not match: + { + let add: (. int, int) => int +} + is not included in + { + let add: (int, int) => int +} Values do not match: let add: (. int, int) => int (uncurried) is not included in diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected index 407b3ca991..e2e340e711 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected @@ -10,7 +10,14 @@ 9 │ Signature mismatch: - ... + Modules do not match: + { + let add: (int, int) => int +} + is not included in + { + let add: (int, int) => int +} Values do not match: let add: (int, int) => int (uncurried) is not included in From 4e62eb04eb0b9d9f3b0a8cb52bd07d28876bca25 Mon Sep 17 00:00:00 2001 From: mununki Date: Wed, 22 Nov 2023 13:13:53 +0900 Subject: [PATCH 6/8] long name without underscore --- ...urriedvalueinsteadofuncurriedincurriedmode.res.expected} | 6 +++--- ...riedvalueinsteadofuncurriedinuncurriedmode.res.expected} | 6 +++--- ...ncurriedvalueinsteadofcurriedincurriedmode.res.expected} | 6 +++--- ...urriedvalueinsteadofcurriedinuncurriedmode.res.expected} | 6 +++--- ....res => curriedvalueinsteadofuncurriedincurriedmode.res} | 0 ...es => curriedvalueinsteadofuncurriedinuncurriedmode.res} | 0 ....res => uncurriedvalueinsteadofcurriedincurriedmode.res} | 0 ...es => uncurriedvalueinsteadofcurriedinuncurriedmode.res} | 0 8 files changed, 12 insertions(+), 12 deletions(-) rename jscomp/build_tests/super_errors/expected/{curried_value_instead_of_uncurried_in_curried_mode.res.expected => curriedvalueinsteadofuncurriedincurriedmode.res.expected} (67%) rename jscomp/build_tests/super_errors/expected/{curried_value_instead_of_uncurried_in_uncurried_mode.res.expected => curriedvalueinsteadofuncurriedinuncurriedmode.res.expected} (69%) rename jscomp/build_tests/super_errors/expected/{uncurried_value_instead_of_curried_in_curried_mode.res.expected => uncurriedvalueinsteadofcurriedincurriedmode.res.expected} (67%) rename jscomp/build_tests/super_errors/expected/{uncurried_value_instead_of_curried_in_uncurried_mode.res.expected => uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected} (67%) rename jscomp/build_tests/super_errors/fixtures/{curried_value_instead_of_uncurried_in_curried_mode.res => curriedvalueinsteadofuncurriedincurriedmode.res} (100%) rename jscomp/build_tests/super_errors/fixtures/{curried_value_instead_of_uncurried_in_uncurried_mode.res => curriedvalueinsteadofuncurriedinuncurriedmode.res} (100%) rename jscomp/build_tests/super_errors/fixtures/{uncurried_value_instead_of_curried_in_curried_mode.res => uncurriedvalueinsteadofcurriedincurriedmode.res} (100%) rename jscomp/build_tests/super_errors/fixtures/{uncurried_value_instead_of_curried_in_uncurried_mode.res => uncurriedvalueinsteadofcurriedinuncurriedmode.res} (100%) diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected similarity index 67% rename from jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected rename to jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected index a5bb4f259a..0d6ddbf4f4 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:3:5-5:1 + /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:3:5-5:1 1 │ module Foo: { 2 │ let add: (. int, int) => int @@ -22,7 +22,7 @@ let add: (int, int) => int (curried) is not included in let add: (. int, int) => int (uncurried) - /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:2:3-30: + /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:2:3-30: Expected declaration - /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:4:7-9: + /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:4:7-9: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected similarity index 69% rename from jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected rename to jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected index 4e36379911..d86e89872f 100644 --- a/jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:5:5-8:1 + /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:5:5-8:1 3 │ module Foo: { 4 │ let add: (int, int) => int @@ -23,7 +23,7 @@ let add: (int, int) => int (curried) is not included in let add: (int, int) => int (uncurried) - /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:4:3-28: + /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:4:3-28: Expected declaration - /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:7:7-9: + /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:7:7-9: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected similarity index 67% rename from jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected rename to jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected index f8657b49f9..d3ba3d1399 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:3:5-5:1 + /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:3:5-5:1 1 │ module Foo: { 2 │ let add: (int, int) => int @@ -22,7 +22,7 @@ let add: (. int, int) => int (uncurried) is not included in let add: (int, int) => int (curried) - /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:2:3-28: + /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:2:3-28: Expected declaration - /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:4:7-9: + /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:4:7-9: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected similarity index 67% rename from jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected rename to jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected index e2e340e711..041f0e7a5c 100644 --- a/jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:6:5-8:1 + /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:6:5-8:1 4 │ @@uncurried.swap 5 │ let add: (. int, int) => int @@ -22,7 +22,7 @@ let add: (int, int) => int (uncurried) is not included in let add: (int, int) => int (curried) - /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:5:3-30: + /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:5:3-30: Expected declaration - /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:7:7-9: + /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:7:7-9: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_curried_mode.res b/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_curried_mode.res rename to jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res diff --git a/jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res b/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res rename to jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res diff --git a/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_curried_mode.res b/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_curried_mode.res rename to jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res diff --git a/jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res b/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res rename to jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res From 567b1348cec88863e50cb2ea1561d332274a3a16 Mon Sep 17 00:00:00 2001 From: mununki Date: Wed, 22 Nov 2023 13:24:06 +0900 Subject: [PATCH 7/8] distinguish function names --- ...steadofuncurriedincurriedmode.res.expected | 16 +++++++------- ...eadofuncurriedinuncurriedmode.res.expected | 16 +++++++------- ...insteadofcurriedincurriedmode.res.expected | 16 +++++++------- ...steadofcurriedinuncurriedmode.res.expected | 21 +++++++------------ ...edvalueinsteadofuncurriedincurriedmode.res | 4 ++-- ...valueinsteadofuncurriedinuncurriedmode.res | 4 ++-- ...riedvalueinsteadofcurriedincurriedmode.res | 4 ++-- ...edvalueinsteadofcurriedinuncurriedmode.res | 4 ++-- 8 files changed, 39 insertions(+), 46 deletions(-) diff --git a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected index 0d6ddbf4f4..0acfcd6898 100644 --- a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected @@ -3,26 +3,26 @@ /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:3:5-5:1 1 │ module Foo: { - 2 │ let add: (. int, int) => int + 2 │ let addcuc: (. int, int) => int 3 │ } = { - 4 │  let add = (a, b) => a + b + 4 │  let addcuc = (a, b) => a + b 5 │ } 6 │ Signature mismatch: Modules do not match: { - let add: (int, int) => int + let addcuc: (int, int) => int } is not included in { - let add: (. int, int) => int + let addcuc: (. int, int) => int } Values do not match: - let add: (int, int) => int (curried) + let addcuc: (int, int) => int (curried) is not included in - let add: (. int, int) => int (uncurried) - /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:2:3-30: + let addcuc: (. int, int) => int (uncurried) + /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:2:3-33: Expected declaration - /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:4:7-9: + /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:4:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected index d86e89872f..4680827216 100644 --- a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected @@ -3,27 +3,27 @@ /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:5:5-8:1 3 │ module Foo: { - 4 │ let add: (int, int) => int + 4 │ let addcuu: (int, int) => int 5 │ } = { 6 │  @@uncurried.swap - 7 │  let add = (. a, b) => a + b + 7 │  let addcuu = (. a, b) => a + b 8 │ } 9 │ Signature mismatch: Modules do not match: { - let add: (int, int) => int + let addcuu: (int, int) => int } is not included in { - let add: (int, int) => int + let addcuu: (int, int) => int } Values do not match: - let add: (int, int) => int (curried) + let addcuu: (int, int) => int (curried) is not included in - let add: (int, int) => int (uncurried) - /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:4:3-28: + let addcuu: (int, int) => int (uncurried) + /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:4:3-31: Expected declaration - /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:7:7-9: + /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:7:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected index d3ba3d1399..5a4c9c60ad 100644 --- a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected @@ -3,26 +3,26 @@ /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:3:5-5:1 1 │ module Foo: { - 2 │ let add: (int, int) => int + 2 │ let adducc: (int, int) => int 3 │ } = { - 4 │  let add = (. a, b) => a + b + 4 │  let adducc = (. a, b) => a + b 5 │ } 6 │ Signature mismatch: Modules do not match: { - let add: (. int, int) => int + let adducc: (. int, int) => int } is not included in { - let add: (int, int) => int + let adducc: (int, int) => int } Values do not match: - let add: (. int, int) => int (uncurried) + let adducc: (. int, int) => int (uncurried) is not included in - let add: (int, int) => int (curried) - /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:2:3-28: + let adducc: (int, int) => int (curried) + /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:2:3-31: Expected declaration - /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:4:7-9: + /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:4:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected index 041f0e7a5c..8ea6ce712c 100644 --- a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected @@ -3,26 +3,19 @@ /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:6:5-8:1 4 │ @@uncurried.swap - 5 │ let add: (. int, int) => int + 5 │ let adducu: (. int, int) => int 6 │ } = { - 7 │  let add = (a, b) => a + b + 7 │  let adducu = (a, b) => a + b 8 │ } 9 │ Signature mismatch: - Modules do not match: - { - let add: (int, int) => int -} - is not included in - { - let add: (int, int) => int -} + ... Values do not match: - let add: (int, int) => int (uncurried) + let adducu: (int, int) => int (uncurried) is not included in - let add: (int, int) => int (curried) - /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:5:3-30: + let adducu: (int, int) => int (curried) + /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:5:3-33: Expected declaration - /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:7:7-9: + /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:7:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res b/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res index ed0ff1515d..e7f2d44f72 100644 --- a/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res +++ b/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res @@ -1,5 +1,5 @@ module Foo: { - let add: (. int, int) => int + let addcuc: (. int, int) => int } = { - let add = (a, b) => a + b + let addcuc = (a, b) => a + b } diff --git a/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res b/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res index 844400218c..0ca0e33331 100644 --- a/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res +++ b/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res @@ -1,8 +1,8 @@ @@uncurried module Foo: { - let add: (int, int) => int + let addcuu: (int, int) => int } = { @@uncurried.swap - let add = (. a, b) => a + b + let addcuu = (. a, b) => a + b } diff --git a/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res b/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res index f1da111c85..b490eca1f0 100644 --- a/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res +++ b/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res @@ -1,5 +1,5 @@ module Foo: { - let add: (int, int) => int + let adducc: (int, int) => int } = { - let add = (. a, b) => a + b + let adducc = (. a, b) => a + b } diff --git a/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res b/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res index 85e59dbaef..067c8ffea6 100644 --- a/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res +++ b/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res @@ -2,7 +2,7 @@ module Foo: { @@uncurried.swap - let add: (. int, int) => int + let adducu: (. int, int) => int } = { - let add = (a, b) => a + b + let adducu = (a, b) => a + b } From 663e21f1ecdd29d19c611b98e707f8c9122cbfd3 Mon Sep 17 00:00:00 2001 From: mununki Date: Wed, 22 Nov 2023 13:45:13 +0900 Subject: [PATCH 8/8] shorten length of name --- ...riant_spread_tag_value_mismatch1.res.expected} | 6 +++--- ...riant_spread_tag_value_mismatch2.res.expected} | 6 +++--- ...riant_spread_tag_value_mismatch3.res.expected} | 6 +++--- ...riant_spread_tag_value_mismatch4.res.expected} | 15 +++++++++++---- ...res => variant_spread_tag_value_mismatch1.res} | 0 ...res => variant_spread_tag_value_mismatch2.res} | 0 ...res => variant_spread_tag_value_mismatch3.res} | 0 ...res => variant_spread_tag_value_mismatch4.res} | 0 8 files changed, 20 insertions(+), 13 deletions(-) rename jscomp/build_tests/super_errors/expected/{curriedvalueinsteadofuncurriedincurriedmode.res.expected => variant_spread_tag_value_mismatch1.res.expected} (70%) rename jscomp/build_tests/super_errors/expected/{curriedvalueinsteadofuncurriedinuncurriedmode.res.expected => variant_spread_tag_value_mismatch2.res.expected} (71%) rename jscomp/build_tests/super_errors/expected/{uncurriedvalueinsteadofcurriedincurriedmode.res.expected => variant_spread_tag_value_mismatch3.res.expected} (70%) rename jscomp/build_tests/super_errors/expected/{uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected => variant_spread_tag_value_mismatch4.res.expected} (57%) rename jscomp/build_tests/super_errors/fixtures/{curriedvalueinsteadofuncurriedincurriedmode.res => variant_spread_tag_value_mismatch1.res} (100%) rename jscomp/build_tests/super_errors/fixtures/{curriedvalueinsteadofuncurriedinuncurriedmode.res => variant_spread_tag_value_mismatch2.res} (100%) rename jscomp/build_tests/super_errors/fixtures/{uncurriedvalueinsteadofcurriedincurriedmode.res => variant_spread_tag_value_mismatch3.res} (100%) rename jscomp/build_tests/super_errors/fixtures/{uncurriedvalueinsteadofcurriedinuncurriedmode.res => variant_spread_tag_value_mismatch4.res} (100%) diff --git a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch1.res.expected similarity index 70% rename from jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected rename to jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch1.res.expected index 0acfcd6898..48152a9582 100644 --- a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedincurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch1.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:3:5-5:1 + /.../fixtures/variant_spread_tag_value_mismatch1.res:3:5-5:1 1 │ module Foo: { 2 │ let addcuc: (. int, int) => int @@ -22,7 +22,7 @@ let addcuc: (int, int) => int (curried) is not included in let addcuc: (. int, int) => int (uncurried) - /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:2:3-33: + /.../fixtures/variant_spread_tag_value_mismatch1.res:2:3-33: Expected declaration - /.../fixtures/curriedvalueinsteadofuncurriedincurriedmode.res:4:7-12: + /.../fixtures/variant_spread_tag_value_mismatch1.res:4:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch2.res.expected similarity index 71% rename from jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected rename to jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch2.res.expected index 4680827216..5b99b03586 100644 --- a/jscomp/build_tests/super_errors/expected/curriedvalueinsteadofuncurriedinuncurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch2.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:5:5-8:1 + /.../fixtures/variant_spread_tag_value_mismatch2.res:5:5-8:1 3 │ module Foo: { 4 │ let addcuu: (int, int) => int @@ -23,7 +23,7 @@ let addcuu: (int, int) => int (curried) is not included in let addcuu: (int, int) => int (uncurried) - /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:4:3-31: + /.../fixtures/variant_spread_tag_value_mismatch2.res:4:3-31: Expected declaration - /.../fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res:7:7-12: + /.../fixtures/variant_spread_tag_value_mismatch2.res:7:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch3.res.expected similarity index 70% rename from jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected rename to jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch3.res.expected index 5a4c9c60ad..45e899e7cb 100644 --- a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedincurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch3.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:3:5-5:1 + /.../fixtures/variant_spread_tag_value_mismatch3.res:3:5-5:1 1 │ module Foo: { 2 │ let adducc: (int, int) => int @@ -22,7 +22,7 @@ let adducc: (. int, int) => int (uncurried) is not included in let adducc: (int, int) => int (curried) - /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:2:3-31: + /.../fixtures/variant_spread_tag_value_mismatch3.res:2:3-31: Expected declaration - /.../fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res:4:7-12: + /.../fixtures/variant_spread_tag_value_mismatch3.res:4:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch4.res.expected similarity index 57% rename from jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected rename to jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch4.res.expected index 8ea6ce712c..9b6c3d69ad 100644 --- a/jscomp/build_tests/super_errors/expected/uncurriedvalueinsteadofcurriedinuncurriedmode.res.expected +++ b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch4.res.expected @@ -1,6 +1,6 @@ We've found a bug for you! - /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:6:5-8:1 + /.../fixtures/variant_spread_tag_value_mismatch4.res:6:5-8:1 4 │ @@uncurried.swap 5 │ let adducu: (. int, int) => int @@ -10,12 +10,19 @@ 9 │ Signature mismatch: - ... + Modules do not match: + { + let adducu: (int, int) => int +} + is not included in + { + let adducu: (int, int) => int +} Values do not match: let adducu: (int, int) => int (uncurried) is not included in let adducu: (int, int) => int (curried) - /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:5:3-33: + /.../fixtures/variant_spread_tag_value_mismatch4.res:5:3-33: Expected declaration - /.../fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res:7:7-12: + /.../fixtures/variant_spread_tag_value_mismatch4.res:7:7-12: Actual declaration \ No newline at end of file diff --git a/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch1.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedincurriedmode.res rename to jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch1.res diff --git a/jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch2.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/curriedvalueinsteadofuncurriedinuncurriedmode.res rename to jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch2.res diff --git a/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch3.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedincurriedmode.res rename to jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch3.res diff --git a/jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch4.res similarity index 100% rename from jscomp/build_tests/super_errors/fixtures/uncurriedvalueinsteadofcurriedinuncurriedmode.res rename to jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch4.res