diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-02 18:00:28 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-02 18:00:28 +0100 |
| commit | 87a5ef5f2cc20acde5febae1e3ce6989caf8accc (patch) | |
| tree | 01f15aa64cd3a6e735f0ee04ea8e6d6ce128eaf2 /testsuite/tests/rename | |
| parent | b65f16d0055032077867a1cf804543ff83f0b35f (diff) | |
| download | haskell-87a5ef5f2cc20acde5febae1e3ce6989caf8accc.tar.gz | |
Error message changes due to pretty-printing of provenances
Diffstat (limited to 'testsuite/tests/rename')
5 files changed, 15 insertions, 8 deletions
diff --git a/testsuite/tests/rename/should_compile/T1972.stderr b/testsuite/tests/rename/should_compile/T1972.stderr index 4f9344c4bc..610e509402 100644 --- a/testsuite/tests/rename/should_compile/T1972.stderr +++ b/testsuite/tests/rename/should_compile/T1972.stderr @@ -6,6 +6,6 @@ T1972.hs:12:3: T1972.hs:14:3: Warning: This binding for `mapAccumL' shadows the existing bindings defined at T1972.hs:16:1 - imported from Data.List at T1972.hs:7:1-16 + imported from `Data.List' at T1972.hs:7:1-16 T1972.hs:20:10: Warning: Defined but not used: `c' diff --git a/testsuite/tests/rename/should_compile/rn039.stderr-ghc b/testsuite/tests/rename/should_compile/rn039.stderr-ghc index 5c0e229050..51adb6fa8b 100644 --- a/testsuite/tests/rename/should_compile/rn039.stderr-ghc +++ b/testsuite/tests/rename/should_compile/rn039.stderr-ghc @@ -1,4 +1,5 @@ rn039.hs:6:16: Warning: This binding for `-' shadows the existing binding - imported from Prelude at rn039.hs:2:8-20 + imported from `Prelude' at rn039.hs:2:8-20 + (and originally defined in `GHC.Num') diff --git a/testsuite/tests/rename/should_fail/rnfail029.stderr b/testsuite/tests/rename/should_fail/rnfail029.stderr index e22f4c33ae..360a9aac9e 100644 --- a/testsuite/tests/rename/should_fail/rnfail029.stderr +++ b/testsuite/tests/rename/should_fail/rnfail029.stderr @@ -1,5 +1,8 @@ rnfail029.hs:2:36: Conflicting exports for `map': - `Data.List.map' exports `Data.List.map' imported from Data.List at rnfail029.hs:3:1-26 - `module ShouldFail' exports `ShouldFail.map' defined at rnfail029.hs:4:1 + `Data.List.map' exports `Data.List.map' + imported qualified from `Data.List' at rnfail029.hs:3:1-26 + (and originally defined in `GHC.Base') + `module ShouldFail' exports `ShouldFail.map' + defined at rnfail029.hs:4:1 diff --git a/testsuite/tests/rename/should_fail/rnfail040.stderr b/testsuite/tests/rename/should_fail/rnfail040.stderr index 25e3c1153f..cacdaa8d8d 100644 --- a/testsuite/tests/rename/should_fail/rnfail040.stderr +++ b/testsuite/tests/rename/should_fail/rnfail040.stderr @@ -1,6 +1,8 @@ rnfail040.hs:7:12: Conflicting exports for `nub': - `module M' exports `M.nub' imported from Data.List at rnfail040.hs:10:2-22 - `module M' exports `T.nub' imported from Rnfail040_A at rnfail040.hs:11:2-24 - (defined at Rnfail040_A.hs:2:3) + `module M' exports `M.nub' + imported from `Data.List' at rnfail040.hs:10:2-22 + `module M' exports `T.nub' + imported from `Rnfail040_A' at rnfail040.hs:11:2-24 + (and originally defined at Rnfail040_A.hs:2:3-5) diff --git a/testsuite/tests/rename/should_fail/rnfail044.stderr b/testsuite/tests/rename/should_fail/rnfail044.stderr index 5284ac9178..48be6944d0 100644 --- a/testsuite/tests/rename/should_fail/rnfail044.stderr +++ b/testsuite/tests/rename/should_fail/rnfail044.stderr @@ -3,4 +3,5 @@ rnfail044.hs:5:12: Ambiguous occurrence `splitAt' It could refer to either `A.splitAt', defined at rnfail044.hs:8:3 or `Data.List.splitAt', - imported from Prelude at rnfail044.hs:5:8 + imported from `Prelude' at rnfail044.hs:5:8 + (and originally defined in `GHC.List') |