Error messsage wibblification

15 files changed, 44 insertions, 44 deletions

diff --git a/testsuite/tests/ghci/scripts/T4015.stdout b/testsuite/tests/ghci/scripts/T4015.stdout
index e850fb9384..4ce312c581 100644
--- a/testsuite/tests/ghci/scripts/T4015.stdout
+++ b/testsuite/tests/ghci/scripts/T4015.stdout
@@ -8,7 +8,7 @@ data R
   | S {x :: Char}
   | T {y :: Int, z :: Float}
   | W
-  	-- Defined at T4015.hs:3:6
+  	-- Defined at T4015.hs:3:1
 data R = ... | S {...} | ... 	-- Defined at T4015.hs:4:10
 data R = ... | T {...} | ... 	-- Defined at T4015.hs:5:10
 data R = ... | W 	-- Defined at T4015.hs:6:10
diff --git a/testsuite/tests/ghci/scripts/T4087.stdout b/testsuite/tests/ghci/scripts/T4087.stdout
index e28eac1776..ece136b610 100644
--- a/testsuite/tests/ghci/scripts/T4087.stdout
+++ b/testsuite/tests/ghci/scripts/T4087.stdout
@@ -1,3 +1,3 @@
 data Equal a b where
   Equal :: Equal a a
-  	-- Defined at T4087.hs:5:6
+  	-- Defined at T4087.hs:5:1
diff --git a/testsuite/tests/ghci/scripts/T4175.stdout b/testsuite/tests/ghci/scripts/T4175.stdout
index 553d92a0ab..a253cf25bf 100644
--- a/testsuite/tests/ghci/scripts/T4175.stdout
+++ b/testsuite/tests/ghci/scripts/T4175.stdout
@@ -1,17 +1,17 @@
-type family A a b :: * 	-- Defined at T4175.hs:4:13
+type family A a b :: * 	-- Defined at T4175.hs:4:1
 type instance A (Maybe a) a -- Defined at T4175.hs:6:1
 type instance A Int Int -- Defined at T4175.hs:5:1
-data family B a 	-- Defined at T4175.hs:8:13
+data family B a 	-- Defined at T4175.hs:8:1
 data instance B () -- Defined at T4175.hs:9:15
 class C a where
   type family D a b :: *
-  	-- Defined at T4175.hs:12:10
+  	-- Defined at T4175.hs:12:5
 type D () () -- Defined at T4175.hs:18:5
 type D Int () -- Defined at T4175.hs:15:5
 type family E a :: * where
     E () = Bool
     E Int = String
-  	-- Defined at T4175.hs:20:13
+  	-- Defined at T4175.hs:20:1
 data () = () 	-- Defined in ‛GHC.Tuple’
 instance C () -- Defined at T4175.hs:17:10
 instance Bounded () -- Defined in ‛GHC.Enum’
diff --git a/testsuite/tests/ghci/scripts/T5417.stdout b/testsuite/tests/ghci/scripts/T5417.stdout
index ec42e184a0..80bb298860 100644
--- a/testsuite/tests/ghci/scripts/T5417.stdout
+++ b/testsuite/tests/ghci/scripts/T5417.stdout
@@ -3,5 +3,5 @@ data instance C.F (B1 a) = B2 a
 data family D a
 class C.C1 a where
   data family C.F a
-  	-- Defined at T5417a.hs:5:10
+  	-- Defined at T5417a.hs:5:5
 data C.F (B1 a) -- Defined at T5417.hs:8:10
diff --git a/testsuite/tests/ghci/scripts/T5820.stdout b/testsuite/tests/ghci/scripts/T5820.stdout
index 4102b1f987..e0a97a06d5 100644
--- a/testsuite/tests/ghci/scripts/T5820.stdout
+++ b/testsuite/tests/ghci/scripts/T5820.stdout
@@ -1,4 +1,4 @@
-data Foo = Foo 	-- Defined at T5820.hs:2:6
+data Foo = Foo 	-- Defined at T5820.hs:2:1
 instance Eq Foo -- Defined at T5820.hs:3:10
-data Foo = Foo 	-- Defined at T5820.hs:2:6
+data Foo = Foo 	-- Defined at T5820.hs:2:1
 instance Eq Foo -- Defined at T5820.hs:3:10
diff --git a/testsuite/tests/ghci/scripts/T6027ghci.stdout b/testsuite/tests/ghci/scripts/T6027ghci.stdout
index 3b5a01c5ad..2cc6934ea7 100644
--- a/testsuite/tests/ghci/scripts/T6027ghci.stdout
+++ b/testsuite/tests/ghci/scripts/T6027ghci.stdout
@@ -1 +1 @@
-data (?) 	-- Defined at <interactive>:3:6
+data (?) 	-- Defined at <interactive>:3:1
diff --git a/testsuite/tests/ghci/scripts/T7872.stdout b/testsuite/tests/ghci/scripts/T7872.stdout
index a2f8913307..81d960947c 100644
--- a/testsuite/tests/ghci/scripts/T7872.stdout
+++ b/testsuite/tests/ghci/scripts/T7872.stdout
@@ -1,2 +1,2 @@
-type T = forall a. a -> a 	-- Defined at <interactive>:3:6
-data D = MkT (forall b. b -> b) 	-- Defined at <interactive>:4:6
+type T = forall a. a -> a 	-- Defined at <interactive>:3:1
+data D = MkT (forall b. b -> b) 	-- Defined at <interactive>:4:1
diff --git a/testsuite/tests/ghci/scripts/T7873.stdout b/testsuite/tests/ghci/scripts/T7873.stdout
index 785fbf06b2..0167fb2eba 100644
--- a/testsuite/tests/ghci/scripts/T7873.stdout
+++ b/testsuite/tests/ghci/scripts/T7873.stdout
@@ -1,6 +1,6 @@
 data D1 where
   MkD1 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D1
-  	-- Defined at <interactive>:3:6
+  	-- Defined at <interactive>:3:1
 data D2 where
   MkD2 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D2
-  	-- Defined at <interactive>:4:6
+  	-- Defined at <interactive>:4:1
diff --git a/testsuite/tests/ghci/scripts/T7939.stdout b/testsuite/tests/ghci/scripts/T7939.stdout
index 863eb2ffef..9a88b5c294 100644
--- a/testsuite/tests/ghci/scripts/T7939.stdout
+++ b/testsuite/tests/ghci/scripts/T7939.stdout
@@ -1,23 +1,23 @@
-class Foo (a :: k) where

-  type family Bar (a :: k) b :: *

-  	-- Defined at T7939.hs:6:9

-Bar :: k -> * -> *

-type family F a :: * 	-- Defined at T7939.hs:8:13

-type instance F Int -- Defined at T7939.hs:9:1

-F :: * -> *

-type family G a :: * where G Int = Bool

-  	-- Defined at T7939.hs:11:13

-G :: * -> *

-type family H (a :: Bool) :: Bool where H 'False = 'True

-  	-- Defined at T7939.hs:14:13

-H :: Bool -> Bool

-type family J (a :: [k]) :: Bool where

-    J '[] = 'False

-    J (h : t) = 'True

-  	-- Defined at T7939.hs:17:13

-J :: [k] -> Bool

-type family K (a :: [k]) :: Maybe k where

-    K '[] = 'Nothing

-    K (h : t) = 'Just h

-  	-- Defined at T7939.hs:21:13

-K :: [k] -> Maybe k

+class Foo (a :: k) where
+  type family Bar (a :: k) b :: *
+  	-- Defined at T7939.hs:6:4
+Bar :: k -> * -> *
+type family F a :: * 	-- Defined at T7939.hs:8:1
+type instance F Int -- Defined at T7939.hs:9:1
+F :: * -> *
+type family G a :: * where G Int = Bool
+  	-- Defined at T7939.hs:11:1
+G :: * -> *
+type family H (a :: Bool) :: Bool where H 'False = 'True
+  	-- Defined at T7939.hs:14:1
+H :: Bool -> Bool
+type family J (a :: [k]) :: Bool where
+    J '[] = 'False
+    J (h : t) = 'True
+  	-- Defined at T7939.hs:17:1
+J :: [k] -> Bool
+type family K (a :: [k]) :: Maybe k where
+    K '[] = 'Nothing
+    K (h : t) = 'Just h
+  	-- Defined at T7939.hs:21:1
+K :: [k] -> Maybe k
diff --git a/testsuite/tests/ghci/scripts/ghci019.stdout b/testsuite/tests/ghci/scripts/ghci019.stdout
index f50279eeb9..4f346e70b5 100644
--- a/testsuite/tests/ghci/scripts/ghci019.stdout
+++ b/testsuite/tests/ghci/scripts/ghci019.stdout
@@ -1,2 +1,2 @@
-data Foo = Foo 	-- Defined at ghci019.hs:8:6
+data Foo = Foo 	-- Defined at ghci019.hs:8:1
 instance Prelude.Eq Foo -- Defined at ghci019.hs:9:10
diff --git a/testsuite/tests/ghci/scripts/ghci030.stdout b/testsuite/tests/ghci/scripts/ghci030.stdout
index 24fa768e6a..3ac8cc2307 100644
--- a/testsuite/tests/ghci/scripts/ghci030.stdout
+++ b/testsuite/tests/ghci/scripts/ghci030.stdout
@@ -1,6 +1,6 @@
 data D where
   C :: (Int -> a) -> Char -> D
-  	-- Defined at ghci030.hs:8:6
+  	-- Defined at ghci030.hs:8:1
 data D where
   C :: (Int -> a) -> Char -> D
   	-- Defined at ghci030.hs:8:21
diff --git a/testsuite/tests/ghci/scripts/ghci031.stdout b/testsuite/tests/ghci/scripts/ghci031.stdout
index 018dc4bc58..d90cc7aa00 100644
--- a/testsuite/tests/ghci/scripts/ghci031.stdout
+++ b/testsuite/tests/ghci/scripts/ghci031.stdout
@@ -1 +1 @@
-data Eq a => D a = C a 	-- Defined at ghci031.hs:7:14
+data Eq a => D a = C a 	-- Defined at ghci031.hs:7:1
diff --git a/testsuite/tests/ghci/scripts/ghci033.stdout b/testsuite/tests/ghci/scripts/ghci033.stdout
index 7c21dbe24e..e4bfebeb39 100644
--- a/testsuite/tests/ghci/scripts/ghci033.stdout
+++ b/testsuite/tests/ghci/scripts/ghci033.stdout
@@ -1,2 +1,2 @@
 data Foo = Foo1 Int | Int `InfixCon` Bool
-  	-- Defined at ghci033.hs:4:6
+  	-- Defined at ghci033.hs:4:1
diff --git a/testsuite/tests/ghci/scripts/ghci042.stdout b/testsuite/tests/ghci/scripts/ghci042.stdout
index c6717daf0f..043f88952b 100644
--- a/testsuite/tests/ghci/scripts/ghci042.stdout
+++ b/testsuite/tests/ghci/scripts/ghci042.stdout
@@ -4,4 +4,4 @@ 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:6
+  	-- Defined at <interactive>:3:1
diff --git a/testsuite/tests/ghci/scripts/ghci051.stdout b/testsuite/tests/ghci/scripts/ghci051.stdout
index 7ddd1c9b73..2501da4d28 100644
--- a/testsuite/tests/ghci/scripts/ghci051.stdout
+++ b/testsuite/tests/ghci/scripts/ghci051.stdout
@@ -1,5 +1,5 @@
-data T = C | D 	-- Defined at <interactive>:9:10
-type T' = main::Interactive.T 	-- Defined at <interactive>:4:6
+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 | ...