[commit: testsuite] master: Wibbles to deriving error messages (5525a25)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5525a252b9eeb90886826ee18e76812f86049ac8/testsuite

>---------------------------------------------------------------

commit 5525a252b9eeb90886826ee18e76812f86049ac8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 19 07:55:54 2013 +0000

    Wibbles to deriving error messages


>---------------------------------------------------------------

5525a252b9eeb90886826ee18e76812f86049ac8
 tests/deriving/should_fail/T2604.stderr  |    4 ++--
 tests/deriving/should_fail/T5863a.stderr |   10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/deriving/should_fail/T2604.stderr b/tests/deriving/should_fail/T2604.stderr
index d66ba49..0026288 100644
--- a/tests/deriving/should_fail/T2604.stderr
+++ b/tests/deriving/should_fail/T2604.stderr
@@ -1,10 +1,10 @@
 
 T2604.hs:7:35:
-    Can't make a derived instance of ‛Typeable (DList a)’:
+    Can't make a derived instance of ‛Typeable DList’:
       You need DeriveDataTypeable to derive an instance for this class
     In the data declaration for ‛DList’
 
 T2604.hs:9:38:
-    Can't make a derived instance of ‛Typeable (NList a)’:
+    Can't make a derived instance of ‛Typeable NList’:
       You need DeriveDataTypeable to derive an instance for this class
     In the newtype declaration for ‛NList’
diff --git a/tests/deriving/should_fail/T5863a.stderr b/tests/deriving/should_fail/T5863a.stderr
index 78a7cbf..434ed42 100644
--- a/tests/deriving/should_fail/T5863a.stderr
+++ b/tests/deriving/should_fail/T5863a.stderr
@@ -1,12 +1,10 @@
 
 T5863a.hs:9:31:
-    Can't make a derived instance of ‛Typeable (T Int)’:
-      Deriving Typeable is not allowed for family instances;
-      derive Typeable for ‛T’ alone
+    Cannot eta-reduce to an instance of form
+      instance (...) => Typeable T
     In the data instance declaration for ‛T’
 
 T5863a.hs:12:32:
-    Can't make a derived instance of ‛Typeable (T Bool)’:
-      Deriving Typeable is not allowed for family instances;
-      derive Typeable for ‛T’ alone
+    Cannot eta-reduce to an instance of form
+      instance (...) => Typeable T
     In the data instance declaration for ‛T’