diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-31 16:15:32 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-31 16:15:32 +0000 |
| commit | 2677e4287c3eaee4249e4b6fe31586f2f698c33d (patch) | |
| tree | 9b444cfd069efb06637a3077c179b41f74557eb9 /compiler | |
| parent | 7e255c5c67cbc60d2d85ee21f03c0e868eb510c1 (diff) | |
| download | haskell-2677e4287c3eaee4249e4b6fe31586f2f698c33d.tar.gz | |
Wibble to recent changes to TcErrors
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/typecheck/TcErrors.lhs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/typecheck/TcErrors.lhs b/compiler/typecheck/TcErrors.lhs index 5fe27f74c7..a754d10be8 100644 --- a/compiler/typecheck/TcErrors.lhs +++ b/compiler/typecheck/TcErrors.lhs @@ -615,6 +615,7 @@ mkTyVarEqErr :: DynFlags -> ReportErrCtxt -> SDoc -> Ct mkTyVarEqErr dflags ctxt extra ct oriented tv1 ty2 | isUserSkolem ctxt tv1 -- ty2 won't be a meta-tyvar, or else the thing would -- be oriented the other way round; see TcCanonical.reOrient + || isSigTyVar tv1 && not (isTyVarTy ty2) = mkErrorMsg ctxt ct (vcat [ misMatchOrCND ctxt ct oriented ty1 ty2 , extraTyVarInfo ctxt ty1 ty2 , extra ]) @@ -640,8 +641,8 @@ mkTyVarEqErr dflags ctxt extra ct oriented tv1 ty2 -- If the immediately-enclosing implication has 'tv' a skolem, and -- we know by now its an InferSkol kind of skolem, then presumably - -- it started life as a SigTv, else it'd have been unified. - -- So just report a mis-match here, without gettin into occurs-checks etc + -- it started life as a SigTv, else it'd have been unified, given + -- that there's no occurs-check or forall problem | (implic:_) <- cec_encl ctxt , Implic { ic_skols = skols } <- implic , tv1 `elem` skols |