More wibbles

8 files changed, 43 insertions, 51 deletions

diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/all.T b/testsuite/tests/ghc-regress/deSugar/should_run/all.T
index 3b88cd9d11..ce31a4331b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/all.T
+++ b/testsuite/tests/ghc-regress/deSugar/should_run/all.T
@@ -17,7 +17,7 @@ test('dsrun011', skip_if_fast, compile_and_run, [''])
 test('dsrun012', skip_if_fast, compile_and_run, [''])
 test('dsrun013', normal, compile_and_run, [''])
 test('dsrun014', expect_broken_for(1257, ['ghci']), compile_and_run, [''])
-test('dsrun015', expect_broken(1491), compile_and_run, [''])
+test('dsrun015', normal, compile_and_run, [''])
 test('dsrun016', normal, compile_and_run, [''])
 test('dsrun017', normal, compile_and_run, [''])
 test('dsrun018', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs b/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs
index 97d90b8dba..da5e443605 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs
+++ b/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs
@@ -9,10 +9,10 @@ data T = C { x :: Int, y :: Int }
        | D { x :: Int, b :: Bool }
 
 select :: T -> Int
-select = Foo.x
+select = x
 
 f :: (T,T) -> Int
-f v = let (C {..}, d) = v in Foo.x d
+f v = let (C {..}, d) = v in Main.x d
 
 mkC a =
     let x = a + 1
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.stdout b/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.stdout
index e69de29bb2..b085e1acb0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.stdout
+++ b/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.stdout
@@ -0,0 +1,2 @@
+31
+(111,True)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr
index 8af0365ee4..04f06bbe48 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr
@@ -1,15 +1,8 @@
 
 T3621.hs:21:22:
-    Couldn't match expected type `state' against inferred type `s'
-      `state' is a rigid type variable bound by
-              the instance declaration at T3621.hs:21:33
+    Couldn't match type `s' with `state'
       `s' is a rigid type variable bound by
-          the instance declaration at T3621.hs:20:22
-    When using functional dependencies to combine
-      MonadState s (State s),
-        arising from the dependency `m -> s'
-        in the instance declaration at T3621.hs:18:10
-      MonadState state (State s),
-        arising from the instance declaration at T3621.hs:21:22-37
-    When checking the super-classes of an instance declaration
-    In the instance declaration for `MonadState state (WrappedState s)'
+          the instance declaration at T3621.hs:21:22
+      `state' is a rigid type variable bound by
+              the instance declaration at T3621.hs:21:22
+    When deriving the instance for (MonadState state (WrappedState s))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
index d6b4dcd918..52e0cfae1a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
+++ b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
@@ -1,31 +1,29 @@
-

-drvfail-functor2.hs:7:14:

-    Can't make a derived instance of `Functor InFunctionArgument':

-      Constructor `InFunctionArgument' uses the type variable in a function argument

-    In the newtype declaration for `InFunctionArgument'

-

-drvfail-functor2.hs:10:14:

-    Can't make a derived instance of `Functor OnSecondArg':

-      Constructor `OnSecondArg' uses the type variable in an argument other than the last

-    In the newtype declaration for `OnSecondArg'

-

-drvfail-functor2.hs:15:14:

-    Cannot derive well-kinded instance of form `Functor (NoArguments ...)'

-      Class `Functor' expects an argument of kind `* -> *'

-    In the newtype declaration for `NoArguments'

-

-drvfail-functor2.hs:20:14:

-    Can't derive instances where the instance context mentions

-    type variables that are not data type parameters

-      Offending constraint: Eq a

-    When deriving the instance for (Functor StupidConstraint)

-

-drvfail-functor2.hs:26:14:

-    No instance for (Functor NoFunctor)

-      arising from the 'deriving' clause of a data type declaration

-                   at drvfail-functor2.hs:26:14-20

-    Possible fix:

-      add an instance declaration for (Functor NoFunctor)

-      or use a standalone 'deriving instance' declaration instead,

-         so you can specify the instance context yourself

-    When deriving the instance for (Functor UseNoFunctor)

+
+drvfail-functor2.hs:7:14:
+    Can't make a derived instance of `Functor InFunctionArgument':
+      Constructor `InFunctionArgument' uses the type variable in a function argument
+    In the newtype declaration for `InFunctionArgument'
+
+drvfail-functor2.hs:10:14:
+    Can't make a derived instance of `Functor OnSecondArg':
+      Constructor `OnSecondArg' uses the type variable in an argument other than the last
+    In the newtype declaration for `OnSecondArg'
+
+drvfail-functor2.hs:15:14:
+    Cannot derive well-kinded instance of form `Functor (NoArguments ...)'
+      Class `Functor' expects an argument of kind `* -> *'
+    In the newtype declaration for `NoArguments'
+
+drvfail-functor2.hs:20:14:
+    Can't derive instances where the instance context mentions
+    type variables that are not data type parameters
+      Offending constraint: Eq a
+    When deriving the instance for (Functor StupidConstraint)
+
+drvfail-functor2.hs:26:14:
+    No instance for (Functor NoFunctor)
+      arising from the 'deriving' clause of a data type declaration
+    Possible fix: add an instance declaration for (Functor NoFunctor)
+    Alternatively, use a standalone 'deriving instance' declaration,
+      so you can specify the instance context yourself
+    When deriving the instance for (Functor UseNoFunctor)
diff --git a/testsuite/tests/ghc-regress/module/mod98.stderr b/testsuite/tests/ghc-regress/module/mod98.stderr
index 0a6a23d124..9f0f0c7c77 100644
--- a/testsuite/tests/ghc-regress/module/mod98.stderr
+++ b/testsuite/tests/ghc-regress/module/mod98.stderr
@@ -1,4 +1,3 @@
 
 mod98.hs:3:1:
-    Invalid type signature: M.x :: Char
-    Should be of form <variable> :: <type>
+    Invalid type signature: should be of form <variable> :: <type>
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3823.stderr b/testsuite/tests/ghc-regress/rename/should_compile/T3823.stderr
index 15232e3041..0eb8234554 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3823.stderr
+++ b/testsuite/tests/ghc-regress/rename/should_compile/T3823.stderr
@@ -1,6 +1,6 @@
 
 T3823B.hs:8:7:
-    Couldn't match expected type `A' against inferred type `Bool'
+    Couldn't match expected type `A' with actual type `Bool'
     In the first argument of `y', namely `a'
     In the expression: y a
-    In the definition of `b': b = y a
+    In an equation for `b': b = y a
diff --git a/testsuite/tests/ghc-regress/th/T3899.stderr b/testsuite/tests/ghc-regress/th/T3899.stderr
index f6674805ca..e0d643f42c 100644
--- a/testsuite/tests/ghc-regress/th/T3899.stderr
+++ b/testsuite/tests/ghc-regress/th/T3899.stderr
@@ -2,4 +2,4 @@ T3899.hs:6:7:
     T3899.hs:6:7-19: Splicing expression
         nestedTuple 3 ======> \ (Cons x (Cons x (Cons x Nil))) -> (x, x, x)
     In the expression: $(nestedTuple 3)
-    In the definition of `f': f = $(nestedTuple 3)
+    In an equation for `f': f = $(nestedTuple 3)