Update to tests due to change in syntax for role annotations.

4 files changed, 113 insertions, 56 deletions

diff --git a/testsuite/tests/rename/should_compile/Imp100Aux.hs-boot b/testsuite/tests/rename/should_compile/Imp100Aux.hs-boot
index b197c47805..7e1552fb9c 100644
--- a/testsuite/tests/rename/should_compile/Imp100Aux.hs-boot
+++ b/testsuite/tests/rename/should_compile/Imp100Aux.hs-boot
@@ -1,12 +1,23 @@
 {-# LANGUAGE RoleAnnotations #-}
 module Imp100Aux where
-data T1 a@P
-data T2 a@P b@P
-data T3 a@P b@P c@P
-data T4 a@P b@P c@P d@P
-data T5 a@P b@P c@P d@P e@P 
-data T6 a@P 
-data T7 a@P b@P 
-data T8 a@P b@P c@P 
-data T9 a@P b@P c@P d@P 
-data T10 a@P b@P c@P d@P e@P 
+data T1 a
+data T2 a b
+data T3 a b c
+data T4 a b c d
+data T5 a b c d e 
+data T6 a 
+data T7 a b 
+data T8 a b c 
+data T9 a b c d 
+data T10 a b c d e 
+
+type role T1 phantom
+type role T2 phantom phantom
+type role T3 phantom phantom phantom
+type role T4 phantom phantom phantom phantom
+type role T5 phantom phantom phantom phantom phantom
+type role T6 phantom
+type role T7 phantom phantom
+type role T8 phantom phantom phantom
+type role T9 phantom phantom phantom phantom
+type role T10 phantom phantom phantom phantom phantom
diff --git a/testsuite/tests/rename/should_compile/Imp10Aux.hs-boot b/testsuite/tests/rename/should_compile/Imp10Aux.hs-boot
index cfe980e2f0..f7993110a7 100644
--- a/testsuite/tests/rename/should_compile/Imp10Aux.hs-boot
+++ b/testsuite/tests/rename/should_compile/Imp10Aux.hs-boot
@@ -1,13 +1,24 @@
 {-# LANGUAGE RoleAnnotations #-}
 
 module Imp10Aux where
-data T1 a@P 
-data T2 a@P b@P 
-data T3 a@P b@P c@P 
-data T4 a@P b@P c@P d@P 
-data T5 a@P b@P c@P d@P e@P 
-data T6 a@P 
-data T7 a@P b@P
-data T8 a@P b@P c@P
-data T9 a@P b@P c@P d@P 
-data T10 a@P b@P c@P d@P e@P 
+data T1 a 
+data T2 a b 
+data T3 a b c 
+data T4 a b c d 
+data T5 a b c d e 
+data T6 a 
+data T7 a b
+data T8 a b c
+data T9 a b c d 
+data T10 a b c d e 
+
+type role T1 phantom
+type role T2 phantom phantom
+type role T3 phantom phantom phantom
+type role T4 phantom phantom phantom phantom
+type role T5 phantom phantom phantom phantom phantom
+type role T6 phantom
+type role T7 phantom phantom
+type role T8 phantom phantom phantom
+type role T9 phantom phantom phantom phantom
+type role T10 phantom phantom phantom phantom phantom
diff --git a/testsuite/tests/rename/should_compile/Imp500Aux.hs-boot b/testsuite/tests/rename/should_compile/Imp500Aux.hs-boot
index 9dc4ea2a74..2798ac0c75 100644
--- a/testsuite/tests/rename/should_compile/Imp500Aux.hs-boot
+++ b/testsuite/tests/rename/should_compile/Imp500Aux.hs-boot
@@ -1,12 +1,23 @@
 {-# LANGUAGE RoleAnnotations #-}
 module Imp500Aux where
-data T1 a@P
-data T2 a@P b@P
-data T3 a@P b@P c@P 
-data T4 a@P b@P c@P d@P 
-data T5 a@P b@P c@P d@P e@P 
-data T6 a@P 
-data T7 a@P b@P 
-data T8 a@P b@P c@P 
-data T9 a@P b@P c@P d@P 
-data T10 a@P b@P c@P d@P e@P 
+data T1 a
+data T2 a b
+data T3 a b c
+data T4 a b c d
+data T5 a b c d e 
+data T6 a 
+data T7 a b 
+data T8 a b c 
+data T9 a b c d 
+data T10 a b c d e 
+
+type role T1 phantom
+type role T2 phantom phantom
+type role T3 phantom phantom phantom
+type role T4 phantom phantom phantom phantom
+type role T5 phantom phantom phantom phantom phantom
+type role T6 phantom
+type role T7 phantom phantom
+type role T8 phantom phantom phantom
+type role T9 phantom phantom phantom phantom
+type role T10 phantom phantom phantom phantom phantom
diff --git a/testsuite/tests/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index 41a2bd095c..a995c5d2b9 100644
--- a/testsuite/tests/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
@@ -6,42 +6,51 @@ RnFail055.hs-boot:1:73: Warning:
     -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
 RnFail055.hs-boot:4:1:
-    Identifier ‛f1’ has conflicting definitions in the module and its hs-boot file
+    Identifier ‛f1’ has conflicting definitions in the module
+    and its hs-boot file
     Main module: f1 :: Int -> Float
     Boot file:   f1 :: Float -> Int
 
 RnFail055.hs-boot:6:6:
-    Type constructor ‛S1’ has conflicting definitions in the module and its hs-boot file
-    Main module: type S1 a@R b@R = (a, b)
-    Boot file:   type S1 a@R b@R c@R = (a, b)
+    Type constructor ‛S1’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: type S1 a b = (a, b)
+    Boot file:   type S1 a b c = (a, b)
 
 RnFail055.hs-boot:8:6:
-    Type constructor ‛S2’ has conflicting definitions in the module and its hs-boot file
-    Main module: type S2 a@P b@R = forall a1. (a1, b)
-    Boot file:   type S2 a@R b@R = forall b1. (a, b1)
+    Type constructor ‛S2’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: type S2 a b = forall a1. (a1, b)
+    Boot file:   type S2 a b = forall b1. (a, b1)
 
 RnFail055.hs-boot:12:6:
-    Type constructor ‛T1’ has conflicting definitions in the module and its hs-boot file
-    Main module: data T1 a@R b@R
+    Type constructor ‛T1’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: data T1 a b
                      No C type associated
+                     Roles: [representational, representational]
                      RecFlag Recursive, Promotable
                      = T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _
                      FamilyInstance: none
-    Boot file:   data T1 a@R b@R
+    Boot file:   data T1 a b
                      No C type associated
+                     Roles: [representational, representational]
                      RecFlag NonRecursive, Promotable
                      = T1 :: forall a b. [a] -> [b] -> T1 a b Stricts: _ _
                      FamilyInstance: none
 
 RnFail055.hs-boot:14:16:
-    Type constructor ‛T2’ has conflicting definitions in the module and its hs-boot file
-    Main module: data Eq b => T2 a@R b@P
+    Type constructor ‛T2’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: data Eq b => T2 a b
                      No C type associated
+                     Roles: [representational, phantom]
                      RecFlag Recursive, Promotable
                      = T2 :: forall a b. a -> T2 a b Stricts: _
                      FamilyInstance: none
-    Boot file:   data Eq a => T2 a@R b@R
+    Boot file:   data Eq a => T2 a b
                      No C type associated
+                     Roles: [representational, representational]
                      RecFlag NonRecursive, Promotable
                      = T2 :: forall a b. a -> T2 a b Stricts: _
                      FamilyInstance: none
@@ -53,20 +62,24 @@ RnFail055.hs-boot:17:12:
     T3' is exported by the hs-boot file, but not exported by the module
 
 RnFail055.hs-boot:21:6:
-    Type constructor ‛T5’ has conflicting definitions in the module and its hs-boot file
-    Main module: data T5 a@R
+    Type constructor ‛T5’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: data T5 a
                      No C type associated
+                     Roles: [representational]
                      RecFlag Recursive, Promotable
                      = T5 :: forall a. a -> T5 a Stricts: _ Fields: field5
                      FamilyInstance: none
-    Boot file:   data T5 a@R
+    Boot file:   data T5 a
                      No C type associated
+                     Roles: [representational]
                      RecFlag NonRecursive, Promotable
                      = T5 :: forall a. a -> T5 a Stricts: _
                      FamilyInstance: none
 
 RnFail055.hs-boot:23:6:
-    Type constructor ‛T6’ has conflicting definitions in the module and its hs-boot file
+    Type constructor ‛T6’ has conflicting definitions in the module
+    and its hs-boot file
     Main module: data T6
                      No C type associated
                      RecFlag Recursive, Not promotable
@@ -79,14 +92,17 @@ RnFail055.hs-boot:23:6:
                      FamilyInstance: none
 
 RnFail055.hs-boot:25:6:
-    Type constructor ‛T7’ has conflicting definitions in the module and its hs-boot file
-    Main module: data T7 a@P
+    Type constructor ‛T7’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: data T7 a
                      No C type associated
+                     Roles: [phantom]
                      RecFlag Recursive, Promotable
                      = T7 :: forall a a1. a1 -> T7 a Stricts: _
                      FamilyInstance: none
-    Boot file:   data T7 a@R
+    Boot file:   data T7 a
                      No C type associated
+                     Roles: [representational]
                      RecFlag NonRecursive, Promotable
                      = T7 :: forall a. a -> T7 a Stricts: _
                      FamilyInstance: none
@@ -95,15 +111,23 @@ RnFail055.hs-boot:27:22:
     RnFail055.m1 is exported by the hs-boot file, but not exported by the module
 
 RnFail055.hs-boot:28:7:
-    Class ‛C2’ has conflicting definitions in the module and its hs-boot file
-    Main module: class C2 a@R b@R
+    Class ‛C2’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: class C2 a b
+                     Roles: [representational, representational]
                      RecFlag Recursive
                      m2 :: a -> b m2' :: a -> b
-    Boot file:   class C2 a@R b@R
+    Boot file:   class C2 a b
+                     Roles: [representational, representational]
                      RecFlag NonRecursive
                      m2 :: a -> b
 
 RnFail055.hs-boot:29:24:
-    Class ‛C3’ has conflicting definitions in the module and its hs-boot file
-    Main module: class (Eq a, Ord a) => C3 a@R RecFlag Recursive
-    Boot file:   class (Ord a, Eq a) => C3 a@R RecFlag NonRecursive
+    Class ‛C3’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: class (Eq a, Ord a) => C3 a
+                     Roles: [representational]
+                     RecFlag Recursive
+    Boot file:   class (Ord a, Eq a) => C3 a
+                     Roles: [representational]
+                     RecFlag NonRecursive