diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2020-07-16 14:35:42 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-24 13:16:32 -0400 |
| commit | 9fa26aa16f9eee0b56b5d9e65c16367d7b789996 (patch) | |
| tree | a7b27876018129d93bdb3e91f7b1762e30e37f5b /compiler/GHC/Tc/Errors | |
| parent | 97cff9190d346c3b51c32c88fd145fcf1e6678f1 (diff) | |
| download | haskell-9fa26aa16f9eee0b56b5d9e65c16367d7b789996.tar.gz | |
Improve kind generalisation, error messages
This patch does two things:
* It refactors GHC.Tc.Errors a bit. In debugging Quick Look I was
forced to look in detail at error messages, and ended up doing a bit
of refactoring, esp in mkTyVarEqErr'. It's still quite a mess, but
a bit better, I think.
* It makes a significant improvement to the kind checking of type and
class declarations. Specifically, we now ensure that if kind
checking fails with an unsolved constraint, all the skolems are in
scope. That wasn't the case before, which led to some obscure error
messages; and occasional failures with "no skolem info" (eg #16245).
Both of these, and the main Quick Look patch itself, affect a /lot/ of
error messages, as you can see from the number of files changed. I've
checked them all; I think they are as good or better than before.
Smaller things
* I documented the various instances of VarBndr better.
See Note [The VarBndr tyep and its uses] in GHC.Types.Var
* Renamed GHC.Tc.Solver.simpl_top to simplifyTopWanteds
* A bit of refactoring in bindExplicitTKTele, to avoid the
footwork with Either. Simpler now.
* Move promoteTyVar from GHC.Tc.Solver to GHC.Tc.Utils.TcMType
Fixes #16245 (comment 211369), memorialised as
typecheck/polykinds/T16245a
Also fixes the three bugs in #18640
Diffstat (limited to 'compiler/GHC/Tc/Errors')
| -rw-r--r-- | compiler/GHC/Tc/Errors/Hole.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/GHC/Tc/Errors/Hole.hs b/compiler/GHC/Tc/Errors/Hole.hs index 06a75e2a1f..3ff2312903 100644 --- a/compiler/GHC/Tc/Errors/Hole.hs +++ b/compiler/GHC/Tc/Errors/Hole.hs @@ -44,7 +44,7 @@ import Data.List ( partition, sort, sortOn, nubBy ) import Data.Graph ( graphFromEdges, topSort ) -import GHC.Tc.Solver ( simpl_top, runTcSDeriveds ) +import GHC.Tc.Solver ( simplifyTopWanteds, runTcSDeriveds ) import GHC.Tc.Utils.Unify ( tcSubTypeSigma ) import GHC.HsToCore.Docs ( extractDocs ) @@ -957,7 +957,7 @@ tcCheckHoleFit (TypedHole {..}) hole_ty ty = discardErrs $ w_rel_cts = addSimples wanted cloned_relevants final_wc = foldr (setWCAndBinds fresh_binds) w_rel_cts outermost_first ; traceTc "final_wc is: " $ ppr final_wc - ; rem <- runTcSDeriveds $ simpl_top final_wc + ; rem <- runTcSDeriveds $ simplifyTopWanteds final_wc -- We don't want any insoluble or simple constraints left, but -- solved implications are ok (and necessary for e.g. undefined) ; traceTc "rems was:" $ ppr rem |