summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorRichard Eisenberg <eir@cis.upenn.edu>2013-08-27 22:07:11 -0400
committerRichard Eisenberg <eir@cis.upenn.edu>2013-08-27 23:06:59 -0400
commite06abacd7b49ee5c675e4426535e921860c2bfbd (patch)
tree2f3d3b41a3d749faa4e392c5c9b093c0f130e2bd /testsuite
parentf9d1f65169c20889525596eab270bafa9fda6de9 (diff)
downloadhaskell-e06abacd7b49ee5c675e4426535e921860c2bfbd.tar.gz
Wibble to output from change in roles error messages
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/deriving/should_fail/Roles10.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/Roles11.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/Roles8.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/Roles9.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/T1496.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/T2721.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/T4846.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/T7148.stderr2
-rw-r--r--testsuite/tests/deriving/should_fail/T7148a.stderr2
-rw-r--r--testsuite/tests/gadt/CasePrune.stderr2
10 files changed, 10 insertions, 10 deletions
diff --git a/testsuite/tests/deriving/should_fail/Roles10.stderr b/testsuite/tests/deriving/should_fail/Roles10.stderr
index caf83fc478..756aaa2e00 100644
--- a/testsuite/tests/deriving/should_fail/Roles10.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/Roles11.stderr b/testsuite/tests/deriving/should_fail/Roles11.stderr
index 5a3ad69e53..2b68612999 100644
--- a/testsuite/tests/deriving/should_fail/Roles11.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/Roles8.stderr b/testsuite/tests/deriving/should_fail/Roles8.stderr
index a650a66a30..12aa9fbc78 100644
--- a/testsuite/tests/deriving/should_fail/Roles8.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/Roles9.stderr b/testsuite/tests/deriving/should_fail/Roles9.stderr
index 611c377935..43c3dc7da3 100644
--- a/testsuite/tests/deriving/should_fail/Roles9.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/T1496.stderr b/testsuite/tests/deriving/should_fail/T1496.stderr
index 32a67a6e46..cc4cdc2760 100644
--- a/testsuite/tests/deriving/should_fail/T1496.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/T2721.stderr b/testsuite/tests/deriving/should_fail/T2721.stderr
index 375c8a4247..710b933637 100644
--- a/testsuite/tests/deriving/should_fail/T2721.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/T4846.stderr b/testsuite/tests/deriving/should_fail/T4846.stderr
index 22556b0b6c..beb765375a 100644
--- a/testsuite/tests/deriving/should_fail/T4846.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/T7148.stderr b/testsuite/tests/deriving/should_fail/T7148.stderr
index dcee25ff5f..748ef08c68 100644
--- a/testsuite/tests/deriving/should_fail/T7148.stderr
+++ b/testsuite/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/testsuite/tests/deriving/should_fail/T7148a.stderr b/testsuite/tests/deriving/should_fail/T7148a.stderr
index f2a938c0a7..fa4a2dcb7b 100644
--- a/testsuite/tests/deriving/should_fail/T7148a.stderr
+++ b/testsuite/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/testsuite/tests/gadt/CasePrune.stderr b/testsuite/tests/gadt/CasePrune.stderr
index 8057e16653..d3dbc6ea3c 100644
--- a/testsuite/tests/gadt/CasePrune.stderr
+++ b/testsuite/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’