diff options
author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-06-18 14:12:54 +0100 |
---|---|---|
committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-06-18 14:15:59 +0100 |
commit | 02bac0254182def11029e2f7373ba8d2ba9ebe44 (patch) | |
tree | 9b254a1af59a751f28af395b98b52b51b0d61a39 /testsuite/tests/module | |
parent | 4a7a6c3ac869f74dfe1c9af09c48faadc0ecba16 (diff) | |
download | haskell-02bac0254182def11029e2f7373ba8d2ba9ebe44.tar.gz |
Remove some horrible munging of origins for Coercible
I just didn't think it was buying enough for all the cruft it caused.
We can put some back if people start complaining about poor error
messages. I forget quite how I tripped over this but I got sucked in.
* Lots of tidying up in TcErrors
* Rename pprArisingAt to pprCtLoc, by analogy with pprCtOrigin
* Remove CoercibleOrigin data constructor from CtOrigin
* Make relevantBindings return a Ct with a zonked
and tidied CtOrigin
* Add to TcRnTypes
ctOrigin :: Ct -> CtOrigin
ctEvOrigin :: CtEvidence -> CtOrigin
setCtLoc :: Ct -> CtLoc -> Ct
Diffstat (limited to 'testsuite/tests/module')
-rw-r--r-- | testsuite/tests/module/mod180.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/module/mod180.stderr b/testsuite/tests/module/mod180.stderr index 732b5c8d0d..f76cfc8480 100644 --- a/testsuite/tests/module/mod180.stderr +++ b/testsuite/tests/module/mod180.stderr @@ -1,8 +1,8 @@ -mod180.hs:8:5: +mod180.hs:8:5: error: Couldn't match expected type ‘T’ with actual type ‘main:Mod180_A.T’ - NB: ‘T’ is defined at Mod180_B.hs:3:1-10 - ‘main:Mod180_A.T’ is defined at Mod180_A.hs:3:1-10 + NB: ‘main:Mod180_A.T’ is defined at Mod180_A.hs:3:1-10 + ‘T’ is defined at Mod180_B.hs:3:1-10 In the expression: x In an equation for ‘z’: z = x |