Testsuite wibbles due to #9204

5 files changed, 21 insertions, 4 deletions

diff --git a/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr b/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr
index 04435ba962..3b9539e19e 100644
--- a/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr
+++ b/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr
@@ -25,3 +25,4 @@ ClosedFam3.hs-boot:12:1:
                      Baz Int = Bool
     Boot file:   type family Baz (a :: k) :: * where
                      Baz * Int = Bool
+    The types have different kinds
diff --git a/testsuite/tests/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index c7b51a1d1f..1c002ac276 100644
--- a/testsuite/tests/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
@@ -10,34 +10,38 @@ RnFail055.hs-boot:4:1:
     and its hs-boot file
     Main module: f1 :: Int -> Float
     Boot file:   f1 :: Float -> Int
+    The two types are different
 
 RnFail055.hs-boot:6:1:
     Type constructor ‘S1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type S1 a b = (a, b)
     Boot file:   type S1 a b c = (a, b)
+    The types have different kinds
 
 RnFail055.hs-boot:8:1:
     Type constructor ‘S2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type S2 a b = forall a1. (a1, b)
     Boot file:   type S2 a b = forall b1. (a, b1)
+    The roles do not match. Roles default to ‘representational’ in boot files
 
 RnFail055.hs-boot:12:1:
     Type constructor ‘T1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T1 a b = T1 [b] [a]
     Boot file:   data T1 a b = T1 [a] [b]
+    The constructors do not match: The types for ‘T1’ differ
 
 RnFail055.hs-boot:14:1:
     Type constructor ‘T2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type role T2 representational nominal
-                 data Eq b => T2 a b
-                   = T2 a
+                 data Eq b => T2 a b = T2 a
     Boot file:   type role T2 nominal representational
-                 data Eq a => T2 a b
-                   = T2 a
+                 data Eq a => T2 a b = T2 a
+    The roles do not match. Roles default to ‘representational’ in boot files
+    The datatype contexts do not match
 
 RnFail055.hs-boot:16:11:
     T3 is exported by the hs-boot file, but not exported by the module
@@ -50,12 +54,16 @@ RnFail055.hs-boot:21:1:
     and its hs-boot file
     Main module: data T5 a = T5 {field5 :: a}
     Boot file:   data T5 a = T5 a
+    The constructors do not match:
+      The record label lists for ‘T5’ differ
 
 RnFail055.hs-boot:23:1:
     Type constructor ‘T6’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T6 = T6 Int
     Boot file:   data T6 = T6 !Int
+    The constructors do not match:
+      The strictness annotations for ‘T6’ differ
 
 RnFail055.hs-boot:25:1:
     Type constructor ‘T7’ has conflicting definitions in the module
@@ -64,6 +72,8 @@ RnFail055.hs-boot:25:1:
                  data T7 a where
                    T7 :: a1 -> T7 a
     Boot file:   data T7 a = T7 a
+    The roles do not match. Roles default to ‘representational’ in boot files
+    The constructors do not match: The types for ‘T7’ differ
 
 RnFail055.hs-boot:27:22:
     RnFail055.m1 is exported by the hs-boot file, but not exported by the module
@@ -76,9 +86,11 @@ RnFail055.hs-boot:28:1:
                    m2' :: a -> b
     Boot file:   class C2 a b where
                    m2 :: a -> b
+    The methods do not match: There are different numbers of methods
 
 RnFail055.hs-boot:29:1:
     Class ‘C3’ has conflicting definitions in the module
     and its hs-boot file
     Main module: class (Eq a, Ord a) => C3 a
     Boot file:   class (Ord a, Eq a) => C3 a
+    The class constraints do not match
diff --git a/testsuite/tests/roles/should_fail/Roles12.stderr b/testsuite/tests/roles/should_fail/Roles12.stderr
index 9b0f2cfdb5..874ddca1d3 100644
--- a/testsuite/tests/roles/should_fail/Roles12.stderr
+++ b/testsuite/tests/roles/should_fail/Roles12.stderr
@@ -5,3 +5,4 @@ Roles12.hs:5:1:
     Main module: type role T phantom
                  data T a
     Boot file:   abstract T a
+    The roles do not match. Roles default to ‘representational’ in boot files
diff --git a/testsuite/tests/typecheck/should_fail/T3468.stderr b/testsuite/tests/typecheck/should_fail/T3468.stderr
index 26ec1920a6..9284df2fb4 100644
--- a/testsuite/tests/typecheck/should_fail/T3468.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3468.stderr
@@ -6,3 +6,4 @@ T3468.hs-boot:3:1:
                  data Tool d where
                    F :: a -> Tool d
     Boot file:   abstract Tool
+    The types have different kinds
diff --git a/testsuite/tests/typecheck/should_fail/tcfail220.stderr b/testsuite/tests/typecheck/should_fail/tcfail220.stderr
index aea79067c2..e565cc7af6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail220.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail220.stderr
@@ -5,9 +5,11 @@ tcfail220.hsig:4:1:
     and its hsig file
     Main module: data Bool = False | GHC.Types.True
     Hsig file:  data Bool a b c d = False
+    The types have different kinds
 
 tcfail220.hsig:5:1:
     Type constructor ‘Maybe’ has conflicting definitions in the module
     and its hsig file
     Main module: data Maybe a = Nothing | GHC.Base.Just a
     Hsig file:  data Maybe a b = Nothing
+    The types have different kinds