diff options
| -rw-r--r-- | testsuite/tests/module/mod150.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/module/mod151.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/module/mod152.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/module/mod153.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/rename/should_compile/rn039.stderr-ghc | 2 | ||||
| -rw-r--r-- | testsuite/tests/rename/should_fail/rnfail044.stderr | 3 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_fail/tcfail037.stderr | 5 |
7 files changed, 11 insertions, 9 deletions
diff --git a/testsuite/tests/module/mod150.stderr b/testsuite/tests/module/mod150.stderr index 7c5fca1eb4..1b410fd0a1 100644 --- a/testsuite/tests/module/mod150.stderr +++ b/testsuite/tests/module/mod150.stderr @@ -1,5 +1,5 @@ mod150.hs:2:20: Conflicting exports for `id': + `module Prelude' exports `Prelude.id' imported from Prelude at mod150.hs:2:8 `module M' exports `M.id' defined at mod150.hs:2:42 - `module Prelude' exports `Prelude.id' imported from Prelude diff --git a/testsuite/tests/module/mod151.stderr b/testsuite/tests/module/mod151.stderr index edcea97e44..c8d8ce87dc 100644 --- a/testsuite/tests/module/mod151.stderr +++ b/testsuite/tests/module/mod151.stderr @@ -2,4 +2,4 @@ mod151.hs:2:20: Ambiguous occurrence `id' It could refer to either `M.id', defined at mod151.hs:2:30 - or `Prelude.id', imported from Prelude + or `Prelude.id', imported from Prelude at mod151.hs:2:8 diff --git a/testsuite/tests/module/mod152.stderr b/testsuite/tests/module/mod152.stderr index 3d67ecbd62..dd21f8cf67 100644 --- a/testsuite/tests/module/mod152.stderr +++ b/testsuite/tests/module/mod152.stderr @@ -2,9 +2,9 @@ mod152.hs:2:26: Ambiguous occurrence `id' It could refer to either `M.id', defined at mod152.hs:2:36 - or `Prelude.id', imported from Prelude + or `Prelude.id', imported from Prelude at mod152.hs:2:8 mod152.hs:2:26: Conflicting exports for `id': + `module Prelude' exports `Prelude.id' imported from Prelude at mod152.hs:2:8 `id' exports `M.id' defined at mod152.hs:2:36 - `module Prelude' exports `Prelude.id' imported from Prelude diff --git a/testsuite/tests/module/mod153.stderr b/testsuite/tests/module/mod153.stderr index 5a35ceb51a..d3a8b9b6a9 100644 --- a/testsuite/tests/module/mod153.stderr +++ b/testsuite/tests/module/mod153.stderr @@ -2,4 +2,4 @@ mod153.hs:2:11: Ambiguous occurrence `id' It could refer to either `M.id', defined at mod153.hs:2:21 - or `Prelude.id', imported from Prelude + or `Prelude.id', imported from Prelude at mod153.hs:2:8 diff --git a/testsuite/tests/rename/should_compile/rn039.stderr-ghc b/testsuite/tests/rename/should_compile/rn039.stderr-ghc index f3c9c5bf3d..5c0e229050 100644 --- a/testsuite/tests/rename/should_compile/rn039.stderr-ghc +++ b/testsuite/tests/rename/should_compile/rn039.stderr-ghc @@ -1,4 +1,4 @@ rn039.hs:6:16: Warning: This binding for `-' shadows the existing binding - imported from Prelude + imported from Prelude at rn039.hs:2:8-20 diff --git a/testsuite/tests/rename/should_fail/rnfail044.stderr b/testsuite/tests/rename/should_fail/rnfail044.stderr index 2b27ad4fea..5284ac9178 100644 --- a/testsuite/tests/rename/should_fail/rnfail044.stderr +++ b/testsuite/tests/rename/should_fail/rnfail044.stderr @@ -2,4 +2,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 + or `Data.List.splitAt', + imported from Prelude at rnfail044.hs:5:8 diff --git a/testsuite/tests/typecheck/should_fail/tcfail037.stderr b/testsuite/tests/typecheck/should_fail/tcfail037.stderr index a6a2a5e412..b0009e6a19 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail037.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail037.stderr @@ -1,5 +1,6 @@ tcfail037.hs:7:11: Ambiguous occurrence `+' - It could refer to either `ShouldFail.+', defined at tcfail037.hs:10:5 - or `Prelude.+', imported from Prelude + It could refer to either `ShouldFail.+', + defined at tcfail037.hs:10:5 + or `Prelude.+', imported from Prelude at tcfail037.hs:3:8-17 |