[commit: ghc] wip/type-app: Testsuite wibbles (cbcf289)

[git at git.haskell.org]

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

On branch  : wip/type-app
Link       : http://ghc.haskell.org/trac/ghc/changeset/cbcf28937bbb85e43ae2c951124d2d394a4328f8/ghc

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

commit cbcf28937bbb85e43ae2c951124d2d394a4328f8
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Aug 4 22:38:11 2015 -0400

    Testsuite wibbles


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

cbcf28937bbb85e43ae2c951124d2d394a4328f8
 testsuite/tests/typecheck/should_fail/T7857.stderr | 4 ++--
 testsuite/tests/typecheck/should_fail/T8262.stderr | 2 +-
 testsuite/tests/typecheck/should_fail/T8428.stderr | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/testsuite/tests/typecheck/should_fail/T7857.stderr b/testsuite/tests/typecheck/should_fail/T7857.stderr
index 4e046e8..cfacdfe 100644
--- a/testsuite/tests/typecheck/should_fail/T7857.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7857.stderr
@@ -1,10 +1,10 @@
 
 T7857.hs:8:11: error:
-    Could not deduce (PrintfType r0) arising from a use of ‘printf’
+    Could not deduce (PrintfType a0) arising from a use of ‘printf’
     from the context: PrintfArg t0
       bound by the inferred type of g :: PrintfArg t0 => t0 -> b0
       at T7857.hs:8:1-21
-    The type variable ‘r0’ is ambiguous
+    The type variable ‘a0’ is ambiguous
     Note: there are several potential instances:
       instance [safe] (a ~ ()) => PrintfType (IO a)
         -- Defined in ‘Text.Printf’
diff --git a/testsuite/tests/typecheck/should_fail/T8262.stderr b/testsuite/tests/typecheck/should_fail/T8262.stderr
index dade165..2b19f3a 100644
--- a/testsuite/tests/typecheck/should_fail/T8262.stderr
+++ b/testsuite/tests/typecheck/should_fail/T8262.stderr
@@ -5,7 +5,7 @@ T8262.hs:5:15: error:
       a0 :: *
       Int# :: #
     Relevant bindings include
-      foo :: t0 -> Maybe a0 (bound at T8262.hs:5:1)
+      foo :: r0 -> Maybe a0 (bound at T8262.hs:5:1)
     In the first argument of ‘Just’, namely ‘(1#)’
     In the expression: Just (1#)
     In an equation for ‘foo’: foo x = Just (1#)
diff --git a/testsuite/tests/typecheck/should_fail/T8428.stderr b/testsuite/tests/typecheck/should_fail/T8428.stderr
index 49c20a5..8999cc1 100644
--- a/testsuite/tests/typecheck/should_fail/T8428.stderr
+++ b/testsuite/tests/typecheck/should_fail/T8428.stderr
@@ -1,10 +1,8 @@
 
-T8428.hs:11:19:
-    Couldn't match type ‘(forall s. ST s) a’ with ‘forall s. ST s a’
+T8428.hs:11:19: error:
+    Couldn't match type ‘forall s1. ST s1’ with ‘ST s’
     Expected type: IdentityT (forall s. ST s) a -> forall s. ST s a
       Actual type: IdentityT (forall s. ST s) a -> (forall s. ST s) a
-    Relevant bindings include
-      runIdST :: IdentityT (forall s. ST s) a -> a
-        (bound at T8428.hs:11:1)
     In the second argument of ‘(.)’, namely ‘runIdentityT’
     In the expression: runST . runIdentityT
+    In an equation for ‘runIdST’: runIdST = runST . runIdentityT