accept output

testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr

@@ -3,10 +3,10 @@ drvfail001.hs:15:5:
     No instance for (Show (f (f a)))
       arising from the 'deriving' clause of a data type declaration at drvfail001.hs:15:5
     Possible fix: add an instance declaration for (Show (f (f a)))
-    When deriving the `Show' instance for type `SM'
+    When deriving the instance for `Show (SM f a)'
 
 drvfail001.hs:21:5:
     No instance for (Show (f a))
       arising from the 'deriving' clause of a data type declaration at drvfail001.hs:21:5
     Possible fix: add an instance declaration for (Show (f a))
-    When deriving the `Show' instance for type `Cons'
+    When deriving the instance for `Show (Cons f a)'

testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr

@@ -9,4 +9,4 @@ drvfail002.hs:18:5:
     Can't derive instances where the instance context mentions
     type variables that are not data type parameters
       Offending constraint: X T c
-    When deriving the `Show' instance for type `S'
+    When deriving the instance for `Show S'

testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr

@@ -3,5 +3,5 @@ drvfail003.hs:13:5:
     Variable occurs more often in a constraint than in the instance head
       in the constraint: Show (v (v a))
     (Use -fallow-undecidable-instances to permit this)
-    In the derived instance
+    In the derived instance declaration
       instance (Show (v (v a))) => Show (Square_ v w a)

testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr

@@ -3,4 +3,4 @@ drvfail006.hs:9:8:
     Can't make a derived instance of `MonadState T'
     (even with cunning newtype deriving:
      `MonadState' does not have arity 1)
-    When deriving instances for type `T'
+    When deriving instances for `T'

testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr

@@ -3,4 +3,4 @@ drvfail007.hs:4:5:
     No instance for (Eq (Int -> Int))
       arising from the 'deriving' clause of a data type declaration at drvfail007.hs:4:5
     Possible fix: add an instance declaration for (Eq (Int -> Int))
-    When deriving the `Eq' instance for type `Foo'
+    When deriving the instance for `Eq Foo'

testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr

@@ -3,4 +3,4 @@ drvfail008.hs:10:8:
     Can't make a derived instance of `Monad M'
     (`Monad' is not a derivable class
      Try -fglasgow-exts for GHC's newtype-deriving extension)
-    When deriving instances for type `M'
+    When deriving instances for `M'

testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr

@@ -3,22 +3,22 @@ drvfail009.hs:10:8:
     Can't make a derived instance of `C T1'
     (even with cunning newtype deriving:
      `C' does not have arity 1)
-    When deriving instances for type `T1'
+    When deriving instances for `T1'
 
 drvfail009.hs:13:8:
     Can't make a derived instance of `Monad T2'
     (even with cunning newtype deriving:
      the type constructor has wrong kind)
-    When deriving instances for type `T2'
+    When deriving instances for `T2'
 
 drvfail009.hs:16:8:
     Can't make a derived instance of `Monad T3'
     (even with cunning newtype deriving:
      the representation type has wrong kind)
-    When deriving instances for type `T3'
+    When deriving instances for `T3'
 
 drvfail009.hs:19:8:
     Can't make a derived instance of `Monad T4'
     (even with cunning newtype deriving:
      the eta-reduction property does not hold)
-    When deriving instances for type `T4'
+    When deriving instances for `T4'

testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr

@@ -2,9 +2,9 @@
 drvfail010.hs:6:5:
     Can't make a derived instance of `Typeable (A a b c d e f g h i j)'
     (`A' has too many arguments)
-    When deriving instances for type `A'
+    When deriving instances for `A'
 
 drvfail010.hs:9:5:
     Can't make a derived instance of `Typeable (B a b)'
     (`B' has arguments of kind other than `*')
-    When deriving instances for type `B'
+    When deriving instances for `B'

testsuite/tests/ghc-regress/module/mod56.stderr

@@ -4,4 +4,4 @@ mod56.hs:4:5:
     (`T' has non-nullary constructors
        and
      `T' has more than one constructor)
-    When deriving instances for type `T'
+    When deriving instances for `T'

testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr

 
 rnfail029.hs:2:20:
     Conflicting exports for `map':
-      `List.map' exports `GHC.Base.map' imported from List at rnfail029.hs:3:0-20
-      `module ShouldFail' exports `ShouldFail.map' defined at rnfail029.hs:4:0
+      `List.map' exports `map' imported from List at rnfail029.hs:3:0-20
+      `module ShouldFail' exports `map' defined at rnfail029.hs:4:0

testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr

 
 rnfail040.hs:7:11:
     Conflicting exports for `nub':
-      `module M' exports `Data.List.nub' imported from List at rnfail040.hs:10:1-16
-      `module M' exports `Rnfail040_A.nub' imported from Rnfail040_A at rnfail040.hs:11:1-23
-					     (defined at ./Rnfail040_A.hs:2:2)
+      `module M' exports `nub' imported from List at rnfail040.hs:10:1-16
+      `module M' exports `nub' imported from Rnfail040_A at rnfail040.hs:11:1-23
+				 (defined at Rnfail040_A.hs:2:2)

testsuite/tests/ghc-regress/rename/should_fail/rnfail043.stderr

@@ -3,5 +3,5 @@ rnfail043.hs:10:0:
     Multiple declarations of `f'
     Declared at: rnfail043.hs:6:0
 		 rnfail043.hs:10:0
-Loading package base-1.0 ... linking ... done.
-Loading package template-haskell-1.0 ... linking ... done.
+Loading package base ... linking ... done.
+Loading package template-haskell ... linking ... done.

testsuite/tests/ghc-regress/th/TH_spliceD1.stderr

 
-TH_spliceD1.hs:7:2:
+TH_spliceD1.hs:10:2:
     Conflicting definitions for `c'
     In the definition of `f'

testsuite/tests/ghc-regress/typecheck/should_compile/tc056.stderr

+
+tc056.hs:16:0:
+    Warning: Duplicate constraint(s): Eq' a
+	     In the context: (Eq' a, Eq' a)
+	     While checking the context of an instance declaration
+	     In the instance declaration for `Eq' [a]'

testsuite/tests/ghc-regress/typecheck/should_compile/tc168.stderr

 TYPE SIGNATURES
 Tycons with generics:
 Dependent modules: []
-Dependent packages: [base-1.0]
+Dependent packages: [base]
 TYPE SIGNATURES
-    f :: forall t t1 t2. (C t (t1, t2)) => t -> t1
+    f :: forall a a1 b. (C a (a1, b)) => a -> a1
 Tycons with generics:
 Dependent modules: []
-Dependent packages: [base-1.0]
+Dependent packages: [base]