diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-10-27 12:10:56 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-10-27 12:10:56 +0000 |
| commit | c833fdc63322c31819d8f02c92ba9f5b99a7989f (patch) | |
| tree | 8611cf10a188f518cf80559a50e34d0d03daa652 /testsuite/tests/ghc-regress/module | |
| parent | b1f70eb0a752ab2ea234e790b5a988cc5e591641 (diff) | |
| download | haskell-c833fdc63322c31819d8f02c92ba9f5b99a7989f.tar.gz | |
accept output (some re-ordering in error messages)
Diffstat (limited to 'testsuite/tests/ghc-regress/module')
| -rw-r--r-- | testsuite/tests/ghc-regress/module/mod131.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/ghc-regress/module/mod150.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghc-regress/module/mod152.stderr | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-regress/module/mod131.stderr b/testsuite/tests/ghc-regress/module/mod131.stderr index ad6e9eb48f..5dcc5efab8 100644 --- a/testsuite/tests/ghc-regress/module/mod131.stderr +++ b/testsuite/tests/ghc-regress/module/mod131.stderr @@ -1,7 +1,7 @@ mod131.hs:2:27: Conflicting exports for `f': - `Mod131_A.f' exports `Mod131_A.f' imported from Mod131_A at mod131.hs:4:27 - (defined at Mod131_A.hs:3:1) `module Mod131_B' exports `f' imported from Mod131_B at mod131.hs:3:17 (defined at Mod131_B.hs:3:1) + `Mod131_A.f' exports `Mod131_A.f' imported from Mod131_A at mod131.hs:4:27 + (defined at Mod131_A.hs:3:1) diff --git a/testsuite/tests/ghc-regress/module/mod150.stderr b/testsuite/tests/ghc-regress/module/mod150.stderr index 7bdef92eb2..7c5fca1eb4 100644 --- a/testsuite/tests/ghc-regress/module/mod150.stderr +++ b/testsuite/tests/ghc-regress/module/mod150.stderr @@ -1,5 +1,5 @@ mod150.hs:2:20: Conflicting exports for `id': - `module Prelude' exports `Prelude.id' imported from Prelude `module M' exports `M.id' defined at mod150.hs:2:42 + `module Prelude' exports `Prelude.id' imported from Prelude diff --git a/testsuite/tests/ghc-regress/module/mod152.stderr b/testsuite/tests/ghc-regress/module/mod152.stderr index 159151e72b..3d67ecbd62 100644 --- a/testsuite/tests/ghc-regress/module/mod152.stderr +++ b/testsuite/tests/ghc-regress/module/mod152.stderr @@ -6,5 +6,5 @@ mod152.hs:2:26: mod152.hs:2:26: Conflicting exports for `id': - `module Prelude' exports `Prelude.id' imported from Prelude `id' exports `M.id' defined at mod152.hs:2:36 + `module Prelude' exports `Prelude.id' imported from Prelude |