Testsuite: accept output without Windows line endings (#11631)

50 files changed, 483 insertions, 480 deletions

diff --git a/testsuite/tests/deriving/should_fail/T5287.stderr b/testsuite/tests/deriving/should_fail/T5287.stderr
index 3fb3e283d9..6307c36f24 100644
--- a/testsuite/tests/deriving/should_fail/T5287.stderr
+++ b/testsuite/tests/deriving/should_fail/T5287.stderr
@@ -1,11 +1,11 @@
-

-T5287.hs:6:10: error:

-    Could not deduce (A a oops0)

-    from the context: A a oops

-      bound by an instance declaration:

-                 A a oops => Read (D a)

-      at T5287.hs:6:10-31

-    The type variable ‘oops0’ is ambiguous

-    In the ambiguity check for an instance declaration

-    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

-    In the instance declaration for ‘Read (D a)’

+
+T5287.hs:6:10: error:
+    • Could not deduce (A a oops0)
+      from the context: A a oops
+        bound by an instance declaration:
+                   A a oops => Read (D a)
+        at T5287.hs:6:10-31
+      The type variable ‘oops0’ is ambiguous
+    • In the ambiguity check for an instance declaration
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      In the instance declaration for ‘Read (D a)’
diff --git a/testsuite/tests/deriving/should_fail/drvfail002.stderr b/testsuite/tests/deriving/should_fail/drvfail002.stderr
index 11c42d7ada..a58db7a8d8 100644
--- a/testsuite/tests/deriving/should_fail/drvfail002.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail002.stderr
@@ -1,8 +1,8 @@
-

-drvfail002.hs:19:23:

-    No instance for (X T c0)

-      arising from the first field of ‘S’ (type ‘T’)

-    Possible fix:

-      use a standalone 'deriving instance' declaration,

-        so you can specify the instance context yourself

-    When deriving the instance for (Show S)

+
+drvfail002.hs:19:23: error:
+    • No instance for (X T c0)
+        arising from the first field of ‘S’ (type ‘T’)
+      Possible fix:
+        use a standalone 'deriving instance' declaration,
+          so you can specify the instance context yourself
+    • When deriving the instance for (Show S)
diff --git a/testsuite/tests/deriving/should_fail/drvfail008.stderr b/testsuite/tests/deriving/should_fail/drvfail008.stderr
index 9b56dfb1d7..bfa73927c9 100644
--- a/testsuite/tests/deriving/should_fail/drvfail008.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail008.stderr
@@ -1,6 +1,6 @@
-

-drvfail008.hs:10:43:

-    Can't make a derived instance of `Monad M':

-      `Monad' is not a derivable class

-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension

-    In the newtype declaration for `M'

+
+drvfail008.hs:10:43: error:
+    • Can't make a derived instance of ‘Monad M’:
+        ‘Monad’ is not a standard derivable class (Eq, Show, etc.)
+        Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+    • In the newtype declaration for ‘M’
diff --git a/testsuite/tests/deriving/should_fail/drvfail016.stderr b/testsuite/tests/deriving/should_fail/drvfail016.stderr
index bba7d0f0c4..182b74893f 100644
--- a/testsuite/tests/deriving/should_fail/drvfail016.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail016.stderr
@@ -1,4 +1,4 @@
-

-drvfail016.hs-boot:7:14:

-    Deriving not permitted in hs-boot file

-      Use an instance declaration instead

+
+drvfail016.hs-boot:7:14: error:
+    Deriving not permitted in hs-boot file
+      Use an instance declaration instead
diff --git a/testsuite/tests/driver/sigof04/sigof04.stderr b/testsuite/tests/driver/sigof04/sigof04.stderr
index 4be1bfd3e5..14e631128c 100644
--- a/testsuite/tests/driver/sigof04/sigof04.stderr
+++ b/testsuite/tests/driver/sigof04/sigof04.stderr
@@ -1,3 +1,3 @@
-

-<no location info>:

-    ‘insert’ is exported by the hsig file, but not exported by the module

+
+<no location info>: error:
+    ‘insert’ is exported by the hsig file, but not exported by the module
diff --git a/testsuite/tests/gadt/T3651.stderr b/testsuite/tests/gadt/T3651.stderr
index db723c8d50..14216eb149 100644
--- a/testsuite/tests/gadt/T3651.stderr
+++ b/testsuite/tests/gadt/T3651.stderr
@@ -1,21 +1,21 @@
-

-T3651.hs:11:11:

-    Couldn't match type ‘Bool’ with ‘()’

-    Inaccessible code in

-      a pattern with constructor: U :: Z (), in an equation for ‘unsafe1’

-    In the pattern: U

-    In an equation for ‘unsafe1’: unsafe1 B U = ()

-

-T3651.hs:14:11:

-    Couldn't match type ‘Bool’ with ‘()’

-    Inaccessible code in

-      a pattern with constructor: U :: Z (), in an equation for ‘unsafe2’

-    In the pattern: U

-    In an equation for ‘unsafe2’: unsafe2 B U = ()

-

-T3651.hs:17:11:

-    Couldn't match type ‘Bool’ with ‘()’

-    Inaccessible code in

-      a pattern with constructor: U :: Z (), in an equation for ‘unsafe3’

-    In the pattern: U

-    In an equation for ‘unsafe3’: unsafe3 B U = True

+
+T3651.hs:11:11: error:
+    • Couldn't match type ‘Bool’ with ‘()’
+      Inaccessible code in
+        a pattern with constructor: U :: Z (), in an equation for ‘unsafe1’
+    • In the pattern: U
+      In an equation for ‘unsafe1’: unsafe1 B U = ()
+
+T3651.hs:14:11: error:
+    • Couldn't match type ‘Bool’ with ‘()’
+      Inaccessible code in
+        a pattern with constructor: U :: Z (), in an equation for ‘unsafe2’
+    • In the pattern: U
+      In an equation for ‘unsafe2’: unsafe2 B U = ()
+
+T3651.hs:17:11: error:
+    • Couldn't match type ‘Bool’ with ‘()’
+      Inaccessible code in
+        a pattern with constructor: U :: Z (), in an equation for ‘unsafe3’
+    • In the pattern: U
+      In an equation for ‘unsafe3’: unsafe3 B U = True
diff --git a/testsuite/tests/gadt/T7293.stderr b/testsuite/tests/gadt/T7293.stderr
index 35c02d5f90..40b8a04333 100644
--- a/testsuite/tests/gadt/T7293.stderr
+++ b/testsuite/tests/gadt/T7293.stderr
@@ -1,8 +1,8 @@
-

-T7293.hs:24:5:

-    Couldn't match type ‘'True’ with ‘'False’

-    Inaccessible code in

-      a pattern with constructor: Nil :: forall a. Vec a 'Zero,

-      in an equation for ‘nth’

-    In the pattern: Nil

-    In an equation for ‘nth’: nth Nil _ = undefined

+
+T7293.hs:24:5: error:
+    • Couldn't match type ‘'True’ with ‘'False’
+      Inaccessible code in
+        a pattern with constructor: Nil :: forall a. Vec a 'Zero,
+        in an equation for ‘nth’
+    • In the pattern: Nil
+      In an equation for ‘nth’: nth Nil _ = undefined
diff --git a/testsuite/tests/gadt/T7294.stderr b/testsuite/tests/gadt/T7294.stderr
index 0fa7f5386c..94798403a5 100644
--- a/testsuite/tests/gadt/T7294.stderr
+++ b/testsuite/tests/gadt/T7294.stderr
@@ -1,12 +1,12 @@
-

-T7294.hs:23:1: warning:

-    Pattern match(es) are redundant

-    In an equation for ‘nth’: nth Nil _ = ...

-

-T7294.hs:25:5: Warning:

-    Couldn't match type ‘'True’ with ‘'False’

-    Inaccessible code in

-      a pattern with constructor: Nil :: forall a. Vec a 'Zero,

-      in an equation for ‘nth’

-    In the pattern: Nil

-    In an equation for ‘nth’: nth Nil _ = undefined

+
+T7294.hs:23:1: warning:
+    Pattern match(es) are redundant
+    In an equation for ‘nth’: nth Nil _ = ...
+
+T7294.hs:25:5: warning:
+    • Couldn't match type ‘'True’ with ‘'False’
+      Inaccessible code in
+        a pattern with constructor: Nil :: forall a. Vec a 'Zero,
+        in an equation for ‘nth’
+    • In the pattern: Nil
+      In an equation for ‘nth’: nth Nil _ = undefined
diff --git a/testsuite/tests/gadt/T7558.stderr b/testsuite/tests/gadt/T7558.stderr
index 15b9476af4..5c610b2895 100644
--- a/testsuite/tests/gadt/T7558.stderr
+++ b/testsuite/tests/gadt/T7558.stderr
@@ -1,15 +1,15 @@
-

-T7558.hs:8:4: error:

-    Couldn't match type ‘a’ with ‘Maybe a’

-    ‘a’ is a rigid type variable bound by

-    the type signature for:

-      f :: forall a. T a a -> Bool

-    at T7558.hs:7:6

-    Inaccessible code in

-      a pattern with constructor:

-        MkT :: forall a b. (a ~ Maybe b) => a -> Maybe b -> T a b,

-      in an equation for ‘f’

-    In the pattern: MkT x y

-    In an equation for ‘f’: f (MkT x y) = [x, y] `seq` True

-    Relevant bindings include

-      f :: T a a -> Bool (bound at T7558.hs:8:1)

+
+T7558.hs:8:4: error:
+    • Couldn't match type ‘a’ with ‘Maybe a’
+      ‘a’ is a rigid type variable bound by
+        the type signature for:
+          f :: forall a. T a a -> Bool
+        at T7558.hs:7:6
+      Inaccessible code in
+        a pattern with constructor:
+          MkT :: forall a b. (a ~ Maybe b) => a -> Maybe b -> T a b,
+        in an equation for ‘f’
+    • In the pattern: MkT x y
+      In an equation for ‘f’: f (MkT x y) = [x, y] `seq` True
+    • Relevant bindings include
+        f :: T a a -> Bool (bound at T7558.hs:8:1)
diff --git a/testsuite/tests/gadt/gadt11.stderr b/testsuite/tests/gadt/gadt11.stderr
index 1dba9b0a40..09c54d6e87 100644
--- a/testsuite/tests/gadt/gadt11.stderr
+++ b/testsuite/tests/gadt/gadt11.stderr
@@ -1,6 +1,6 @@
-

-gadt11.hs:12:3: error:

-    Data constructor ‘L2’ returns type ‘T1 Bool’

-      instead of an instance of its parent type ‘T2 a’

-    In the definition of data constructor ‘L2’

-    In the data type declaration for ‘T2’

+
+gadt11.hs:12:3: error:
+    • Data constructor ‘L2’ returns type ‘T1 Bool’
+        instead of an instance of its parent type ‘T2 a’
+    • In the definition of data constructor ‘L2’
+      In the data type declaration for ‘T2’
diff --git a/testsuite/tests/gadt/gadtSyntaxFail001.stderr b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
index e92272d5c2..248bc98044 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail001.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
@@ -1,7 +1,7 @@
-

-gadtSyntaxFail001.hs:8:5: error:

-    Data constructor ‘C2’ has existential type variables, a context, or a specialised result type

-      C2 :: forall a. a -> Char -> Foo a Int

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C2’

-    In the data type declaration for ‘Foo’

+
+gadtSyntaxFail001.hs:8:5: error:
+    • Data constructor ‘C2’ has existential type variables, a context, or a specialised result type
+        C2 :: forall a. a -> Char -> Foo a Int
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C2’
+      In the data type declaration for ‘Foo’
diff --git a/testsuite/tests/gadt/gadtSyntaxFail002.stderr b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
index 4a969aaa49..7c30b794f9 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail002.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
@@ -1,7 +1,7 @@
-

-gadtSyntaxFail002.hs:8:5: error:

-    Data constructor ‘C2’ has existential type variables, a context, or a specialised result type

-      C2 :: forall a. a -> Char -> Foo a a

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C2’

-    In the data type declaration for ‘Foo’

+
+gadtSyntaxFail002.hs:8:5: error:
+    • Data constructor ‘C2’ has existential type variables, a context, or a specialised result type
+        C2 :: forall a. a -> Char -> Foo a a
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C2’
+      In the data type declaration for ‘Foo’
diff --git a/testsuite/tests/gadt/gadtSyntaxFail003.stderr b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
index f8fbeff079..bb2b6a2fff 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail003.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
@@ -1,7 +1,7 @@
-

-gadtSyntaxFail003.hs:7:5: error:

-    Data constructor ‘C1’ has existential type variables, a context, or a specialised result type

-      C1 :: forall b a c. a -> Int -> c -> Foo b a

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C1’

-    In the data type declaration for ‘Foo’

+
+gadtSyntaxFail003.hs:7:5: error:
+    • Data constructor ‘C1’ has existential type variables, a context, or a specialised result type
+        C1 :: forall b a c. a -> Int -> c -> Foo b a
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C1’
+      In the data type declaration for ‘Foo’
diff --git a/testsuite/tests/ghci.debugger/scripts/break019.stderr b/testsuite/tests/ghci.debugger/scripts/break019.stderr
index 3ae67a9c8d..3cb286b7eb 100644
--- a/testsuite/tests/ghci.debugger/scripts/break019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break019.stderr
@@ -1,2 +1,2 @@
-

-<interactive>:1:1: Not in scope: ‘Test2’

+
+<interactive>:1:1: error: Not in scope: ‘Test2’
diff --git a/testsuite/tests/ghci/prog008/ghci.prog008.stdout b/testsuite/tests/ghci/prog008/ghci.prog008.stdout
index df6767bb84..5601247c3c 100644
--- a/testsuite/tests/ghci/prog008/ghci.prog008.stdout
+++ b/testsuite/tests/ghci/prog008/ghci.prog008.stdout
@@ -1,10 +1,10 @@
-class C a b where

-  c1 :: Num b => a -> b

-  c2 :: (Num b, Show b) => a -> b

-  c3 :: a1 -> b

-  {-# MINIMAL c1, c2, c3 #-}

-class C a b where

-  c1 :: Num b => a -> b

-  c2 :: (Num b, Show b) => a -> b

-  c3 :: forall a1. a1 -> b

-  {-# MINIMAL c1, c2, c3 #-}
\ No newline at end of file
+class C a b where
+  c1 :: Num b => a -> b
+  c2 :: (Num b, Show b) => a -> b
+  c3 :: a1 -> b
+  {-# MINIMAL c1, c2, c3 #-}
+class C a b where
+  c1 :: Num b => a -> b
+  c2 :: (Num b, Show b) => a -> b
+  c3 :: forall a1. a1 -> b
+  {-# MINIMAL c1, c2, c3 #-}
diff --git a/testsuite/tests/ghci/prog009/ghci.prog009.stderr b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
index b2072f6413..4f9cf12a3e 100644
--- a/testsuite/tests/ghci/prog009/ghci.prog009.stderr
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
@@ -1,8 +1,8 @@
-

-A.hs:1:16: error: parse error on input ‘where’

-

-<interactive>:25:1: error:

-    Variable not in scope: yan

-    Perhaps you meant ‘tan’ (imported from Prelude)

-

-A.hs:1:16: error: parse error on input ‘where’

+
+A.hs:1:16: error: parse error on input ‘where’
+
+<interactive>:25:1: error:
+    • Variable not in scope: yan
+    • Perhaps you meant ‘tan’ (imported from Prelude)
+
+A.hs:1:16: error: parse error on input ‘where’
diff --git a/testsuite/tests/ghci/scripts/T5564.stderr b/testsuite/tests/ghci/scripts/T5564.stderr
index a63bcc8a95..31ebd14b0e 100644
--- a/testsuite/tests/ghci/scripts/T5564.stderr
+++ b/testsuite/tests/ghci/scripts/T5564.stderr
@@ -1,10 +1,10 @@
-

-<interactive>:2:1: error:

-    Variable not in scope: git

-    Perhaps you meant ‘it’ (line 1)

-

-<interactive>:4:1: error:

-    Variable not in scope: fit

-    Perhaps you meant one of these:

-      ‘fst’ (imported from Prelude), ‘Ghci1.it’ (imported from Ghci1),

-      ‘it’ (line 3)

+
+<interactive>:2:1: error:
+    • Variable not in scope: git
+    • Perhaps you meant ‘it’ (line 1)
+
+<interactive>:4:1: error:
+    • Variable not in scope: fit
+    • Perhaps you meant one of these:
+        ‘fst’ (imported from Prelude), ‘Ghci1.it’ (imported from Ghci1),
+        ‘it’ (line 3)
diff --git a/testsuite/tests/ghci/scripts/T7894.stderr b/testsuite/tests/ghci/scripts/T7894.stderr
index 71739d1921..17f7171bad 100644
--- a/testsuite/tests/ghci/scripts/T7894.stderr
+++ b/testsuite/tests/ghci/scripts/T7894.stderr
@@ -1,2 +1,2 @@
-

-<interactive>:1:1: Not in scope: ‘Data.Maybe.->’

+
+<interactive>:1:1: error: Not in scope: ‘Data.Maybe.->’
diff --git a/testsuite/tests/ghci/scripts/T9293.stderr b/testsuite/tests/ghci/scripts/T9293.stderr
index 8c7ac45202..77cf2da0ec 100644
--- a/testsuite/tests/ghci/scripts/T9293.stderr
+++ b/testsuite/tests/ghci/scripts/T9293.stderr
@@ -1,19 +1,19 @@
-

-<interactive>:4:1: error:

-    Illegal generalised algebraic data declaration for ‘T’

-      (Use GADTs to allow GADTs)

-    In the data declaration for ‘T’

-

-ghci057.hs:3:3: error:

-    Data constructor ‘C’ has existential type variables, a context, or a specialised result type

-      C :: T Int

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C’

-    In the data type declaration for ‘T’

-

-ghci057.hs:3:3: error:

-    Data constructor ‘C’ has existential type variables, a context, or a specialised result type

-      C :: T Int

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C’

-    In the data type declaration for ‘T’

+
+<interactive>:4:1: error:
+    • Illegal generalised algebraic data declaration for ‘T’
+        (Use GADTs to allow GADTs)
+    • In the data declaration for ‘T’
+
+ghci057.hs:3:3: error:
+    • Data constructor ‘C’ has existential type variables, a context, or a specialised result type
+        C :: T Int
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C’
+      In the data type declaration for ‘T’
+
+ghci057.hs:3:3: error:
+    • Data constructor ‘C’ has existential type variables, a context, or a specialised result type
+        C :: T Int
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C’
+      In the data type declaration for ‘T’
diff --git a/testsuite/tests/ghci/scripts/ghci034.stderr b/testsuite/tests/ghci/scripts/ghci034.stderr
index 459ab8272d..3d4b95c96c 100644
--- a/testsuite/tests/ghci/scripts/ghci034.stderr
+++ b/testsuite/tests/ghci/scripts/ghci034.stderr
@@ -1,2 +1,2 @@
-

-<interactive>:1:1: Not in scope: ‘thisIsNotDefined’

+
+<interactive>:1:1: error: Not in scope: ‘thisIsNotDefined’
diff --git a/testsuite/tests/ghci/scripts/ghci044.stderr b/testsuite/tests/ghci/scripts/ghci044.stderr
index 9ff8acc5c7..716f46e12e 100644
--- a/testsuite/tests/ghci/scripts/ghci044.stderr
+++ b/testsuite/tests/ghci/scripts/ghci044.stderr
@@ -1,8 +1,8 @@
 
 <interactive>:9:1: error:
-    Overlapping instances for C [Int] arising from a use of ‘f’
-    Matching instances:
-      instance [safe] C [Int] -- Defined at <interactive>:6:10
-      instance [safe] C a => C [a] -- Defined at <interactive>:8:10
-    In the expression: f [4 :: Int]
-    In an equation for ‘it’: it = f [4 :: Int]
+    • Overlapping instances for C [Int] arising from a use of ‘f’
+      Matching instances:
+        instance [safe] C [Int] -- Defined at <interactive>:6:10
+        instance [safe] C a => C [a] -- Defined at <interactive>:8:10
+    • In the expression: f [4 :: Int]
+      In an equation for ‘it’: it = f [4 :: Int]
diff --git a/testsuite/tests/ghci/scripts/ghci057.stderr b/testsuite/tests/ghci/scripts/ghci057.stderr
index 8c7ac45202..77cf2da0ec 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stderr
+++ b/testsuite/tests/ghci/scripts/ghci057.stderr
@@ -1,19 +1,19 @@
-

-<interactive>:4:1: error:

-    Illegal generalised algebraic data declaration for ‘T’

-      (Use GADTs to allow GADTs)

-    In the data declaration for ‘T’

-

-ghci057.hs:3:3: error:

-    Data constructor ‘C’ has existential type variables, a context, or a specialised result type

-      C :: T Int

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C’

-    In the data type declaration for ‘T’

-

-ghci057.hs:3:3: error:

-    Data constructor ‘C’ has existential type variables, a context, or a specialised result type

-      C :: T Int

-      (Use ExistentialQuantification or GADTs to allow this)

-    In the definition of data constructor ‘C’

-    In the data type declaration for ‘T’

+
+<interactive>:4:1: error:
+    • Illegal generalised algebraic data declaration for ‘T’
+        (Use GADTs to allow GADTs)
+    • In the data declaration for ‘T’
+
+ghci057.hs:3:3: error:
+    • Data constructor ‘C’ has existential type variables, a context, or a specialised result type
+        C :: T Int
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C’
+      In the data type declaration for ‘T’
+
+ghci057.hs:3:3: error:
+    • Data constructor ‘C’ has existential type variables, a context, or a specialised result type
+        C :: T Int
+        (Use ExistentialQuantification or GADTs to allow this)
+    • In the definition of data constructor ‘C’
+      In the data type declaration for ‘T’
diff --git a/testsuite/tests/indexed-types/should_compile/Simple14.stderr b/testsuite/tests/indexed-types/should_compile/Simple14.stderr
index 395149121e..d0582b0c98 100644
--- a/testsuite/tests/indexed-types/should_compile/Simple14.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Simple14.stderr
@@ -1,18 +1,18 @@
-

-Simple14.hs:8:8: error:

-    Couldn't match type ‘z0’ with ‘z’

-      ‘z0’ is untouchable

-        inside the constraints: x ~ y

-        bound by the type signature for:

-                   eqE :: (x ~ y) => EQ_ z0 z0

-        at Simple14.hs:8:8-39

-    ‘z’ is a rigid type variable bound by

-    the type signature for:

-      eqE :: forall x y z p. EQ_ x y -> ((x ~ y) => EQ_ z z) -> p

-    at Simple14.hs:8:8

-    Expected type: EQ_ z0 z0

-      Actual type: EQ_ z z

-    In the ambiguity check for ‘eqE’

-    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

-    In the type signature:

-      eqE :: EQ_ x y -> (x ~ y => EQ_ z z) -> p

+
+Simple14.hs:8:8: error:
+    • Couldn't match type ‘z0’ with ‘z’
+        ‘z0’ is untouchable
+          inside the constraints: x ~ y
+          bound by the type signature for:
+                     eqE :: (x ~ y) => EQ_ z0 z0
+          at Simple14.hs:8:8-39
+      ‘z’ is a rigid type variable bound by
+        the type signature for:
+          eqE :: forall x y z p. EQ_ x y -> ((x ~ y) => EQ_ z z) -> p
+        at Simple14.hs:8:8
+      Expected type: EQ_ z0 z0
+        Actual type: EQ_ z z
+    • In the ambiguity check for ‘eqE’
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      In the type signature:
+        eqE :: EQ_ x y -> (x ~ y => EQ_ z z) -> p
diff --git a/testsuite/tests/indexed-types/should_fail/BadSock.stderr b/testsuite/tests/indexed-types/should_fail/BadSock.stderr
index ed90d8932f..4b2e23a52f 100644
--- a/testsuite/tests/indexed-types/should_fail/BadSock.stderr
+++ b/testsuite/tests/indexed-types/should_fail/BadSock.stderr
@@ -1,5 +1,5 @@
-

-BadSock.hs:30:5: error:

-    The type family ‘Readable’ should have 1 argument, but has been given none

-    In the equations for closed type family ‘Foo’

-    In the type family declaration for ‘Foo’

+
+BadSock.hs:30:5: error:
+    • The type family ‘Readable’ should have 1 argument, but has been given none
+    • In the equations for closed type family ‘Foo’
+      In the type family declaration for ‘Foo’
diff --git a/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.stderr b/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.stderr
index dbff63583f..cdd7206f41 100644
--- a/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.stderr
+++ b/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.stderr
@@ -1,5 +1,5 @@
-

-DerivUnsatFam.hs:8:1:

-    Can't make a derived instance of ‘Functor T’:

-      No family instance for ‘T’

-    In the stand-alone deriving instance for ‘Functor T’

+
+DerivUnsatFam.hs:8:1: error:
+    • Can't make a derived instance of ‘Functor T’:
+        No family instance for ‘T’
+    • In the stand-alone deriving instance for ‘Functor T’
diff --git a/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
index 73f1cbc157..8afd3759fa 100644
--- a/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
@@ -1,10 +1,11 @@
-

-NoMatchErr.hs:19:7: error:

-    Couldn't match type ‘Memo d0’ with ‘Memo d’

-    NB: ‘Memo’ is a type function, and may not be injective

-    The type variable ‘d0’ is ambiguous

-    Expected type: Memo d a -> Memo d a

-      Actual type: Memo d0 a -> Memo d0 a

-    In the ambiguity check for ‘f’

-    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

-    In the type signature: f :: (Fun d) => Memo d a -> Memo d a

+
+NoMatchErr.hs:19:7: error:
+    • Couldn't match type ‘Memo d0’ with ‘Memo d’
+      NB: ‘Memo’ is a type function, and may not be injective
+      The type variable ‘d0’ is ambiguous
+      Expected type: Memo d a -> Memo d a
+        Actual type: Memo d0 a -> Memo d0 a
+    • In the ambiguity check for ‘f’
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      In the type signature:
+        f :: (Fun d) => Memo d a -> Memo d a
diff --git a/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
index 1594d199df..8664c7ba7b 100644
--- a/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
@@ -1,17 +1,17 @@
-

-NotRelaxedExamples.hs:9:15: error:

-    Illegal nested type family application ‘F1 (F1 Char)’

-    (Use UndecidableInstances to permit this)

-    In the type instance declaration for ‘F1’

-

-NotRelaxedExamples.hs:10:15: error:

-    The type family application ‘F2 [x]’

-      is no smaller than the instance head

-    (Use UndecidableInstances to permit this)

-    In the type instance declaration for ‘F2’

-

-NotRelaxedExamples.hs:11:15: error:

-    The type family application ‘F3 [Char]’

-      is no smaller than the instance head

-    (Use UndecidableInstances to permit this)

-    In the type instance declaration for ‘F3’

+
+NotRelaxedExamples.hs:9:15: error:
+    • Illegal nested type family application ‘F1 (F1 Char)’
+      (Use UndecidableInstances to permit this)
+    • In the type instance declaration for ‘F1’
+
+NotRelaxedExamples.hs:10:15: error:
+    • The type family application ‘F2 [x]’
+        is no smaller than the instance head
+      (Use UndecidableInstances to permit this)
+    • In the type instance declaration for ‘F2’
+
+NotRelaxedExamples.hs:11:15: error:
+    • The type family application ‘F3 [Char]’
+        is no smaller than the instance head
+      (Use UndecidableInstances to permit this)
+    • In the type instance declaration for ‘F3’
diff --git a/testsuite/tests/indexed-types/should_fail/Overlap15.stderr b/testsuite/tests/indexed-types/should_fail/Overlap15.stderr
index 673a90798d..b06751c575 100644
--- a/testsuite/tests/indexed-types/should_fail/Overlap15.stderr
+++ b/testsuite/tests/indexed-types/should_fail/Overlap15.stderr
@@ -1,7 +1,8 @@
-

-Overlap15.hs:16:9:

-    Couldn't match expected type ‘F b [b] Bool’ with actual type ‘Bool’

-    In the expression: False

-    In an equation for ‘foo’: foo _ = False

-    Relevant bindings include

-      foo :: Proxy b -> F b [b] Bool (bound at Overlap15.hs:16:1)

+
+Overlap15.hs:16:9: error:
+    • Couldn't match expected type ‘F b [b] Bool’
+                  with actual type ‘Bool’
+    • In the expression: False
+      In an equation for ‘foo’: foo _ = False
+    • Relevant bindings include
+        foo :: Proxy b -> F b [b] Bool (bound at Overlap15.hs:16:1)
diff --git a/testsuite/tests/indexed-types/should_fail/T1900.stderr b/testsuite/tests/indexed-types/should_fail/T1900.stderr
index ce7d51c5de..dbcbddc0af 100644
--- a/testsuite/tests/indexed-types/should_fail/T1900.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T1900.stderr
@@ -1,12 +1,12 @@
-

-T1900.hs:7:3: error:

-    Couldn't match type ‘Depend s0’ with ‘Depend s’

-    NB: ‘Depend’ is a type function, and may not be injective

-    The type variable ‘s0’ is ambiguous

-    Expected type: Depend s -> Depend s

-      Actual type: Depend s0 -> Depend s0

-    In the ambiguity check for ‘trans’

-    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

-    When checking the class method:

-      trans :: forall s. Bug s => Depend s -> Depend s

-    In the class declaration for ‘Bug’

+
+T1900.hs:7:3: error:
+    • Couldn't match type ‘Depend s0’ with ‘Depend s’
+      NB: ‘Depend’ is a type function, and may not be injective
+      The type variable ‘s0’ is ambiguous
+      Expected type: Depend s -> Depend s
+        Actual type: Depend s0 -> Depend s0
+    • In the ambiguity check for ‘trans’
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      When checking the class method:
+        trans :: forall s. Bug s => Depend s -> Depend s
+      In the class declaration for ‘Bug’
diff --git a/testsuite/tests/indexed-types/should_fail/T2157.stderr b/testsuite/tests/indexed-types/should_fail/T2157.stderr
index d2ba6ae53d..7a354cb0c5 100644
--- a/testsuite/tests/indexed-types/should_fail/T2157.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2157.stderr
@@ -1,4 +1,4 @@
-

-T2157.hs:7:15: error:

-    The type synonym ‘S’ should have 2 arguments, but has been given 1

-    In the type instance declaration for ‘F’

+
+T2157.hs:7:15: error:
+    • The type synonym ‘S’ should have 2 arguments, but has been given 1
+    • In the type instance declaration for ‘F’
diff --git a/testsuite/tests/indexed-types/should_fail/T9036.stderr b/testsuite/tests/indexed-types/should_fail/T9036.stderr
index 3bae5a6ef2..3d768de1eb 100644
--- a/testsuite/tests/indexed-types/should_fail/T9036.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T9036.stderr
@@ -1,11 +1,11 @@
-

-T9036.hs:17:17: error:

-    Couldn't match type ‘Curried t0 [t0]’ with ‘Curried t [t]’

-    NB: ‘Curried’ is a type function, and may not be injective

-    The type variable ‘t0’ is ambiguous

-    Expected type: Maybe (GetMonad t after) -> Curried t [t]

-      Actual type: Maybe (GetMonad t0 after) -> Curried t0 [t0]

-    In the ambiguity check for ‘simpleLogger’

-    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

-    In the type signature:

-      simpleLogger :: Maybe (GetMonad t after) -> t `Curried` [t]

+
+T9036.hs:17:17: error:
+    • Couldn't match type ‘Curried t0 [t0]’ with ‘Curried t [t]’
+      NB: ‘Curried’ is a type function, and may not be injective
+      The type variable ‘t0’ is ambiguous
+      Expected type: Maybe (GetMonad t after) -> Curried t [t]
+        Actual type: Maybe (GetMonad t0 after) -> Curried t0 [t0]
+    • In the ambiguity check for ‘simpleLogger’
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      In the type signature:
+        simpleLogger :: Maybe (GetMonad t after) -> t `Curried` [t]
diff --git a/testsuite/tests/indexed-types/should_fail/T9433.stderr b/testsuite/tests/indexed-types/should_fail/T9433.stderr
index 73dfe9e900..64d5042231 100644
--- a/testsuite/tests/indexed-types/should_fail/T9433.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T9433.stderr
@@ -1,4 +1,5 @@
-

-T9433.hs:14:6: error:

-    The type family ‘Id’ should have 1 argument, but has been given none

-    In the type signature: x :: Map Id [Bool]

+
+T9433.hs:14:6: error:
+    • The type family ‘Id’ should have 1 argument, but has been given none
+    • In the type signature:
+        x :: Map Id [Bool]
diff --git a/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
index bdc9c5fbac..04dd2d3e1a 100644
--- a/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
@@ -1,17 +1,17 @@
-

-TyFamUndec.hs:6:15: error:

-    Variable ‘b’ occurs more often

-      in the type family application ‘T (b, b)’ than in the instance head

-    (Use UndecidableInstances to permit this)

-    In the type instance declaration for ‘T’

-

-TyFamUndec.hs:7:15: error:

-    The type family application ‘T (a, Maybe b)’

-      is no smaller than the instance head

-    (Use UndecidableInstances to permit this)

-    In the type instance declaration for ‘T’

-

-TyFamUndec.hs:8:15: error:

-    Illegal nested type family application ‘T (a, T b)’

-    (Use UndecidableInstances to permit this)

-    In the type instance declaration for ‘T’

+
+TyFamUndec.hs:6:15: error:
+    • Variable ‘b’ occurs more often
+        in the type family application ‘T (b, b)’ than in the instance head
+      (Use UndecidableInstances to permit this)
+    • In the type instance declaration for ‘T’
+
+TyFamUndec.hs:7:15: error:
+    • The type family application ‘T (a, Maybe b)’
+        is no smaller than the instance head
+      (Use UndecidableInstances to permit this)
+    • In the type instance declaration for ‘T’
+
+TyFamUndec.hs:8:15: error:
+    • Illegal nested type family application ‘T (a, T b)’
+      (Use UndecidableInstances to permit this)
+    • In the type instance declaration for ‘T’
diff --git a/testsuite/tests/module/mod101.stderr b/testsuite/tests/module/mod101.stderr
index 906e1d7ae8..1c48186885 100644
--- a/testsuite/tests/module/mod101.stderr
+++ b/testsuite/tests/module/mod101.stderr
@@ -1,4 +1,4 @@
-

-mod101.hs:8:5: error:

-    Data constructor not in scope: ConB :: Bool -> DataA

-    Perhaps you meant ‘ConA’ (imported from Mod101_AuxB)

+
+mod101.hs:8:5: error:
+    • Data constructor not in scope: ConB :: Bool -> DataA
+    • Perhaps you meant ‘ConA’ (imported from Mod101_AuxB)
diff --git a/testsuite/tests/module/mod102.stderr b/testsuite/tests/module/mod102.stderr
index 4bc979639d..17ade933a6 100644
--- a/testsuite/tests/module/mod102.stderr
+++ b/testsuite/tests/module/mod102.stderr
@@ -1,4 +1,4 @@
-

-mod102.hs:8:5: error:

-    Variable not in scope: methB :: Bool -> Bool -> ()

-    Perhaps you meant ‘methA’ (imported from Mod102_AuxB)

+
+mod102.hs:8:5: error:
+    • Variable not in scope: methB :: Bool -> Bool -> ()
+    • Perhaps you meant ‘methA’ (imported from Mod102_AuxB)
diff --git a/testsuite/tests/module/mod132.stderr b/testsuite/tests/module/mod132.stderr
index 3547563a06..647a405bf9 100644
--- a/testsuite/tests/module/mod132.stderr
+++ b/testsuite/tests/module/mod132.stderr
@@ -1,4 +1,4 @@
-

-mod132.hs:6:7: error:

-    Data constructor not in scope: Foo

-    Perhaps you meant variable ‘foo’ (line 6)

+
+mod132.hs:6:7: error:
+    • Data constructor not in scope: Foo
+    • Perhaps you meant variable ‘foo’ (line 6)
diff --git a/testsuite/tests/module/mod39.stderr b/testsuite/tests/module/mod39.stderr
index 3c049f2532..11aa05256e 100644
--- a/testsuite/tests/module/mod39.stderr
+++ b/testsuite/tests/module/mod39.stderr
@@ -1,7 +1,7 @@
-

-mod39.hs:3:17:

-    Constraint ‘Eq a’ in the type of ‘f’

-      constrains only the class type variables

-    Use ConstrainedClassMethods to allow it

-    When checking the class method: f :: forall a. (C a, Eq a) => a

-    In the class declaration for ‘C’

+
+mod39.hs:3:17: error:
+    • Constraint ‘Eq a’ in the type of ‘f’
+        constrains only the class type variables
+      Use ConstrainedClassMethods to allow it
+    • When checking the class method: f :: forall a. (C a, Eq a) => a
+      In the class declaration for ‘C’
diff --git a/testsuite/tests/module/mod60.stderr b/testsuite/tests/module/mod60.stderr
index cf94537bb9..7d21c93510 100644
--- a/testsuite/tests/module/mod60.stderr
+++ b/testsuite/tests/module/mod60.stderr
@@ -1,5 +1,5 @@
-

-mod60.hs:3:4: error:

-    The constructor ‘Left’ should have 1 argument, but has been given none

-    In the pattern: Left

-    In an equation for ‘f’: f (Left) = error "foo"

+
+mod60.hs:3:4: error:
+    • The constructor ‘Left’ should have 1 argument, but has been given none
+    • In the pattern: Left
+      In an equation for ‘f’: f (Left) = error "foo"
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr
index 6cbd7ca94b..f592bc878b 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr
@@ -1,5 +1,5 @@
-

-ParserNoBinaryLiterals2.hs:8:4: error:

-    The constructor ‘W#’ should have 1 argument, but has been given 2

-    In the pattern: W# 0 b0##

-    In an equation for ‘f’: f (W# 0 b0##) = ()

+
+ParserNoBinaryLiterals2.hs:8:4: error:
+    • The constructor ‘W#’ should have 1 argument, but has been given 2
+    • In the pattern: W# 0 b0##
+      In an equation for ‘f’: f (W# 0 b0##) = ()
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr
index 1e4c475904..fbe4bf574c 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr
@@ -1,5 +1,5 @@
-

-ParserNoBinaryLiterals3.hs:8:4: error:

-    The constructor ‘I#’ should have 1 argument, but has been given 2

-    In the pattern: I# 0 b0#

-    In an equation for ‘f’: f (I# 0 b0#) = ()

+
+ParserNoBinaryLiterals3.hs:8:4: error:
+    • The constructor ‘I#’ should have 1 argument, but has been given 2
+    • In the pattern: I# 0 b0#
+      In an equation for ‘f’: f (I# 0 b0#) = ()
diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
index 77355f1957..505e5ae659 100644
--- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  bravo :: forall t. Num t => t

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  bravo :: forall t. Num t => t
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_compile/Either.stderr b/testsuite/tests/partial-sigs/should_compile/Either.stderr
index 58ad32f92c..53988619d9 100644
--- a/testsuite/tests/partial-sigs/should_compile/Either.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Either.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  barry :: forall t. t -> (Either [Char] t, Either [Char] t)

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  barry :: forall t. t -> (Either [Char] t, Either [Char] t)
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr
index bdae2f7e44..3bb47befd4 100644
--- a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  every :: forall t. (t -> Bool) -> [t] -> Bool

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  every :: forall t. (t -> Bool) -> [t] -> Bool
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr
index 990fe075cc..db1f996a1d 100644
--- a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  showTwo :: forall a. Show a => a -> String

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  showTwo :: forall a. Show a => a -> String
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr
index 513b5ce470..db0adb2004 100644
--- a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  bar :: forall t. t -> Bool

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  bar :: forall t. t -> Bool
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
index 866a685d37..6151c745cc 100644
--- a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  unc :: forall t t1 t2. (t -> t1 -> t2) -> (t, t1) -> t2

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  unc :: forall t t1 t2. (t -> t1 -> t2) -> (t, t1) -> t2
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr
index e97c1f86dc..58116f8b16 100644
--- a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr
@@ -1,7 +1,7 @@
-TYPE SIGNATURES

-  unc :: forall t a b. (a -> b -> t) -> (a, b) -> t

-TYPE CONSTRUCTORS

-COERCION AXIOMS

-Dependent modules: []

-Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,

-                     integer-gmp-1.0.0.0]

+TYPE SIGNATURES
+  unc :: forall t a b. (a -> b -> t) -> (a, b) -> t
+TYPE CONSTRUCTORS
+COERCION AXIOMS
+Dependent modules: []
+Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0,
+                     integer-gmp-1.0.0.1]
diff --git a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr
index 31b90d9fc2..a8f98d9e62 100644
--- a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr
@@ -1,8 +1,8 @@
-[1 of 2] Compiling ExtraConstraintsWildcardInTypeSplice ( ExtraConstraintsWildcardInTypeSplice.hs, ExtraConstraintsWildcardInTypeSplice.o )

-

-ExtraConstraintsWildcardInTypeSplice.hs:7:16: error:

-    Wildcard ‘_’ not allowed in a constraint

-      except as the last top-level constraint of a type signature

-        e.g  f :: (Eq a, _) => blah

-      in a Template-Haskell quoted type

-    In the Template Haskell quotation [t| _ => _ |]

+[1 of 2] Compiling ExtraConstraintsWildcardInTypeSplice ( ExtraConstraintsWildcardInTypeSplice.hs, ExtraConstraintsWildcardInTypeSplice.o )
+
+ExtraConstraintsWildcardInTypeSplice.hs:7:16: error:
+    • Wildcard ‘_’ not allowed in a constraint
+        except as the last top-level constraint of a type signature
+          e.g  f :: (Eq a, _) => blah
+        in a Template-Haskell quoted type
+    • In the Template Haskell quotation [t| _ => _ |]
diff --git a/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr b/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr
index 59f5b93b59..244b470e81 100644
--- a/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr
@@ -1,12 +1,12 @@
-

-NamedWildcardsNotInMonotype.hs:5:1: error:

-    Could not deduce (Eq t0)

-    from the context: (Show a, Eq t, Eq a)

-      bound by the inferred type for ‘foo’:

-                 (Show a, Eq t, Eq a) => a -> a -> String

-      at NamedWildcardsNotInMonotype.hs:5:1-33

-    The type variable ‘t0’ is ambiguous

-    In the ambiguity check for the inferred type for ‘foo’

-    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

-    When checking the inferred type

-      foo :: forall t a. (Show a, Eq t, Eq a) => a -> a -> String

+
+NamedWildcardsNotInMonotype.hs:5:1: error:
+    • Could not deduce (Eq t0)
+      from the context: (Show a, Eq t, Eq a)
+        bound by the inferred type for ‘foo’:
+                   (Show a, Eq t, Eq a) => a -> a -> String
+        at NamedWildcardsNotInMonotype.hs:5:1-33
+      The type variable ‘t0’ is ambiguous
+    • In the ambiguity check for the inferred type for ‘foo’
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      When checking the inferred type
+        foo :: forall t a. (Show a, Eq t, Eq a) => a -> a -> String
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardsInPatternAndExprSig.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardsInPatternAndExprSig.stderr
index 6e87e4ff9c..db14490466 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardsInPatternAndExprSig.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardsInPatternAndExprSig.stderr
@@ -1,74 +1,74 @@
-

-WildcardsInPatternAndExprSig.hs:4:18: error:

-    Found type wildcard ‘_a’ standing for ‘t’

-    Where: ‘t’ is a rigid type variable bound by

-               the inferred type of bar :: Maybe [t] -> t -> [t]

-               at WildcardsInPatternAndExprSig.hs:4:1

-    To use the inferred type, enable PartialTypeSignatures

-    In a pattern type signature: _a

-    In the pattern: x :: _a

-    In the pattern: [x :: _a]

-    Relevant bindings include

-      bar :: Maybe [t] -> t -> [t]

-        (bound at WildcardsInPatternAndExprSig.hs:4:1)

-

-WildcardsInPatternAndExprSig.hs:4:25: error:

-    Found type wildcard ‘_’ standing for ‘[t]’

-    Where: ‘t’ is a rigid type variable bound by

-               the inferred type of bar :: Maybe [t] -> t -> [t]

-               at WildcardsInPatternAndExprSig.hs:4:1

-    To use the inferred type, enable PartialTypeSignatures

-    In a pattern type signature: _

-    In the pattern: [x :: _a] :: _

-    In the pattern: Just ([x :: _a] :: _)

-    Relevant bindings include

-      bar :: Maybe [t] -> t -> [t]

-        (bound at WildcardsInPatternAndExprSig.hs:4:1)

-

-WildcardsInPatternAndExprSig.hs:4:38: error:

-    Found type wildcard ‘_b’ standing for ‘t’

-    Where: ‘t’ is a rigid type variable bound by

-               the inferred type of bar :: Maybe [t] -> t -> [t]

-               at WildcardsInPatternAndExprSig.hs:4:1

-    To use the inferred type, enable PartialTypeSignatures

-    In a pattern type signature: Maybe [_b]

-    In the pattern: Just ([x :: _a] :: _) :: Maybe [_b]

-    In an equation for ‘bar’:

-        bar (Just ([x :: _a] :: _) :: Maybe [_b]) (z :: _c)

-          = [x, z] :: [_d]

-    Relevant bindings include

-      bar :: Maybe [t] -> t -> [t]

-        (bound at WildcardsInPatternAndExprSig.hs:4:1)

-

-WildcardsInPatternAndExprSig.hs:4:49: error:

-    Found type wildcard ‘_c’ standing for ‘t’

-    Where: ‘t’ is a rigid type variable bound by

-               the inferred type of bar :: Maybe [t] -> t -> [t]

-               at WildcardsInPatternAndExprSig.hs:4:1

-    To use the inferred type, enable PartialTypeSignatures

-    In a pattern type signature: _c

-    In the pattern: z :: _c

-    In an equation for ‘bar’:

-        bar (Just ([x :: _a] :: _) :: Maybe [_b]) (z :: _c)

-          = [x, z] :: [_d]

-    Relevant bindings include

-      x :: t (bound at WildcardsInPatternAndExprSig.hs:4:13)

-      bar :: Maybe [t] -> t -> [t]

-        (bound at WildcardsInPatternAndExprSig.hs:4:1)

-

-WildcardsInPatternAndExprSig.hs:4:66: error:

-    Found type wildcard ‘_d’ standing for ‘t’

-    Where: ‘t’ is a rigid type variable bound by

-               the inferred type of bar :: Maybe [t] -> t -> [t]

-               at WildcardsInPatternAndExprSig.hs:4:1

-    To use the inferred type, enable PartialTypeSignatures

-    In an expression type signature: [_d]

-    In the expression: [x, z] :: [_d]

-    In an equation for ‘bar’:

-        bar (Just ([x :: _a] :: _) :: Maybe [_b]) (z :: _c)

-          = [x, z] :: [_d]

-    Relevant bindings include

-      z :: t (bound at WildcardsInPatternAndExprSig.hs:4:44)

-      x :: t (bound at WildcardsInPatternAndExprSig.hs:4:13)

-      bar :: Maybe [t] -> t -> [t]

-        (bound at WildcardsInPatternAndExprSig.hs:4:1)

+
+WildcardsInPatternAndExprSig.hs:4:18: error:
+    • Found type wildcard ‘_a’ standing for ‘t’
+      Where: ‘t’ is a rigid type variable bound by
+               the inferred type of bar :: Maybe [t] -> t -> [t]
+               at WildcardsInPatternAndExprSig.hs:4:1
+      To use the inferred type, enable PartialTypeSignatures
+    • In a pattern type signature: _a
+      In the pattern: x :: _a
+      In the pattern: [x :: _a]
+    • Relevant bindings include
+        bar :: Maybe [t] -> t -> [t]
+          (bound at WildcardsInPatternAndExprSig.hs:4:1)
+
+WildcardsInPatternAndExprSig.hs:4:25: error:
+    • Found type wildcard ‘_’ standing for ‘[t]’
+      Where: ‘t’ is a rigid type variable bound by
+               the inferred type of bar :: Maybe [t] -> t -> [t]
+               at WildcardsInPatternAndExprSig.hs:4:1
+      To use the inferred type, enable PartialTypeSignatures
+    • In a pattern type signature: _
+      In the pattern: [x :: _a] :: _
+      In the pattern: Just ([x :: _a] :: _)
+    • Relevant bindings include
+        bar :: Maybe [t] -> t -> [t]
+          (bound at WildcardsInPatternAndExprSig.hs:4:1)
+
+WildcardsInPatternAndExprSig.hs:4:38: error:
+    • Found type wildcard ‘_b’ standing for ‘t’
+      Where: ‘t’ is a rigid type variable bound by
+               the inferred type of bar :: Maybe [t] -> t -> [t]
+               at WildcardsInPatternAndExprSig.hs:4:1
+      To use the inferred type, enable PartialTypeSignatures
+    • In a pattern type signature: Maybe [_b]
+      In the pattern: Just ([x :: _a] :: _) :: Maybe [_b]
+      In an equation for ‘bar’:
+          bar (Just ([x :: _a] :: _) :: Maybe [_b]) (z :: _c)
+            = [x, z] :: [_d]
+    • Relevant bindings include
+        bar :: Maybe [t] -> t -> [t]
+          (bound at WildcardsInPatternAndExprSig.hs:4:1)
+
+WildcardsInPatternAndExprSig.hs:4:49: error:
+    • Found type wildcard ‘_c’ standing for ‘t’
+      Where: ‘t’ is a rigid type variable bound by
+               the inferred type of bar :: Maybe [t] -> t -> [t]
+               at WildcardsInPatternAndExprSig.hs:4:1
+      To use the inferred type, enable PartialTypeSignatures
+    • In a pattern type signature: _c
+      In the pattern: z :: _c
+      In an equation for ‘bar’:
+          bar (Just ([x :: _a] :: _) :: Maybe [_b]) (z :: _c)
+            = [x, z] :: [_d]
+    • Relevant bindings include
+        x :: t (bound at WildcardsInPatternAndExprSig.hs:4:13)
+        bar :: Maybe [t] -> t -> [t]
+          (bound at WildcardsInPatternAndExprSig.hs:4:1)
+
+WildcardsInPatternAndExprSig.hs:4:66: error:
+    • Found type wildcard ‘_d’ standing for ‘t’
+      Where: ‘t’ is a rigid type variable bound by
+               the inferred type of bar :: Maybe [t] -> t -> [t]
+               at WildcardsInPatternAndExprSig.hs:4:1
+      To use the inferred type, enable PartialTypeSignatures
+    • In an expression type signature: [_d]
+      In the expression: [x, z] :: [_d]
+      In an equation for ‘bar’:
+          bar (Just ([x :: _a] :: _) :: Maybe [_b]) (z :: _c)
+            = [x, z] :: [_d]
+    • Relevant bindings include
+        z :: t (bound at WildcardsInPatternAndExprSig.hs:4:44)
+        x :: t (bound at WildcardsInPatternAndExprSig.hs:4:13)
+        bar :: Maybe [t] -> t -> [t]
+          (bound at WildcardsInPatternAndExprSig.hs:4:1)