Error message wibbles following TyClDecl/HsTyDefn refactoring

4 files changed, 176 insertions, 176 deletions

diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index 831da73914..005e85cb5f 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -1,91 +1,91 @@
-
-../../typecheck/should_run/Defer01.hs:11:40: Warning:
-    Couldn't match type `Char' with `[Char]'
-    Expected type: String
-      Actual type: Char
-    In the first argument of `putStr', namely ','
-    In the second argument of `(>>)', namely putStr ','
-    In the expression: putStr "Hello World" >> putStr ','
-
-../../typecheck/should_run/Defer01.hs:14:5: Warning:
-    Couldn't match expected type `Int' with actual type `Char'
-    In the expression: 'p'
-    In an equation for `a': a = 'p'
-
-../../typecheck/should_run/Defer01.hs:18:9: Warning:
-    No instance for (Eq B) arising from a use of `=='
-    Possible fix: add an instance declaration for (Eq B)
-    In the expression: x == x
-    In an equation for `b': b x = x == x
-
-../../typecheck/should_run/Defer01.hs:28:5: Warning:
-    No instance for (Num (a -> a)) arising from the literal `1'
-    Possible fix: add an instance declaration for (Num (a -> a))
-    In the expression: 1
-    In an equation for `d': d = 1
-
-../../typecheck/should_run/Defer01.hs:31:5: Warning:
-    Couldn't match expected type `Char -> t' with actual type `Char'
-    The function `e' is applied to one argument,
-    but its type `Char' has none
-    In the expression: e 'q'
-    In an equation for `f': f = e 'q'
-
-../../typecheck/should_run/Defer01.hs:34:8: Warning:
-    Couldn't match expected type `a' with actual type `Char'
-      `a' is a rigid type variable bound by
-          the type signature for h :: a -> (Char, Char)
-          at ../../typecheck/should_run/Defer01.hs:33:6
-    In the expression: x
-    In the expression: (x, 'c')
-    In an equation for `h': h x = (x, 'c')
-
-../../typecheck/should_run/Defer01.hs:39:17: Warning:
-    Couldn't match expected type `Bool' with actual type `T a'
-    In the return type of a call of `K'
-    In the first argument of `not', namely `(K a)'
-    In the expression: (not (K a))
-
-../../typecheck/should_run/Defer01.hs:43:5: Warning:
-    No instance for (MyClass a1) arising from a use of `myOp'
-    In the expression: myOp 23
-    In an equation for `j': j = myOp 23
-
-../../typecheck/should_run/Defer01.hs:43:10: Warning:
-    No instance for (Num a1) arising from the literal `23'
-    The type variable `a1' is ambiguous
-    Possible fix: add a type signature that fixes these type variable(s)
-    Note: there are several potential instances:
-      instance Num Double -- Defined in `GHC.Float'
-      instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
-    In the first argument of `myOp', namely `23'
-    In the expression: myOp 23
-    In an equation for `j': j = myOp 23
-
-../../typecheck/should_run/Defer01.hs:46:7: Warning:
-    Couldn't match expected type `Bool' with actual type `Int'
-    In the expression: x
-    In an equation for `k': k x = x
-
-../../typecheck/should_run/Defer01.hs:49:5: Warning:
-    Couldn't match expected type `IO a0'
-                with actual type `Char -> IO ()'
-    In the first argument of `(>>)', namely `putChar'
-    In the expression: putChar >> putChar 'p'
-    In an equation for `l': l = putChar >> putChar 'p'
-
-<interactive>:8:11:
-    Couldn't match type `Bool' with `Int'
-    Expected type: C Int
-      Actual type: C Bool
-    In the return type of a call of `C2'
-    In the first argument of `c', namely `(C2 True)'
-    In the first argument of `print', namely `(c (C2 True))'
-
-<interactive>:14:8:
-    Couldn't match expected type `Bool' with actual type `Int'
-    In the first argument of `print', namely `(k 2)'
-    In the expression: print (k 2)
-    In an equation for `it': it = print (k 2)
+

+../../typecheck/should_run/Defer01.hs:11:40: Warning:

+    Couldn't match type `Char' with `[Char]'

+    Expected type: String

+      Actual type: Char

+    In the first argument of `putStr', namely ','

+    In the second argument of `(>>)', namely putStr ','

+    In the expression: putStr "Hello World" >> putStr ','

+

+../../typecheck/should_run/Defer01.hs:14:5: Warning:

+    Couldn't match expected type `Int' with actual type `Char'

+    In the expression: 'p'

+    In an equation for `a': a = 'p'

+

+../../typecheck/should_run/Defer01.hs:18:9: Warning:

+    No instance for (Eq B) arising from a use of `=='

+    Possible fix: add an instance declaration for (Eq B)

+    In the expression: x == x

+    In an equation for `b': b x = x == x

+

+../../typecheck/should_run/Defer01.hs:28:5: Warning:

+    No instance for (Num (a -> a)) arising from the literal `1'

+    Possible fix: add an instance declaration for (Num (a -> a))

+    In the expression: 1

+    In an equation for `d': d = 1

+

+../../typecheck/should_run/Defer01.hs:31:5: Warning:

+    Couldn't match expected type `Char -> t' with actual type `Char'

+    The function `e' is applied to one argument,

+    but its type `Char' has none

+    In the expression: e 'q'

+    In an equation for `f': f = e 'q'

+

+../../typecheck/should_run/Defer01.hs:34:8: Warning:

+    Couldn't match expected type `a' with actual type `Char'

+      `a' is a rigid type variable bound by

+          the type signature for h :: a -> (Char, Char)

+          at ../../typecheck/should_run/Defer01.hs:33:6

+    In the expression: x

+    In the expression: (x, 'c')

+    In an equation for `h': h x = (x, 'c')

+

+../../typecheck/should_run/Defer01.hs:39:17: Warning:

+    Couldn't match expected type `Bool' with actual type `T a'

+    In the return type of a call of `K'

+    In the first argument of `not', namely `(K a)'

+    In the expression: (not (K a))

+

+../../typecheck/should_run/Defer01.hs:43:5: Warning:

+    No instance for (MyClass a1) arising from a use of `myOp'

+    In the expression: myOp 23

+    In an equation for `j': j = myOp 23

+

+../../typecheck/should_run/Defer01.hs:43:10: Warning:

+    No instance for (Num a1) arising from the literal `23'

+    The type variable `a1' is ambiguous

+    Possible fix: add a type signature that fixes these type variable(s)

+    Note: there are several potential instances:

+      instance Num Double -- Defined in `GHC.Float'

+      instance Num Float -- Defined in `GHC.Float'

+      instance Num Int -- Defined in `GHC.Num'

+      ...plus one other

+    In the first argument of `myOp', namely `23'

+    In the expression: myOp 23

+    In an equation for `j': j = myOp 23

+

+../../typecheck/should_run/Defer01.hs:46:7: Warning:

+    Couldn't match expected type `Bool' with actual type `Int'

+    In the expression: x

+    In an equation for `k': k x = x

+

+../../typecheck/should_run/Defer01.hs:49:5: Warning:

+    Couldn't match expected type `IO a0'

+                with actual type `Char -> IO ()'

+    In the first argument of `(>>)', namely `putChar'

+    In the expression: putChar >> putChar 'p'

+    In an equation for `l': l = putChar >> putChar 'p'

+

+<interactive>:8:11:

+    Couldn't match type `Bool' with `Int'

+    Expected type: C Int

+      Actual type: C Bool

+    In the return type of a call of `C2'

+    In the first argument of `c', namely `(C2 True)'

+    In the first argument of `print', namely `(c (C2 True))'

+

+<interactive>:14:8:

+    Couldn't match expected type `Bool' with actual type `Int'

+    In the first argument of `print', namely `(k 2)'

+    In the expression: print (k 2)

+    In an equation for `it': it = print (k 2)

diff --git a/testsuite/tests/ghci/scripts/Defer02.stdout b/testsuite/tests/ghci/scripts/Defer02.stdout
index 32e51d6d65..1061a95241 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stdout
+++ b/testsuite/tests/ghci/scripts/Defer02.stdout
@@ -1,59 +1,59 @@
-Hello World*** Exception: ../../typecheck/should_run/Defer01.hs:11:40:
-    Couldn't match type `Char' with `[Char]'
-    Expected type: String
-      Actual type: Char
-    In the first argument of `putStr', namely ','
-    In the second argument of `(>>)', namely putStr ','
-    In the expression: putStr "Hello World" >> putStr ','
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:14:5:
-    Couldn't match expected type `Int' with actual type `Char'
-    In the expression: 'p'
-    In an equation for `a': a = 'p'
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:18:9:
-    No instance for (Eq B) arising from a use of `=='
-    Possible fix: add an instance declaration for (Eq B)
-    In the expression: x == x
-    In an equation for `b': b x = x == x
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:28:5:
-    No instance for (Num (a -> a)) arising from the literal `1'
-    Possible fix: add an instance declaration for (Num (a -> a))
-    In the expression: 1
-    In an equation for `d': d = 1
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:31:5:
-    Couldn't match expected type `Char -> t' with actual type `Char'
-    The function `e' is applied to one argument,
-    but its type `Char' has none
-    In the expression: e 'q'
-    In an equation for `f': f = e 'q'
-(deferred type error)
-(*** Exception: ../../typecheck/should_run/Defer01.hs:34:8:
-    Couldn't match expected type `a' with actual type `Char'
-      `a' is a rigid type variable bound by
-          the type signature for h :: a -> (Char, Char)
-          at ../../typecheck/should_run/Defer01.hs:33:6
-    In the expression: x
-    In the expression: (x, 'c')
-    In an equation for `h': h x = (x, 'c')
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:39:17:
-    Couldn't match expected type `Bool' with actual type `T a'
-    In the return type of a call of `K'
-    In the first argument of `not', namely `(K a)'
-    In the expression: (not (K a))
-(deferred type error)
-"*** Exception: ../../typecheck/should_run/Defer01.hs:43:5:
-    No instance for (MyClass a1) arising from a use of `myOp'
-    In the expression: myOp 23
-    In an equation for `j': j = myOp 23
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:49:5:
-    Couldn't match expected type `IO a0'
-                with actual type `Char -> IO ()'
-    In the first argument of `(>>)', namely `putChar'
-    In the expression: putChar >> putChar 'p'
-    In an equation for `l': l = putChar >> putChar 'p'
-(deferred type error)
+Hello World*** Exception: ..\..\typecheck\should_run\Defer01.hs:11:40:

+    Couldn't match type `Char' with `[Char]'

+    Expected type: String

+      Actual type: Char

+    In the first argument of `putStr', namely ','

+    In the second argument of `(>>)', namely putStr ','

+    In the expression: putStr "Hello World" >> putStr ','

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:14:5:

+    Couldn't match expected type `Int' with actual type `Char'

+    In the expression: 'p'

+    In an equation for `a': a = 'p'

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:18:9:

+    No instance for (Eq B) arising from a use of `=='

+    Possible fix: add an instance declaration for (Eq B)

+    In the expression: x == x

+    In an equation for `b': b x = x == x

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:28:5:

+    No instance for (Num (a -> a)) arising from the literal `1'

+    Possible fix: add an instance declaration for (Num (a -> a))

+    In the expression: 1

+    In an equation for `d': d = 1

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:31:5:

+    Couldn't match expected type `Char -> t' with actual type `Char'

+    The function `e' is applied to one argument,

+    but its type `Char' has none

+    In the expression: e 'q'

+    In an equation for `f': f = e 'q'

+(deferred type error)

+(*** Exception: ..\..\typecheck\should_run\Defer01.hs:34:8:

+    Couldn't match expected type `a' with actual type `Char'

+      `a' is a rigid type variable bound by

+          the type signature for h :: a -> (Char, Char)

+          at ..\..\typecheck\should_run\Defer01.hs:33:6

+    In the expression: x

+    In the expression: (x, 'c')

+    In an equation for `h': h x = (x, 'c')

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:39:17:

+    Couldn't match expected type `Bool' with actual type `T a'

+    In the return type of a call of `K'

+    In the first argument of `not', namely `(K a)'

+    In the expression: (not (K a))

+(deferred type error)

+"*** Exception: ..\..\typecheck\should_run\Defer01.hs:43:5:

+    No instance for (MyClass a1) arising from a use of `myOp'

+    In the expression: myOp 23

+    In an equation for `j': j = myOp 23

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:49:5:

+    Couldn't match expected type `IO a0'

+                with actual type `Char -> IO ()'

+    In the first argument of `(>>)', namely `putChar'

+    In the expression: putChar >> putChar 'p'

+    In an equation for `l': l = putChar >> putChar 'p'

+(deferred type error)

diff --git a/testsuite/tests/ghci/scripts/ghci050.stderr b/testsuite/tests/ghci/scripts/ghci050.stderr
index 74dc9a9b94..80725e4605 100644
--- a/testsuite/tests/ghci/scripts/ghci050.stderr
+++ b/testsuite/tests/ghci/scripts/ghci050.stderr
@@ -1,9 +1,9 @@
-
-<interactive>:6:49:
-    Couldn't match expected type `a'
-                with actual type `ListableElem (a, a)'
-      `a' is a rigid type variable bound by
-          the instance declaration at <interactive>:6:20
-    In the expression: a
-    In the expression: [a, b]
-    In an equation for `asList': asList (a, b) = [a, b]
+

+<interactive>:6:49:

+    Couldn't match expected type `a'

+                with actual type `ListableElem (a, a)'

+      `a' is a rigid type variable bound by

+          the instance declaration at <interactive>:6:10

+    In the expression: a

+    In the expression: [a, b]

+    In an equation for `asList': asList (a, b) = [a, b]

diff --git a/testsuite/tests/ghci/scripts/ghci057.stderr b/testsuite/tests/ghci/scripts/ghci057.stderr
index 383d951e0c..623bfb3c37 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stderr
+++ b/testsuite/tests/ghci/scripts/ghci057.stderr
@@ -1,17 +1,17 @@
-
-<interactive>:5:1:
-    Illegal generalised algebraic data declaration for `T'
-      (Use -XGADTs to allow GADTs)
-    In the data type declaration for `T'
-
-ghci057.hs:3:3:
-    Data constructor `C' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C'
-    In the data type declaration for `T'
-
-ghci057.hs:3:3:
-    Data constructor `C' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C'
-    In the data type declaration for `T'
+

+<interactive>:5:1:

+    Illegal generalised algebraic data declaration for `T'

+      (Use -XGADTs to allow GADTs)

+    In the data declaration for `T'

+

+ghci057.hs:3:3:

+    Data constructor `C' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C'

+    In the data declaration for `T'

+

+ghci057.hs:3:3:

+    Data constructor `C' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C'

+    In the data declaration for `T'