summaryrefslogtreecommitdiff
path: root/testsuite/tests/module/mod155.stderr
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-08-02 18:00:28 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2011-08-02 18:00:28 +0100
commit87a5ef5f2cc20acde5febae1e3ce6989caf8accc (patch)
tree01f15aa64cd3a6e735f0ee04ea8e6d6ce128eaf2 /testsuite/tests/module/mod155.stderr
parentb65f16d0055032077867a1cf804543ff83f0b35f (diff)
downloadhaskell-87a5ef5f2cc20acde5febae1e3ce6989caf8accc.tar.gz
Error message changes due to pretty-printing of provenances
Diffstat (limited to 'testsuite/tests/module/mod155.stderr')
-rw-r--r--testsuite/tests/module/mod155.stderr6
1 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/tests/module/mod155.stderr b/testsuite/tests/module/mod155.stderr
index a6a732c5b8..889e9772c9 100644
--- a/testsuite/tests/module/mod155.stderr
+++ b/testsuite/tests/module/mod155.stderr
@@ -1,5 +1,7 @@
mod155.hs:2:10:
Conflicting exports for `id':
- `module M' exports `M.id' imported from Prelude at mod155.hs:4:1-19
- `module M' exports `M.id' defined at mod155.hs:5:1
+ `module M' exports `M.id'
+ imported from `Prelude' at mod155.hs:4:1-19
+ (and originally defined in `GHC.Base')
+ `module M' exports `M.id' defined at mod155.hs:5:1