Use diagnostic infrastructure in GHC.Tc.Errors

4 files changed, 8 insertions, 8 deletions

diff --git a/testsuite/tests/polykinds/T18451.stderr b/testsuite/tests/polykinds/T18451.stderr
index 5f61afcbbe..0bd3f9893b 100644
--- a/testsuite/tests/polykinds/T18451.stderr
+++ b/testsuite/tests/polykinds/T18451.stderr
@@ -1,9 +1,9 @@
 
 T18451.hs:10:58: error:
     • Expected kind ‘k0’, but ‘b’ has kind ‘k’
+      Type variable kinds:
+        a :: k0
+        k :: Const (*) a
     • In the second argument of ‘SameKind’, namely ‘b’
       In the type ‘forall (b :: k). SameKind a b’
       In the type declaration for ‘T’
-    • Type variable kinds:
-        a :: k0
-        k :: Const (*) a
diff --git a/testsuite/tests/polykinds/T7230.stderr b/testsuite/tests/polykinds/T7230.stderr
index f59e44d5cd..aea0ea4a9d 100644
--- a/testsuite/tests/polykinds/T7230.stderr
+++ b/testsuite/tests/polykinds/T7230.stderr
@@ -1,6 +1,6 @@
 
 T7230.hs:48:32: error:
-    • Could not deduce: (x :<<= x1) ~ 'True
+    • Could not deduce ((x :<<= x1) ~ 'True)
       from the context: Increasing xs ~ 'True
         bound by the type signature for:
                    crash :: forall (xs :: [Nat]).
diff --git a/testsuite/tests/polykinds/T7438.stderr b/testsuite/tests/polykinds/T7438.stderr
index dd953fa69a..ff1e74cc27 100644
--- a/testsuite/tests/polykinds/T7438.stderr
+++ b/testsuite/tests/polykinds/T7438.stderr
@@ -1,6 +1,6 @@
 
 T7438.hs:6:14: error:
-    • Could not deduce: p ~ p1
+    • Could not deduce (p ~ p1)
       from the context: b ~ a
         bound by a pattern with constructor:
                    Nil :: forall {k} (a :: k). Thrist a a,
@@ -12,9 +12,9 @@ T7438.hs:6:14: error:
       ‘p1’ is a rigid type variable bound by
         the inferred type of go :: Thrist a b -> p -> p1
         at T7438.hs:6:1-16
-      Possible fix: add a type signature for ‘go’
     • In the expression: acc
       In an equation for ‘go’: go Nil acc = acc
     • Relevant bindings include
         acc :: p (bound at T7438.hs:6:8)
         go :: Thrist a b -> p -> p1 (bound at T7438.hs:6:1)
+    Suggested fix: Consider giving ‘go’ a type signature
diff --git a/testsuite/tests/polykinds/T7594.stderr b/testsuite/tests/polykinds/T7594.stderr
index fc0aa1fcc3..9a75c80ec3 100644
--- a/testsuite/tests/polykinds/T7594.stderr
+++ b/testsuite/tests/polykinds/T7594.stderr
@@ -1,6 +1,6 @@
 
 T7594.hs:37:12: error:
-    • Could not deduce: b ~ IO ()
+    • Could not deduce (b ~ IO ())
       from the context: (:&:) c0 Real a
         bound by a type expected by the context:
                    forall a. (:&:) c0 Real a => a -> b
@@ -10,8 +10,8 @@ T7594.hs:37:12: error:
       ‘b’ is a rigid type variable bound by
         the inferred type of bar2 :: b
         at T7594.hs:37:1-19
-      Possible fix: add a type signature for ‘bar2’
     • In the first argument of ‘app’, namely ‘print’
       In the expression: app print q2
       In an equation for ‘bar2’: bar2 = app print q2
     • Relevant bindings include bar2 :: b (bound at T7594.hs:37:1)
+    Suggested fix: Consider giving ‘bar2’ a type signature