accept output for now

1 files changed, 109 insertions, 109 deletions

diff --git a/testsuite/tests/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index 44c4365156..45e09659fc 100644
--- a/testsuite/tests/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
@@ -1,109 +1,109 @@
-

-RnFail055.hs:1:73: Warning:

-    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

-

-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

-    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 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 b = forall a. (a, b)

-    Boot file:   type S2 a b = forall b. (a, b)

-

-RnFail055.hs-boot:12:6:

-    Type constructor `T1' has conflicting definitions in the module and its hs-boot file

-    Main module: data T1 a b

-                     No C type associated

-                     RecFlag Recursive

-                     = T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _

-                     FamilyInstance: none

-    Boot file:   data T1 a b

-                     No C type associated

-                     RecFlag NonRecursive

-                     = 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 b

-                     No C type associated

-                     RecFlag Recursive

-                     = T2 :: forall a b. a -> T2 a b Stricts: _

-                     FamilyInstance: none

-    Boot file:   data Eq a => T2 a b

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T2 :: forall a b. a -> T2 a b Stricts: _

-                     FamilyInstance: none

-

-RnFail055.hs-boot:16:11:

-    T3 is exported by the hs-boot file, but not exported by the module

-

-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

-                     No C type associated

-                     RecFlag Recursive

-                     = T5 :: forall a. a -> T5 a Stricts: _ Fields: field5

-                     FamilyInstance: none

-    Boot file:   data T5 a

-                     No C type associated

-                     RecFlag NonRecursive

-                     = 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

-    Main module: data T6

-                     No C type associated

-                     RecFlag Recursive

-                     = T6 :: Int -> T6 Stricts: _

-                     FamilyInstance: none

-    Boot file:   data T6

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T6 :: Int -> T6 HasWrapper Stricts: !

-                     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

-                     No C type associated

-                     RecFlag Recursive

-                     = T7 :: forall a a1. a1 -> T7 a Stricts: _

-                     FamilyInstance: none

-    Boot file:   data T7 a

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T7 :: forall a b. a -> T7 a Stricts: _

-                     FamilyInstance: none

-

-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 b

-                     RecFlag Recursive

-                     m2 :: a -> b m2' :: a -> b

-    Boot file:   class C2 a b

-                     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 RecFlag Recursive

-    Boot file:   class (Ord a, Eq a) => C3 a RecFlag NonRecursive

+
+RnFail055.hs:1:73: Warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+
+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
+    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 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 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 b
+                     No C type associated
+                     RecFlag Recursive
+                     = T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _
+                     FamilyInstance: none
+    Boot file:   data T1 a b
+                     No C type associated
+                     RecFlag NonRecursive
+                     = 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 b
+                     No C type associated
+                     RecFlag Recursive
+                     = T2 :: forall a b. a -> T2 a b Stricts: _
+                     FamilyInstance: none
+    Boot file:   data Eq a => T2 a b
+                     No C type associated
+                     RecFlag NonRecursive
+                     = T2 :: forall a b. a -> T2 a b Stricts: _
+                     FamilyInstance: none
+
+RnFail055.hs-boot:16:11:
+    T3 is exported by the hs-boot file, but not exported by the module
+
+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
+                     No C type associated
+                     RecFlag Recursive
+                     = T5 :: forall a. a -> T5 a Stricts: _ Fields: field5
+                     FamilyInstance: none
+    Boot file:   data T5 a
+                     No C type associated
+                     RecFlag NonRecursive
+                     = 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
+    Main module: data T6
+                     No C type associated
+                     RecFlag Recursive
+                     = T6 :: Int -> T6 Stricts: _
+                     FamilyInstance: none
+    Boot file:   data T6
+                     No C type associated
+                     RecFlag NonRecursive
+                     = T6 :: Int -> T6 HasWrapper Stricts: !
+                     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
+                     No C type associated
+                     RecFlag Recursive
+                     = T7 :: forall a a1. a1 -> T7 a Stricts: _
+                     FamilyInstance: none
+    Boot file:   data T7 a
+                     No C type associated
+                     RecFlag NonRecursive
+                     = T7 :: forall a b. a -> T7 a Stricts: _
+                     FamilyInstance: none
+
+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 b
+                     RecFlag Recursive
+                     m2 :: a -> b m2' :: a -> b
+    Boot file:   class C2 a b
+                     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 RecFlag Recursive
+    Boot file:   class (Ord a, Eq a) => C3 a RecFlag NonRecursive