diff options
| author | simonpj <unknown> | 2002-11-06 12:51:19 +0000 |
|---|---|---|
| committer | simonpj <unknown> | 2002-11-06 12:51:19 +0000 |
| commit | 4e1cf1a630d64ab34f4d3fed444059314f4a93b6 (patch) | |
| tree | 883accb102a468c7a4372275cd068f00e78d1ab8 /testsuite/tests/ghc-regress/rename | |
| parent | 7d70cce8fc9cd16287603395fef0555d66d88f2f (diff) | |
| download | haskell-4e1cf1a630d64ab34f4d3fed444059314f4a93b6.tar.gz | |
[project @ 2002-11-06 12:51:14 by simonpj]
Update expected output
Diffstat (limited to 'testsuite/tests/ghc-regress/rename')
3 files changed, 13 insertions, 5 deletions
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr b/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr index 9398eef0d0..4a50c68411 100644 --- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr +++ b/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr @@ -1,3 +1,5 @@ rnfail029.hs:2: - The export items `List.map' and `module ShouldFail' create conflicting exports for `map' + Conflicting exports for `map': + `List.map' exports `GHC.Base.map' imported from Prelude at rnfail029.hs:2 + `module ShouldFail' exports `ShouldFail.map' defined at rnfail029.hs:4 diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.hs b/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.hs index b13f6c81f8..0093ed1aee 100644 --- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.hs +++ b/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.hs @@ -1,4 +1,8 @@ --- This one should fail, because M.f is ambiguous +-- This one should fail, because it exports +-- both List:nub and Rnfail040_A:nub +-- +-- List:nub is in scope as M.nub and nub +-- Rnfail040_A:nub is in scope as T.nub, M.nub, and nub module M1 (module M) where diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr b/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr index 9eb96d8a54..8650df0264 100644 --- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr +++ b/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr @@ -1,4 +1,6 @@ -rnfail040.hs:3: - The export item `module M' - creates conflicting exports for `Data.List.nub' and `Rnfail040_A.nub' +rnfail040.hs:7: + Conflicting exports for `nub': + `module M' exports `Data.List.nub' imported from List at rnfail040.hs:10 + `module M' exports `Rnfail040_A.nub' imported from Rnfail040_A at rnfail040.hs:11 + (defined at Rnfail040_A.hs:2) |