diff options
| author | Richard Eisenberg <rae@cs.brynmawr.edu> | 2017-06-14 16:35:18 -0400 |
|---|---|---|
| committer | Richard Eisenberg <rae@cs.brynmawr.edu> | 2017-07-27 07:49:06 -0400 |
| commit | c2417b87ff59c92fbfa8eceeff2a0d6152b11a47 (patch) | |
| tree | 75d37ad9c2c6e820d6965c4aba191a9173f0edc5 /testsuite/tests/rename | |
| parent | 79cfb1999474ad15dd955a10c846c8ea87e612c2 (diff) | |
| download | haskell-c2417b87ff59c92fbfa8eceeff2a0d6152b11a47.tar.gz | |
Fix #13819 by refactoring TypeEqOrigin.uo_thing
The uo_thing field of TypeEqOrigin is used to track the
"thing" (either term or type) that has the type (kind) stored
in the TypeEqOrigin fields. Previously, this was sometimes a
proper Core Type, which needed zonking and tidying. Now, it
is only HsSyn: much simpler, and the error messages now use
the user-written syntax.
But this aspect of uo_thing didn't cause #13819; it was the
sibling field uo_arity that did. uo_arity stored the number
of arguments of uo_thing, useful when reporting something
like "should have written 2 fewer arguments". We wouldn't want
to say that if the thing didn't have two arguments. However,
in practice, GHC was getting this wrong, and this message
didn't seem all that helpful. Furthermore, the calculation
of the number of arguments is what caused #13819 to fall over.
This patch just removes uo_arity. In my opinion, the change
to error messages is a nudge in the right direction.
Test case: typecheck/should_fail/T13819
Diffstat (limited to 'testsuite/tests/rename')
| -rw-r--r-- | testsuite/tests/rename/should_fail/rnfail026.stderr | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/tests/rename/should_fail/rnfail026.stderr b/testsuite/tests/rename/should_fail/rnfail026.stderr index dc6ee9691a..8bd80b1b58 100644 --- a/testsuite/tests/rename/should_fail/rnfail026.stderr +++ b/testsuite/tests/rename/should_fail/rnfail026.stderr @@ -1,7 +1,6 @@ rnfail026.hs:16:27: error: - • Expecting one fewer arguments to ‘Set a’ - Expected kind ‘* -> *’, but ‘Set a’ has kind ‘*’ + • Expected kind ‘* -> *’, but ‘Set a’ has kind ‘*’ • In the first argument of ‘Monad’, namely ‘(forall a. Eq a => Set a)’ In the instance declaration for ‘Monad (forall a. Eq a => Set a)’ |