diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2021-02-15 22:36:16 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-01 17:30:21 -0500 |
| commit | 7730713b747e66c93b4fe45478981a6e2ebfc7e2 (patch) | |
| tree | 64301948eb33d227cfc01aa57be2fdda60a2c13c /testsuite/tests/th | |
| parent | 8c425bd83b3d622cd055ad015daca3539a6670de (diff) | |
| download | haskell-7730713b747e66c93b4fe45478981a6e2ebfc7e2.tar.gz | |
Unify result type earlier to improve error messages
Ticket #19364 helpfully points out that we do not currently take
advantage of pushing the result type of an application into the
arguments. This makes error messages notably less good.
The fix is rather easy: move the result-type unification step earlier.
It's even a bit more efficient; in the the checking case we now
do one less zonk.
See Note [Unify with expected type before typechecking arguments]
in GHC.Tc.Gen.App
This change generally improves error messages, but it made one worse:
typecheck/should_fail/T16204c. That led me to the realisation that
a good error can be replaced by a less-good one, which provoked
me to change GHC.Tc.Solver.Interact.inertsCanDischarge. It's
explained in the new Note [Combining equalities]
One other refactoring: I discovered that KindEqOrigin didn't need a
Maybe in its type -- a nice simplification.
Diffstat (limited to 'testsuite/tests/th')
| -rw-r--r-- | testsuite/tests/th/T10945.stderr | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/testsuite/tests/th/T10945.stderr b/testsuite/tests/th/T10945.stderr index 1c7a0f238d..fe71a2f50c 100644 --- a/testsuite/tests/th/T10945.stderr +++ b/testsuite/tests/th/T10945.stderr @@ -1,10 +1,17 @@ -T10945.hs:7:4: error: +T10945.hs:7:11: error: • Couldn't match type: [Dec] with: Q [Dec] - Expected: Code Q DecsQ - Actual: Code Q [Dec] - • In the expression: + Expected: DecsQ + Actual: [Dec] + • In the first argument of ‘return’, namely + ‘[SigD + (mkName "m") + (ForallT + [PlainTV (mkName "a") SpecifiedSpec] [] + (AppT (AppT ArrowT (VarT (mkName "a"))) (VarT (mkName "a")))), + FunD (mkName "m") [Clause [...] (NormalB (VarE (mkName "x"))) []]]’ + In the expression: return [SigD (mkName "m") @@ -20,11 +27,3 @@ T10945.hs:7:4: error: [PlainTV (mkName "a") SpecifiedSpec] [] (AppT (AppT ArrowT (VarT (mkName "a"))) (VarT (mkName "a")))), FunD (mkName "m") [Clause [...] (NormalB (VarE (mkName "x"))) []]]) - In the expression: - $$(return - [SigD - (mkName "m") - (ForallT - [PlainTV (mkName "a") SpecifiedSpec] [] - (AppT (AppT ArrowT (VarT (mkName "a"))) (VarT (mkName "a")))), - FunD (mkName "m") [Clause ... (NormalB (VarE (mkName "x"))) []]]) |