Wibbles to output caused by change in checking role annotations

9 files changed, 11 insertions, 17 deletions

diff --git a/testsuite/tests/gadt/gadt11.stderr b/testsuite/tests/gadt/gadt11.stderr
index c2e63f0716..b753bd961c 100644
--- a/testsuite/tests/gadt/gadt11.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/T8368.stderr b/testsuite/tests/indexed-types/should_fail/T8368.stderr
index b767489247..2ff63d7bb4 100644
--- a/testsuite/tests/indexed-types/should_fail/T8368.stderr
+++ b/testsuite/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/testsuite/tests/roles/should_fail/Roles11.stderr b/testsuite/tests/roles/should_fail/Roles11.stderr
index ee15f99185..55ef3bdd5b 100644
--- a/testsuite/tests/roles/should_fail/Roles11.stderr
+++ b/testsuite/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/testsuite/tests/roles/should_fail/Roles5.stderr b/testsuite/tests/roles/should_fail/Roles5.stderr
index c4907c89f6..20172ff260 100644
--- a/testsuite/tests/roles/should_fail/Roles5.stderr
+++ b/testsuite/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/testsuite/tests/roles/should_fail/Roles6.stderr b/testsuite/tests/roles/should_fail/Roles6.stderr
index 3cca04d2a6..9f09ab3528 100644
--- a/testsuite/tests/roles/should_fail/Roles6.stderr
+++ b/testsuite/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/testsuite/tests/th/TH_Roles1.stderr b/testsuite/tests/th/TH_Roles1.stderr
index 47105b211d..f819da1eca 100644
--- a/testsuite/tests/th/TH_Roles1.stderr
+++ b/testsuite/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/testsuite/tests/typecheck/should_fail/T7175.stderr b/testsuite/tests/typecheck/should_fail/T7175.stderr
index f6adfff128..e65918c22b 100644
--- a/testsuite/tests/typecheck/should_fail/T7175.stderr
+++ b/testsuite/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/testsuite/tests/typecheck/should_fail/tcfail155.stderr b/testsuite/tests/typecheck/should_fail/tcfail155.stderr
index 15d6d69856..58426f4150 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail155.stderr
+++ b/testsuite/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/testsuite/tests/typecheck/should_fail/tcfail176.stderr b/testsuite/tests/typecheck/should_fail/tcfail176.stderr
index c19885a437..cb829b43af 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail176.stderr
+++ b/testsuite/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’