Changes in error messages when fixing Trac #8649

Mostly improvements, happily

9 files changed, 33 insertions, 34 deletions

diff --git a/testsuite/tests/ghci/scripts/ghci040.stdout b/testsuite/tests/ghci/scripts/ghci040.stdout
index 6ea78799b1..b440ef499d 100644
--- a/testsuite/tests/ghci/scripts/ghci040.stdout
+++ b/testsuite/tests/ghci/scripts/ghci040.stdout
@@ -1,2 +1 @@
-data main::Interactive.T = A | ...
-  	-- Defined at <interactive>:3:10
+data Ghci1.T = A | ... 	-- Defined at <interactive>:3:10
diff --git a/testsuite/tests/ghci/scripts/ghci042.stdout b/testsuite/tests/ghci/scripts/ghci042.stdout
index 043f88952b..2a75ecb496 100644
--- a/testsuite/tests/ghci/scripts/ghci042.stdout
+++ b/testsuite/tests/ghci/scripts/ghci042.stdout
@@ -3,5 +3,4 @@ data T = A {a :: Int} 	-- Defined at <interactive>:3:13
 a :: Integer 	-- Defined at <interactive>:6:5
 3
 data R = B {a :: Int} 	-- Defined at <interactive>:9:13
-data T = A {main::Interactive.a :: Int}
-  	-- Defined at <interactive>:3:1
+data T = A {Ghci1.a :: Int} 	-- Defined at <interactive>:3:1
diff --git a/testsuite/tests/ghci/scripts/ghci051.stderr b/testsuite/tests/ghci/scripts/ghci051.stderr
index aec3647664..363eeb11f6 100644
--- a/testsuite/tests/ghci/scripts/ghci051.stderr
+++ b/testsuite/tests/ghci/scripts/ghci051.stderr
@@ -1,6 +1,9 @@
 
 <interactive>:7:9:
-    Couldn't match type ‛T’ with ‛main::Interactive.T’
+    Couldn't match type ‛T’
+                  with ‛Ghci1.T’
+    NB: ‛T’ is defined at <interactive>:6:1-16
+        ‛Ghci1.T’ is defined at <interactive>:3:1-14
     Expected type: T'
       Actual type: T
     In the expression: C :: T'
diff --git a/testsuite/tests/ghci/scripts/ghci051.stdout b/testsuite/tests/ghci/scripts/ghci051.stdout
index 2501da4d28..f69b0e2de3 100644
--- a/testsuite/tests/ghci/scripts/ghci051.stdout
+++ b/testsuite/tests/ghci/scripts/ghci051.stdout
@@ -1,11 +1,9 @@
 data T = C | D 	-- Defined at <interactive>:9:1
-type T' = main::Interactive.T 	-- Defined at <interactive>:4:1
-data main::Interactive.T = A | ...
-  	-- Defined at <interactive>:3:10
-data main::Interactive.T = B | ...
-  	-- Defined at <interactive>:6:12
+type T' = Ghci1.T 	-- Defined at <interactive>:4:1
+data Ghci1.T = A | ... 	-- Defined at <interactive>:3:10
+data Ghci4.T = B | ... 	-- Defined at <interactive>:6:12
 data T = C | ... 	-- Defined at <interactive>:9:14
 data T = ... | D 	-- Defined at <interactive>:9:18
 b :: T' 	-- Defined at <interactive>:5:5
-c :: main::Interactive.T 	-- Defined at <interactive>:8:5
+c :: Ghci4.T 	-- Defined at <interactive>:8:5
 d :: T 	-- Defined at <interactive>:10:5
diff --git a/testsuite/tests/ghci/scripts/ghci052.stderr b/testsuite/tests/ghci/scripts/ghci052.stderr
index 35977bf066..a653ea0cdd 100644
--- a/testsuite/tests/ghci/scripts/ghci052.stderr
+++ b/testsuite/tests/ghci/scripts/ghci052.stderr
@@ -1,32 +1,32 @@
 
 <interactive>:9:4:
-    Couldn't match expected type ‛main::Interactive.Planet’
+    Couldn't match expected type ‛Ghci1.Planet’
                 with actual type ‛Planet’
-    NB: ‛main::Interactive.Planet’ is defined in ‛:Interactive’
-        ‛Planet’ is defined in ‛:Interactive’
+    NB: ‛Ghci1.Planet’ is defined at <interactive>:5:1-37
+        ‛Planet’ is defined at <interactive>:8:1-36
     In the first argument of ‛pn’, namely ‛Mercury’
     In the expression: pn Mercury
 
 <interactive>:10:4:
-    Couldn't match expected type ‛main::Interactive.Planet’
+    Couldn't match expected type ‛Ghci1.Planet’
                 with actual type ‛Planet’
-    NB: ‛main::Interactive.Planet’ is defined in ‛:Interactive’
-        ‛Planet’ is defined in ‛:Interactive’
+    NB: ‛Ghci1.Planet’ is defined at <interactive>:5:1-37
+        ‛Planet’ is defined at <interactive>:8:1-36
     In the first argument of ‛pn’, namely ‛Venus’
     In the expression: pn Venus
 
 <interactive>:11:4:
-    Couldn't match expected type ‛main::Interactive.Planet’
+    Couldn't match expected type ‛Ghci1.Planet’
                 with actual type ‛Planet’
-    NB: ‛main::Interactive.Planet’ is defined in ‛:Interactive’
-        ‛Planet’ is defined in ‛:Interactive’
+    NB: ‛Ghci1.Planet’ is defined at <interactive>:5:1-37
+        ‛Planet’ is defined at <interactive>:8:1-36
     In the first argument of ‛pn’, namely ‛Mars’
     In the expression: pn Mars
 
 <interactive>:13:44:
     Couldn't match expected type ‛Planet’
-                with actual type ‛main::Interactive.Planet’
-    NB: ‛Planet’ is defined in ‛:Interactive’
-        ‛main::Interactive.Planet’ is defined in ‛:Interactive’
+                with actual type ‛Ghci1.Planet’
+    NB: ‛Planet’ is defined at <interactive>:8:1-36
+        ‛Ghci1.Planet’ is defined at <interactive>:5:1-37
     In the pattern: Earth
     In an equation for ‛pn’: pn Earth = "E"
diff --git a/testsuite/tests/ghci/scripts/ghci053.stderr b/testsuite/tests/ghci/scripts/ghci053.stderr
index abb400977c..6ea05924d9 100644
--- a/testsuite/tests/ghci/scripts/ghci053.stderr
+++ b/testsuite/tests/ghci/scripts/ghci053.stderr
@@ -1,16 +1,16 @@
 
 <interactive>:10:12:
-    Couldn't match expected type ‛main::Interactive.Planet’
+    Couldn't match expected type ‛Ghci1.Planet’
                 with actual type ‛Planet’
-    NB: ‛main::Interactive.Planet’ is defined in ‛:Interactive’
-        ‛Planet’ is defined in ‛:Interactive’
+    NB: ‛Ghci1.Planet’ is defined at <interactive>:5:1-49
+        ‛Planet’ is defined at <interactive>:8:1-41
     In the second argument of ‛(==)’, namely ‛Mercury’
     In the expression: mercury == Mercury
 
 <interactive>:12:10:
     Couldn't match expected type ‛Planet’
-                with actual type ‛main::Interactive.Planet’
-    NB: ‛Planet’ is defined in ‛:Interactive’
-        ‛main::Interactive.Planet’ is defined in ‛:Interactive’
+                with actual type ‛Ghci1.Planet’
+    NB: ‛Planet’ is defined at <interactive>:8:1-41
+        ‛Ghci1.Planet’ is defined at <interactive>:5:1-49
     In the second argument of ‛(==)’, namely ‛Earth’
     In the expression: Venus == Earth
diff --git a/testsuite/tests/module/mod180.stderr b/testsuite/tests/module/mod180.stderr
index dd582e6962..af6826db44 100644
--- a/testsuite/tests/module/mod180.stderr
+++ b/testsuite/tests/module/mod180.stderr
@@ -2,7 +2,7 @@
 mod180.hs:8:5:
     Couldn't match expected type ‛T’
                 with actual type ‛main:Mod180_A.T’
-    NB: ‛T’ is defined in ‛Mod180_B’
-        ‛main:Mod180_A.T’ is defined in ‛Mod180_A’
+    NB: ‛T’ is defined at Mod180_B.hs:3:1-10
+        ‛main:Mod180_A.T’ is defined at Mod180_A.hs:3:1-10
     In the expression: x
     In an equation for ‛z’: z = x
diff --git a/testsuite/tests/th/T8625.stdout b/testsuite/tests/th/T8625.stdout
index a845a1e85a..e6ce48be3a 100644
--- a/testsuite/tests/th/T8625.stdout
+++ b/testsuite/tests/th/T8625.stdout
@@ -1,2 +1,2 @@
-[InstanceD [EqualP (VarT y_0) (AppT (AppT ArrowT (VarT t_1)) (VarT t_1))] (AppT (ConT :Interactive.Member) (ConT GHC.Types.Bool)) []]

-[SigD f_2 (ForallT [PlainTV y_3,PlainTV t_4] [EqualP (VarT y_3) (AppT (AppT ArrowT (VarT t_4)) (VarT t_4))] (AppT (AppT ArrowT (VarT y_3)) (VarT t_4))),FunD f_2 [Clause [VarP x_5] (NormalB (VarE x_5)) []]]

+[InstanceD [EqualP (VarT y_0) (AppT (AppT ArrowT (VarT t_1)) (VarT t_1))] (AppT (ConT Ghci1.Member) (ConT GHC.Types.Bool)) []]
+[SigD f_2 (ForallT [PlainTV y_3,PlainTV t_4] [EqualP (VarT y_3) (AppT (AppT ArrowT (VarT t_4)) (VarT t_4))] (AppT (AppT ArrowT (VarT y_3)) (VarT t_4))),FunD f_2 [Clause [VarP x_5] (NormalB (VarE x_5)) []]]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail182.stderr b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
index 1360b709c2..ad01d392f0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail182.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
@@ -3,7 +3,7 @@ tcfail182.hs:9:3:
     Couldn't match expected type ‛Prelude.Maybe a’
                 with actual type ‛Maybe t0’
     NB: ‛Prelude.Maybe’ is defined in ‛Data.Maybe’ in package ‛base’
-        ‛Maybe’ is defined in ‛Foo’
+        ‛Maybe’ is defined at tcfail182.hs:6:1-18
     Relevant bindings include
       f :: Prelude.Maybe a -> Int (bound at tcfail182.hs:9:1)
     In the pattern: Foo