[commit: testsuite] master: Wibble to output from change in roles error messages (f88ca20)

[git at git.haskell.org]

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

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

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

commit f88ca205f3d7759368057a66d63ec3ae7cd579ee
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Aug 27 22:07:11 2013 -0400

    Wibble to output from change in roles error messages


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

f88ca205f3d7759368057a66d63ec3ae7cd579ee
 tests/deriving/should_fail/Roles10.stderr |    2 +-
 tests/deriving/should_fail/Roles11.stderr |    2 +-
 tests/deriving/should_fail/Roles8.stderr  |    2 +-
 tests/deriving/should_fail/Roles9.stderr  |    2 +-
 tests/deriving/should_fail/T1496.stderr   |    2 +-
 tests/deriving/should_fail/T2721.stderr   |    2 +-
 tests/deriving/should_fail/T4846.stderr   |    2 +-
 tests/deriving/should_fail/T7148.stderr   |    2 +-
 tests/deriving/should_fail/T7148a.stderr  |    2 +-
 tests/gadt/CasePrune.stderr               |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/deriving/should_fail/Roles10.stderr b/tests/deriving/should_fail/Roles10.stderr
index caf83fc..756aaa2 100644
--- a/tests/deriving/should_fail/Roles10.stderr
+++ b/tests/deriving/should_fail/Roles10.stderr
@@ -3,5 +3,5 @@ Roles10.hs:16:12:
     Can't make a derived instance of ‛C Age’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛C’ is at role N
+      the last parameter of ‛C’ is at role Nominal
     In the newtype declaration for ‛Age’
diff --git a/tests/deriving/should_fail/Roles11.stderr b/tests/deriving/should_fail/Roles11.stderr
index 5a3ad69..2b68612 100644
--- a/tests/deriving/should_fail/Roles11.stderr
+++ b/tests/deriving/should_fail/Roles11.stderr
@@ -1,5 +1,5 @@
 
 Roles11.hs:5:1:
     Role mismatch on variable a:
-      Annotation says R but role N is required
+      Annotation says Representational but role Nominal is required
     In the data declaration for ‛T2’
diff --git a/tests/deriving/should_fail/Roles8.stderr b/tests/deriving/should_fail/Roles8.stderr
index a650a66..12aa9fb 100644
--- a/tests/deriving/should_fail/Roles8.stderr
+++ b/tests/deriving/should_fail/Roles8.stderr
@@ -1,5 +1,5 @@
 
 Roles8.hs:5:1:
     Role mismatch on variable a:
-      Annotation says P but role R is required
+      Annotation says Phantom but role Representational is required
     In the data declaration for ‛T1’
diff --git a/tests/deriving/should_fail/Roles9.stderr b/tests/deriving/should_fail/Roles9.stderr
index 611c377..43c3dc7 100644
--- a/tests/deriving/should_fail/Roles9.stderr
+++ b/tests/deriving/should_fail/Roles9.stderr
@@ -3,5 +3,5 @@ Roles9.hs:12:12:
     Can't make a derived instance of ‛C Age’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛C’ is at role N
+      the last parameter of ‛C’ is at role Nominal
     In the newtype declaration for ‛Age’
diff --git a/tests/deriving/should_fail/T1496.stderr b/tests/deriving/should_fail/T1496.stderr
index 32a67a6..cc4cdc2 100644
--- a/tests/deriving/should_fail/T1496.stderr
+++ b/tests/deriving/should_fail/T1496.stderr
@@ -3,5 +3,5 @@ T1496.hs:10:32:
     Can't make a derived instance of ‛IsInt Moo’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛IsInt’ is at role N
+      the last parameter of ‛IsInt’ is at role Nominal
     In the newtype declaration for ‛Moo’
diff --git a/tests/deriving/should_fail/T2721.stderr b/tests/deriving/should_fail/T2721.stderr
index 375c8a4..710b933 100644
--- a/tests/deriving/should_fail/T2721.stderr
+++ b/tests/deriving/should_fail/T2721.stderr
@@ -4,5 +4,5 @@ T2721.hs:15:28:
       (even with cunning newtype deriving):
       the class has associated types
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛C’ is at role N
+      the last parameter of ‛C’ is at role Nominal
     In the newtype declaration for ‛N’
diff --git a/tests/deriving/should_fail/T4846.stderr b/tests/deriving/should_fail/T4846.stderr
index 22556b0..beb7653 100644
--- a/tests/deriving/should_fail/T4846.stderr
+++ b/tests/deriving/should_fail/T4846.stderr
@@ -3,5 +3,5 @@ T4846.hs:29:1:
     Can't make a derived instance of ‛B BOOL’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛B’ is at role N
+      the last parameter of ‛B’ is at role Nominal
     In the stand-alone deriving instance for ‛B BOOL’
diff --git a/tests/deriving/should_fail/T7148.stderr b/tests/deriving/should_fail/T7148.stderr
index dcee25f..748ef08 100644
--- a/tests/deriving/should_fail/T7148.stderr
+++ b/tests/deriving/should_fail/T7148.stderr
@@ -3,5 +3,5 @@ T7148.hs:27:40:
     Can't make a derived instance of ‛IsoUnit (Tagged a b)’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛IsoUnit’ is at role N
+      the last parameter of ‛IsoUnit’ is at role Nominal
     In the newtype declaration for ‛Tagged’
diff --git a/tests/deriving/should_fail/T7148a.stderr b/tests/deriving/should_fail/T7148a.stderr
index f2a938c..fa4a2dc 100644
--- a/tests/deriving/should_fail/T7148a.stderr
+++ b/tests/deriving/should_fail/T7148a.stderr
@@ -3,5 +3,5 @@ T7148a.hs:19:50:
     Can't make a derived instance of ‛Convert (IS_NO_LONGER a)’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛Convert’ is at role N
+      the last parameter of ‛Convert’ is at role Nominal
     In the newtype declaration for ‛IS_NO_LONGER’
diff --git a/tests/gadt/CasePrune.stderr b/tests/gadt/CasePrune.stderr
index 8057e16..d3dbc6e 100644
--- a/tests/gadt/CasePrune.stderr
+++ b/tests/gadt/CasePrune.stderr
@@ -3,5 +3,5 @@ CasePrune.hs:14:31:
     Can't make a derived instance of ‛C A’
       (even with cunning newtype deriving):
       it is not type-safe to use GeneralizedNewtypeDeriving on this class;
-      the last parameter of ‛C’ is at role N
+      the last parameter of ‛C’ is at role Nominal
     In the newtype declaration for ‛A’