Further testsuite wibbles following changes to kind suppression

7 files changed, 43 insertions, 44 deletions

diff --git a/testsuite/tests/ghci/scripts/T7873.stdout b/testsuite/tests/ghci/scripts/T7873.stdout
index 844e8da4d4..785fbf06b2 100644
--- a/testsuite/tests/ghci/scripts/T7873.stdout
+++ b/testsuite/tests/ghci/scripts/T7873.stdout
@@ -1,6 +1,5 @@
 data D1 where
-  MkD1 :: (forall (k :: BOX) (p :: k -> *) (a :: k).
-           p a -> Int) -> D1
+  MkD1 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D1
   	-- Defined at <interactive>:3:6
 data D2 where
   MkD2 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D2
diff --git a/testsuite/tests/indexed-types/should_fail/T7786.stderr b/testsuite/tests/indexed-types/should_fail/T7786.stderr
index 85a1be23d5..8c1f64eac0 100644
--- a/testsuite/tests/indexed-types/should_fail/T7786.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7786.stderr
@@ -1,9 +1,9 @@
 
 T7786.hs:86:22:
-    Couldn't match type ‛xxx’ with ‛'Empty [KeySegment]’
+    Couldn't match type ‛xxx’ with ‛'Empty’
     Inaccessible code in
       a pattern with constructor
-        Nil :: forall (k :: BOX). Sing (Inventory k) ('Empty k),
+        Nil :: Sing 'Empty,
       in a pattern binding in
            'do' block
     In the pattern: Nil
diff --git a/testsuite/tests/indexed-types/should_fail/T7967.stderr b/testsuite/tests/indexed-types/should_fail/T7967.stderr
index 57560fed4a..620077601f 100644
--- a/testsuite/tests/indexed-types/should_fail/T7967.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7967.stderr
@@ -1,7 +1,7 @@
 
 T7967.hs:31:26:
-    Couldn't match type ‛'[] *’ with ‛(':) * h0 t0’
+    Couldn't match type ‛'[]’ with ‛h0 : t0’
     Expected type: Index n l
-      Actual type: Index 'Zero ((':) * h0 t0)
+      Actual type: Index 'Zero (h0 : t0)
     In the expression: IZero
     In an equation for ‛sNatToIndex’: sNatToIndex SZero HNil = IZero
diff --git a/testsuite/tests/polykinds/T7230.stderr b/testsuite/tests/polykinds/T7230.stderr
index ae259dd4e9..ab9037da03 100644
--- a/testsuite/tests/polykinds/T7230.stderr
+++ b/testsuite/tests/polykinds/T7230.stderr
@@ -1,27 +1,27 @@
-

-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 (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 (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/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index e56cfb44b3..e1808e8b2b 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -14,7 +14,7 @@ TYPE CONSTRUCTORS
       RecFlag NonRecursive, Promotable
       = K2 :: forall a. a -> T2 a Stricts: _
       FamilyInstance: none
-  T3 :: forall (k :: BOX). k -> *
+  T3 :: k -> *
   data T3 (k::BOX) (a::k)
       No C type associated
       Roles: [nominal, phantom]
@@ -35,14 +35,14 @@ TYPE CONSTRUCTORS
       RecFlag NonRecursive, Promotable
       = K5 :: forall a. a -> T5 a Stricts: _
       FamilyInstance: none
-  T6 :: forall (k :: BOX). k -> *
+  T6 :: k -> *
   data T6 (k::BOX) (a::k)
       No C type associated
       Roles: [nominal, phantom]
       RecFlag NonRecursive, Not promotable
       = K6 :: forall (k::BOX) (a::k). T6 k a
       FamilyInstance: none
-  T7 :: forall (k :: BOX). k -> * -> *
+  T7 :: k -> * -> *
   data T7 (k::BOX) (a::k) b
       No C type associated
       Roles: [nominal, phantom, representational]
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index b828ed14b5..325f9df53e 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -1,6 +1,6 @@
 TYPE SIGNATURES
 TYPE CONSTRUCTORS
-  T :: forall (k :: BOX). k -> *
+  T :: k -> *
   data T (k::BOX) (a::k)
       No C type associated
       Roles: [nominal, representational]
diff --git a/testsuite/tests/typecheck/should_fail/T2247.stderr b/testsuite/tests/typecheck/should_fail/T2247.stderr
index 667a117337..3a5dce4923 100644
--- a/testsuite/tests/typecheck/should_fail/T2247.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2247.stderr
@@ -1,7 +1,7 @@
-

-T2247.hs:6:10:

-    Illegal instance declaration for ‛FD a b’

-      The liberal coverage condition fails in class ‛FD’

-        for functional dependency: ‛x -> y’

-      Reason: ‛a’ do not jointly determine ‛b’

-    In the instance declaration for ‛FD a b’

+
+T2247.hs:6:10:
+    Illegal instance declaration for ‛FD a b’
+      The liberal coverage condition fails in class ‛FD’
+        for functional dependency: ‛a -> b’
+      Reason: lhs type ‛a’ does not deternine rhs type ‛b’
+    In the instance declaration for ‛FD a b’