[commit: ghc] ghc-7.10: Fix more merge-o's from earlier cherry-picks (d260ce3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/d260ce3e4ff483705bfc9725a137161b8bd99d92/ghc

>---------------------------------------------------------------

commit d260ce3e4ff483705bfc9725a137161b8bd99d92
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon May 11 17:29:03 2015 -0500

    Fix more merge-o's from earlier cherry-picks
    
    Some error message wibbles that are to be expected.
    
    (The 'error:' prefix thing is getting slightly annoying now, but should
    be fixable by cherry picking the needed testsuite driver patch...)
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

d260ce3e4ff483705bfc9725a137161b8bd99d92
 testsuite/tests/typecheck/should_fail/T9858a.stderr                 | 6 ++++--
 testsuite/tests/typecheck/should_fail/T9858b.stderr                 | 4 ++--
 testsuite/tests/typecheck/should_fail/T9858c.stderr                 | 2 +-
 testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/testsuite/tests/typecheck/should_fail/T9858a.stderr b/testsuite/tests/typecheck/should_fail/T9858a.stderr
index 72b72e9..eb3cc22 100644
--- a/testsuite/tests/typecheck/should_fail/T9858a.stderr
+++ b/testsuite/tests/typecheck/should_fail/T9858a.stderr
@@ -1,6 +1,8 @@
 
-T9858a.hs:28:18: error:
-    No instance for (Typeable (() :: Constraint))
+T9858a.hs:28:18:
+    No instance for (Typeable
+                       (((() :: GHC.Prim.Constraint), (() :: GHC.Prim.Constraint)) => ()))
+      (maybe you haven't applied enough arguments to a function?)
       arising from a use of ‘cast’
     In the expression: cast e
     In the expression: case cast e of { Just e' -> ecast e' }
diff --git a/testsuite/tests/typecheck/should_fail/T9858b.stderr b/testsuite/tests/typecheck/should_fail/T9858b.stderr
index b57098e..f7b54a5 100644
--- a/testsuite/tests/typecheck/should_fail/T9858b.stderr
+++ b/testsuite/tests/typecheck/should_fail/T9858b.stderr
@@ -1,7 +1,7 @@
 
-T9858b.hs:7:8: error:
+T9858b.hs:7:8:
     No instance for (Typeable (Eq Int => Int))
-      (maybe you haven't applied a function to enough arguments?)
+      (maybe you haven't applied enough arguments to a function?)
       arising from a use of ‘typeRep’
     In the expression: typeRep (Proxy :: Proxy (Eq Int => Int))
     In an equation for ‘test’:
diff --git a/testsuite/tests/typecheck/should_fail/T9858c.stderr b/testsuite/tests/typecheck/should_fail/T9858c.stderr
index c2d0f22..2f235005 100644
--- a/testsuite/tests/typecheck/should_fail/T9858c.stderr
+++ b/testsuite/tests/typecheck/should_fail/T9858c.stderr
@@ -1,5 +1,5 @@
 
-T9858c.hs:9:8: error:
+T9858c.hs:9:8:
     Couldn't match type ‘Eq Int => Int’ with ‘a0 b0’
     Expected type: Proxy (a0 b0)
       Actual type: Proxy (Eq Int => Int)
diff --git a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
index 8e37acf..e900101 100644
--- a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
+++ b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
@@ -7,7 +7,8 @@ TcStaticPointersFail02.hs:9:6:
         f1 = static (undefined :: (forall a. a -> a) -> b)
 
 TcStaticPointersFail02.hs:12:6:
-    No instance for (Data.Typeable.Internal.Typeable m)
+    No instance for (Data.Typeable.Internal.Typeable
+                       (Monad m => a -> m a))
       (maybe you haven't applied enough arguments to a function?)
       arising from a static form
     In the expression: static return