[commit: testsuite] master: Wibbles to output caused by change in checking role annotations (6741cfd)

[git at git.haskell.org]

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

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

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

commit 6741cfd2829b5baebe5e3bd8919f0d52bd01553d
Author: Richard Eisenberg <eir at seas.upenn.edu>
Date:   Mon Dec 2 13:12:36 2013 -0500

    Wibbles to output caused by change in checking role annotations


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

6741cfd2829b5baebe5e3bd8919f0d52bd01553d
 tests/gadt/gadt11.stderr                     |    2 +-
 tests/indexed-types/should_fail/T8368.stderr |    2 +-
 tests/roles/should_fail/Roles11.stderr       |    4 ++--
 tests/roles/should_fail/Roles5.stderr        |    2 ++
 tests/roles/should_fail/Roles6.stderr        |   11 +----------
 tests/th/TH_Roles1.stderr                    |    1 +
 tests/typecheck/should_fail/T7175.stderr     |    2 +-
 tests/typecheck/should_fail/tcfail155.stderr |    2 +-
 tests/typecheck/should_fail/tcfail176.stderr |    2 +-
 9 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/tests/gadt/gadt11.stderr b/tests/gadt/gadt11.stderr
index c2e63f0..b753bd9 100644
--- a/tests/gadt/gadt11.stderr
+++ b/tests/gadt/gadt11.stderr
@@ -1,6 +1,6 @@
 
 gadt11.hs:12:3:
     Data constructor ‛L2’ returns type ‛T1 Bool’
-      instead of an instance of its parent type ‛T2’
+      instead of an instance of its parent type ‛T2 a’
     In the definition of data constructor ‛L2’
     In the data declaration for ‛T2’
diff --git a/tests/indexed-types/should_fail/T8368.stderr b/tests/indexed-types/should_fail/T8368.stderr
index b767489..2ff63d7 100644
--- a/tests/indexed-types/should_fail/T8368.stderr
+++ b/tests/indexed-types/should_fail/T8368.stderr
@@ -1,6 +1,6 @@
 
 T8368.hs:9:3:
     Data constructor ‛MkFam’ returns type ‛Foo’
-      instead of an instance of its parent type ‛Fam’
+      instead of an instance of its parent type ‛Fam a’
     In the definition of data constructor ‛MkFam’
     In the data instance declaration for ‛Fam’
diff --git a/tests/roles/should_fail/Roles11.stderr b/tests/roles/should_fail/Roles11.stderr
index ee15f99..55ef3bd 100644
--- a/tests/roles/should_fail/Roles11.stderr
+++ b/tests/roles/should_fail/Roles11.stderr
@@ -1,5 +1,5 @@
 
-Roles11.hs:6:1:
+Roles11.hs:5:1:
     Role mismatch on variable a:
       Annotation says representational but role nominal is required
-    In the data declaration for ‛T2’
+    while checking a role annotation for ‛T2’
diff --git a/tests/roles/should_fail/Roles5.stderr b/tests/roles/should_fail/Roles5.stderr
index c4907c8..20172ff 100644
--- a/tests/roles/should_fail/Roles5.stderr
+++ b/tests/roles/should_fail/Roles5.stderr
@@ -2,10 +2,12 @@
 Roles5.hs:7:1:
     Illegal role annotation for T;
     did you intend to use RoleAnnotations?
+    while checking a role annotation for ‛T’
 
 Roles5.hs:8:1:
     Illegal role annotation for C;
     did you intend to use RoleAnnotations?
+    while checking a role annotation for ‛C’
 
 Roles5.hs:9:1:
     Illegal role annotation for S;
diff --git a/tests/roles/should_fail/Roles6.stderr b/tests/roles/should_fail/Roles6.stderr
index 3cca04d..9f09ab3 100644
--- a/tests/roles/should_fail/Roles6.stderr
+++ b/tests/roles/should_fail/Roles6.stderr
@@ -1,15 +1,6 @@
 
-Roles6.hs:5:1:
-    Role mismatch on variable a:
-      Annotation says nominal but role representational is required
-    In the data declaration for ‛Foo’
-
-Roles6.hs:5:1:
-    Role mismatch on variable b:
-      Annotation says representational but role nominal is required
-    In the data declaration for ‛Foo’
-
 Roles6.hs:7:1:
     Wrong number of roles listed in role annotation;
     Expected 2, got 3:
       type role Foo nominal representational phantom
+    while checking a role annotation for ‛Foo’
diff --git a/tests/th/TH_Roles1.stderr b/tests/th/TH_Roles1.stderr
index 47105b2..f819da1 100644
--- a/tests/th/TH_Roles1.stderr
+++ b/tests/th/TH_Roles1.stderr
@@ -2,3 +2,4 @@
 TH_Roles1.hs:7:4:
     Illegal role annotation for T;
     did you intend to use RoleAnnotations?
+    while checking a role annotation for ‛T’
diff --git a/tests/typecheck/should_fail/T7175.stderr b/tests/typecheck/should_fail/T7175.stderr
index f6adfff..e65918c 100644
--- a/tests/typecheck/should_fail/T7175.stderr
+++ b/tests/typecheck/should_fail/T7175.stderr
@@ -1,6 +1,6 @@
 
 T7175.hs:8:4:
     Data constructor ‛G1C’ returns type ‛F Int’
-      instead of an instance of its parent type ‛G1’
+      instead of an instance of its parent type ‛G1 a’
     In the definition of data constructor ‛G1C’
     In the data declaration for ‛G1’
diff --git a/tests/typecheck/should_fail/tcfail155.stderr b/tests/typecheck/should_fail/tcfail155.stderr
index 15d6d69..58426f4 100644
--- a/tests/typecheck/should_fail/tcfail155.stderr
+++ b/tests/typecheck/should_fail/tcfail155.stderr
@@ -1,6 +1,6 @@
 
 tcfail155.hs:8:6:
     Data constructor ‛P’ returns type ‛L2’
-      instead of an instance of its parent type ‛T’
+      instead of an instance of its parent type ‛T a’
     In the definition of data constructor ‛P’
     In the data declaration for ‛T’
diff --git a/tests/typecheck/should_fail/tcfail176.stderr b/tests/typecheck/should_fail/tcfail176.stderr
index c19885a..cb829b4 100644
--- a/tests/typecheck/should_fail/tcfail176.stderr
+++ b/tests/typecheck/should_fail/tcfail176.stderr
@@ -1,6 +1,6 @@
 
 tcfail176.hs:7:21:
     Data constructor ‛Bug’ returns type ‛Maybe a’
-      instead of an instance of its parent type ‛Bug’
+      instead of an instance of its parent type ‛Bug a’
     In the definition of data constructor ‛Bug’
     In the newtype declaration for ‛Bug’