5 files changed, 68 insertions, 68 deletions
diff --git a/testsuite/tests/polykinds/T7230.stderr b/testsuite/tests/polykinds/T7230.stderr
index b6af606fe7..ed7140f53b 100644
--- a/testsuite/tests/polykinds/T7230.stderr
+++ b/testsuite/tests/polykinds/T7230.stderr
@@ -1,28 +1,28 @@
-
-T7230.hs:48:32:
-    Could not deduce ((x :<<= x1) ~ 'True)
-    from the context (Increasing xs ~ 'True)
-      bound by the type signature for:
-               crash :: (Increasing xs ~ 'True) =>
-                        SList xs -> SBool (Increasing xs)
-      at T7230.hs:47:10-68
-    or from (xs ~ (x : xs1))
-      bound by a pattern with constructor:
-                 SCons :: forall (k :: BOX) (x :: k) (xs :: [k]).
-                          Sing x -> Sing xs -> Sing (x : xs),
-               in an equation for ‘crash’
-      at T7230.hs:48:8-27
-    or from (xs1 ~ (x1 : xs2))
-      bound by a pattern with constructor:
-                 SCons :: forall (k :: BOX) (x :: k) (xs :: [k]).
-                          Sing x -> Sing xs -> Sing (x : xs),
-               in an equation for ‘crash’
-      at T7230.hs:48:17-26
-    Expected type: SBool (Increasing xs)
-      Actual type: SBool (x :<<= x1)
-    Relevant bindings include
-      y :: Sing x1 (bound at T7230.hs:48:23)
-      x :: Sing x (bound at T7230.hs:48:14)
-    In the expression: x %:<<= y
-    In an equation for ‘crash’:
-        crash (SCons x (SCons y xs)) = x %:<<= y
+
+T7230.hs:48:32:
+    Could not deduce: (x :<<= x1) ~ 'True
+    from the context: Increasing xs ~ 'True
+      bound by the type signature for:
+               crash :: (Increasing xs ~ 'True) =>
+                        SList xs -> SBool (Increasing xs)
+      at T7230.hs:47:10-68
+    or from: xs ~ (x : xs1)
+      bound by a pattern with constructor:
+                 SCons :: forall (k :: BOX) (x :: k) (xs :: [k]).
+                          Sing x -> Sing xs -> Sing (x : xs),
+               in an equation for ‘crash’
+      at T7230.hs:48:8-27
+    or from: xs1 ~ (x1 : xs2)
+      bound by a pattern with constructor:
+                 SCons :: forall (k :: BOX) (x :: k) (xs :: [k]).
+                          Sing x -> Sing xs -> Sing (x : xs),
+               in an equation for ‘crash’
+      at T7230.hs:48:17-26
+    Expected type: SBool (Increasing xs)
+      Actual type: SBool (x :<<= x1)
+    Relevant bindings include
+      y :: Sing x1 (bound at T7230.hs:48:23)
+      x :: Sing x (bound at T7230.hs:48:14)
+    In the expression: x %:<<= y
+    In an equation for ‘crash’:
+        crash (SCons x (SCons y xs)) = x %:<<= y
diff --git a/testsuite/tests/polykinds/T7438.stderr b/testsuite/tests/polykinds/T7438.stderr
index d280deb2d8..8ef9ef8f33 100644
--- a/testsuite/tests/polykinds/T7438.stderr
+++ b/testsuite/tests/polykinds/T7438.stderr
@@ -1,19 +1,19 @@
-
-T7438.hs:6:14:
-    Couldn't match expected type ‘t1’ with actual type ‘t’
-      ‘t’ is untouchable
-        inside the constraints (t2 ~ t3)
-        bound by a pattern with constructor:
-                   Nil :: forall (k :: BOX) (b :: k). Thrist b b,
-                 in an equation for ‘go’
-        at T7438.hs:6:4-6
-      ‘t’ is a rigid type variable bound by
-          the inferred type of go :: Thrist t2 t3 -> t -> t1 at T7438.hs:6:1
-      ‘t1’ is a rigid type variable bound by
-           the inferred type of go :: Thrist t2 t3 -> t -> t1 at T7438.hs:6:1
-    Possible fix: add a type signature for ‘go’
-    Relevant bindings include
-      acc :: t (bound at T7438.hs:6:8)
-      go :: Thrist t2 t3 -> t -> t1 (bound at T7438.hs:6:1)
-    In the expression: acc
-    In an equation for ‘go’: go Nil acc = acc
+
+T7438.hs:6:14:
+    Couldn't match expected type ‘t1’ with actual type ‘t’
+      ‘t’ is untouchable
+        inside the constraints: t2 ~ t3
+        bound by a pattern with constructor:
+                   Nil :: forall (k :: BOX) (b :: k). Thrist b b,
+                 in an equation for ‘go’
+        at T7438.hs:6:4-6
+      ‘t’ is a rigid type variable bound by
+          the inferred type of go :: Thrist t2 t3 -> t -> t1 at T7438.hs:6:1
+      ‘t1’ is a rigid type variable bound by
+           the inferred type of go :: Thrist t2 t3 -> t -> t1 at T7438.hs:6:1
+    Possible fix: add a type signature for ‘go’
+    Relevant bindings include
+      acc :: t (bound at T7438.hs:6:8)
+      go :: Thrist t2 t3 -> t -> t1 (bound at T7438.hs:6:1)
+    In the expression: acc
+    In an equation for ‘go’: go Nil acc = acc
diff --git a/testsuite/tests/polykinds/T7594.stderr b/testsuite/tests/polykinds/T7594.stderr
index 31faf3d287..08ab1632e6 100644
--- a/testsuite/tests/polykinds/T7594.stderr
+++ b/testsuite/tests/polykinds/T7594.stderr
@@ -2,7 +2,7 @@
 T7594.hs:33:12:
     Couldn't match type ‘b’ with ‘IO ()’
       ‘b’ is untouchable
-        inside the constraints ((:&:) c0 Real a)
+        inside the constraints: (:&:) c0 Real a
         bound by a type expected by the context: (:&:) c0 Real a => a -> b
         at T7594.hs:33:8-19
       ‘b’ is a rigid type variable bound by
diff --git a/testsuite/tests/polykinds/T8566.stderr b/testsuite/tests/polykinds/T8566.stderr
index 82c1dedd75..096f058791 100644
--- a/testsuite/tests/polykinds/T8566.stderr
+++ b/testsuite/tests/polykinds/T8566.stderr
@@ -1,19 +1,19 @@
-
-T8566.hs:31:9:
-    Could not deduce (C ('AA (t (I a ps)) as) ps fs0)
-      arising from a use of ‘c’
-    from the context (C ('AA (t (I a ps)) as) ps fs)
-      bound by the instance declaration at T8566.hs:29:10-67
-    or from ('AA t (a : as) ~ 'AA t1 as1)
-      bound by a pattern with constructor:
-                 A :: forall (r :: [*]) (k :: BOX) (t :: k) (as :: [U *]).
-                      I ('AA t as) r,
-               in an equation for ‘c’
-      at T8566.hs:31:5
-    The type variable ‘fs0’ is ambiguous
-    Relevant bindings include
-      c :: I ('AA t (a : as)) ps -> I ('AA t (a : as)) ps
-        (bound at T8566.hs:31:3)
-    In the expression: c undefined
-    In an equation for ‘c’: c A = c undefined
-    In the instance declaration for ‘C ('AA t (a : as)) ps fs’
+
+T8566.hs:31:9:
+    Could not deduce (C ('AA (t (I a ps)) as) ps fs0)
+      arising from a use of ‘c’
+    from the context: C ('AA (t (I a ps)) as) ps fs
+      bound by the instance declaration at T8566.hs:29:10-67
+    or from: 'AA t (a : as) ~ 'AA t1 as1
+      bound by a pattern with constructor:
+                 A :: forall (r :: [*]) (k :: BOX) (t :: k) (as :: [U *]).
+                      I ('AA t as) r,
+               in an equation for ‘c’
+      at T8566.hs:31:5
+    The type variable ‘fs0’ is ambiguous
+    Relevant bindings include
+      c :: I ('AA t (a : as)) ps -> I ('AA t (a : as)) ps
+        (bound at T8566.hs:31:3)
+    In the expression: c undefined
+    In an equation for ‘c’: c A = c undefined
+    In the instance declaration for ‘C ('AA t (a : as)) ps fs’
diff --git a/testsuite/tests/polykinds/T9222.stderr b/testsuite/tests/polykinds/T9222.stderr
index 8e838e7bd5..01869edd45 100644
--- a/testsuite/tests/polykinds/T9222.stderr
+++ b/testsuite/tests/polykinds/T9222.stderr
@@ -2,7 +2,7 @@
 T9222.hs:13:3:
     Couldn't match type ‘b0’ with ‘b’
       ‘b0’ is untouchable
-        inside the constraints (a ~ '(b0, c0))
+        inside the constraints: a ~ '(b0, c0)
         bound by the type of the constructor ‘Want’:
                    (a ~ '(b0, c0)) => Proxy b0
         at T9222.hs:13:3