Adapt testsuite output to the new deriving error messages.

15 files changed, 44 insertions, 51 deletions

diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr
index 5fac49e2fc..a9181accc1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr
@@ -1,5 +1,5 @@
-

-T2701.hs:10:32:

-    Can't make a derived instance of `Data Foo':

-      Constructor `MkFoo' has arguments of unlifted type

-    In the data type declaration for `Foo'

+
+T2701.hs:10:32:
+    Can't make a derived instance of `Data Foo':
+      Constructor `MkFoo' must have only arguments of lifted type
+    In the data type declaration for `Foo'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr
index 03732f657d..8f008e8908 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr
@@ -1,14 +1,14 @@
 
 T4528.hs:9:1:
     Can't make a derived instance of `Enum (Foo a)':
-      `Foo' is not an enumeration type
+      `Foo' must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
     In the stand-alone deriving instance for `Enum (Foo a)'
 
 T4528.hs:10:1:
     Can't make a derived instance of `Bounded (Foo a)':
-      `Foo' is not an enumeration type
+      `Foo' must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
-        and
-      `Foo' does not have precisely one constructor
+        or
+      `Foo' must have precisely one constructor
     In the stand-alone deriving instance for `Bounded (Foo a)'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr
index 4eaf69c8b7..ecd20e8372 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr
@@ -19,20 +19,20 @@ drvfail-foldable-traversable1.hs:13:22:
 
 drvfail-foldable-traversable1.hs:17:22:
     Can't make a derived instance of `Foldable Infinite':
-      Constructor `Infinite' contains function types
+      Constructor `Infinite' must not contain function types
     In the data type declaration for `Infinite'
 
 drvfail-foldable-traversable1.hs:17:31:
     Can't make a derived instance of `Traversable Infinite':
-      Constructor `Infinite' contains function types
+      Constructor `Infinite' must not contain function types
     In the data type declaration for `Infinite'
 
 drvfail-foldable-traversable1.hs:21:22:
     Can't make a derived instance of `Foldable (Cont r)':
-      Constructor `Cont' contains function types
+      Constructor `Cont' must not contain function types
     In the data type declaration for `Cont'
 
 drvfail-foldable-traversable1.hs:21:31:
     Can't make a derived instance of `Traversable (Cont r)':
-      Constructor `Cont' contains function types
+      Constructor `Cont' must not contain function types
     In the data type declaration for `Cont'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
index 64ff9d0bef..c4bd6e680a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
@@ -1,12 +1,12 @@
 
 drvfail-functor2.hs:7:14:
     Can't make a derived instance of `Functor InFunctionArgument':
-      Constructor `InFunctionArgument' uses the type variable in a function argument
+      Constructor `InFunctionArgument' must not use the type variable in a function argument
     In the newtype declaration for `InFunctionArgument'
 
 drvfail-functor2.hs:10:14:
     Can't make a derived instance of `Functor OnSecondArg':
-      Constructor `OnSecondArg' uses the type variable in an argument other than the last
+      Constructor `OnSecondArg' must not use the type variable in an argument other than the last
     In the newtype declaration for `OnSecondArg'
 
 drvfail-functor2.hs:15:14:
@@ -16,7 +16,7 @@ drvfail-functor2.hs:15:14:
 
 drvfail-functor2.hs:20:14:
     Can't make a derived instance of `Functor StupidConstraint':
-      Data type `StupidConstraint' has a class context (Eq a)
+      Data type `StupidConstraint' must not have a class context (Eq a)
     In the data type declaration for `StupidConstraint'
 
 drvfail-functor2.hs:26:14:
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr
index 725c42f6bd..a61fb4892f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr
@@ -1,11 +1,11 @@
-

-drvfail010.hs:6:42:

-    Can't make a derived instance of

-      `Typeable (A a b c d e f g h i j)':

-      `A' has too many arguments

-    In the data type declaration for `A'

-

-drvfail010.hs:9:32:

-    Can't make a derived instance of `Typeable (B a b)':

-      `B' has arguments of kind other than `*'

-    In the data type declaration for `B'

+
+drvfail010.hs:6:42:
+    Can't make a derived instance of
+      `Typeable (A a b c d e f g h i j)':
+      `A' must have 7 or fewer arguments
+    In the data type declaration for `A'
+
+drvfail010.hs:9:32:
+    Can't make a derived instance of `Typeable (B a b)':
+      `B' must only have arguments of kind `*'
+    In the data type declaration for `B'
diff --git a/testsuite/tests/ghc-regress/driver/T4437.hs b/testsuite/tests/ghc-regress/driver/T4437.hs
index 821111dd74..a348e47c2a 100644
--- a/testsuite/tests/ghc-regress/driver/T4437.hs
+++ b/testsuite/tests/ghc-regress/driver/T4437.hs
@@ -14,7 +14,7 @@ main = do let ghcExtensions = [ ext | (ext, _, _) <- xFlags ]
               expectedGhcOnlyExtensions
                   = ["ParallelArrays",
                      "RelaxedLayout",
-                     "DeriveRepresentable",
+                     "DeriveGeneric",
                      "DefaultSignatures",
                      "AlternativeLayoutRule",
                      "AlternativeLayoutRuleTransitional",
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr b/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
index b1f111354a..b5d2f01381 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
@@ -1,5 +1,5 @@
 
 GenCannotDoRep0.hs:9:45:
     Can't make a derived instance of `Generic Dynamic':
-      Dynamic is not a vanilla data constructor
+      Dynamic must be a vanilla data constructor
     In the data type declaration for `Dynamic'
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr b/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
index 6927a0feff..1bbf3fbe8b 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
@@ -1,5 +1,5 @@
 
 GenCannotDoRep1.hs:8:49:
     Can't make a derived instance of `Generic (Context a)':
-      Context has a datatype context
+      Context must not have a datatype context
     In the data type declaration for `Context'
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr b/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
index 7c4adf4bac..35caf2c3b4 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
@@ -1,5 +1,5 @@
 
 GenCannotDoRep2.hs:13:1:
     Can't make a derived instance of `Generic (Term a)':
-      Int is not a vanilla data constructor
+      Int must be a vanilla data constructor
     In the stand-alone deriving instance for `Generic (Term a)'
diff --git a/testsuite/tests/ghc-regress/module/mod55.stderr b/testsuite/tests/ghc-regress/module/mod55.stderr
index 77f7d74088..7787ea3b2f 100644
--- a/testsuite/tests/ghc-regress/module/mod55.stderr
+++ b/testsuite/tests/ghc-regress/module/mod55.stderr
@@ -1,6 +1,6 @@
 
 mod55.hs:3:26:
     Can't make a derived instance of `Enum T':
-      `T' is not an enumeration type
+      `T' must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
     In the data type declaration for `T'
diff --git a/testsuite/tests/ghc-regress/module/mod56.stderr b/testsuite/tests/ghc-regress/module/mod56.stderr
index 46315be0ce..3dca4e2e10 100644
--- a/testsuite/tests/ghc-regress/module/mod56.stderr
+++ b/testsuite/tests/ghc-regress/module/mod56.stderr
@@ -1,8 +1,8 @@
 
 mod56.hs:4:39:
     Can't make a derived instance of `Ix T':
-      `T' is not an enumeration type
+      `T' must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
-        and
-      `T' does not have precisely one constructor
+        or
+      `T' must have precisely one constructor
     In the data type declaration for `T'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
index 3573e81652..9388c16878 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
@@ -301,10 +301,6 @@ test('T2799', normal, compile, [''])
 test('T3219', normal, compile, [''])
 test('T3342', normal, compile, [''])
 test('T3346', normal, compile, [''])
-# This is a TH test, which would require extra magic to make it work with
-# profiling (see th/all.T).
-test('T3391', [omit_ways(['profasm']), if_compiler_profiled(skip)],
-              compile, [''])
 test('T3409', normal, compile, [''])
 test('T3955', normal, compile, [''])
 test('PolyRec', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr
index 8836fcfe9b..4b221839ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr
@@ -1,6 +1,6 @@
-

-tcfail086.hs:6:38:

-    Can't make a derived instance of `Eq Ex':

-      Constructor `Ex' does not have a Haskell-98 type

-      Possible fix: use a standalone deriving declaration instead

-    In the data type declaration for `Ex'

+
+tcfail086.hs:6:38:
+    Can't make a derived instance of `Eq Ex':
+      Constructor `Ex' must have a Haskell-98 type
+      Possible fix: use a standalone deriving declaration instead
+    In the data type declaration for `Ex'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr
index 3ae693e16a..8cd67b632b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr
@@ -1,5 +1,2 @@
 
-tcfail094.hs:7:10:
-    `Int' is applied to too many type arguments
-    In the type `Int 1'
-    In the type synonym declaration for `A'
+tcfail094.hs:7:14: parse error on input `1'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr
index 7b28d815ad..2bc3d7fd63 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr
@@ -1,13 +1,13 @@
 
 tcfail117.hs:5:32:
     Can't make a derived instance of `Enum N1':
-      `N1' is not an enumeration type
+      `N1' must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
       Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the newtype declaration for `N1'
 
 tcfail117.hs:6:32:
     Can't make a derived instance of `Enum N2':
-      `N2' is not an enumeration type
+      `N2' must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
     In the data type declaration for `N2'