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

[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/53ef5e0d042843b97caef039ff90df61f425da8c/ghc

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

commit 53ef5e0d042843b97caef039ff90df61f425da8c
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Aug 5 11:54:18 2015 -0400

    Testsuite wibbles


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

53ef5e0d042843b97caef039ff90df61f425da8c
 .../tests/typecheck/should_compile/tc141.stderr    | 12 +++--
 .../tests/typecheck/should_compile/tc211.stderr    | 55 +++-------------------
 .../tests/typecheck/should_compile/tc243.stderr    |  4 +-
 3 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index cca4b60..d8ff76f 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -19,6 +19,7 @@ tc141.hs:11:31: error:
       f :: (a0, a0) -> (t0, a0) (bound at tc141.hs:11:1)
     In the expression: q :: a
     In the expression: (q :: a, p)
+    In the expression: let (p :: a, q :: a) = x in (q :: a, p)
 
 tc141.hs:13:13: error:
     You cannot bind scoped type variable ‘a’
@@ -33,14 +34,19 @@ tc141.hs:13:13: error:
       in v
 
 tc141.hs:15:18: error:
-    Couldn't match expected type ‘a’ with actual type ‘t0’
+    Couldn't match expected type ‘a’ with actual type ‘r0’
       because type variable ‘a’ would escape its scope
     This (rigid, skolem) type variable is bound by
       the type signature for: v :: a
       at tc141.hs:14:19
     Relevant bindings include
       v :: a (bound at tc141.hs:15:14)
-      b :: t0 (bound at tc141.hs:13:5)
-      g :: a0 -> t0 -> a1 (bound at tc141.hs:13:1)
+      b :: r0 (bound at tc141.hs:13:5)
+      g :: a0 -> r0 -> forall a. a (bound at tc141.hs:13:1)
     In the expression: b
     In an equation for ‘v’: v = b
+    In the expression:
+      let
+        v :: a
+        v = b
+      in v
diff --git a/testsuite/tests/typecheck/should_compile/tc211.stderr b/testsuite/tests/typecheck/should_compile/tc211.stderr
index 14483bf..026cc15 100644
--- a/testsuite/tests/typecheck/should_compile/tc211.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc211.stderr
@@ -1,53 +1,6 @@
 
-tc211.hs:17:8: error:
-    Couldn't match expected type ‘forall a. a -> a’
-                with actual type ‘a2 -> a2’
-    In the expression:
-        (:) ::
-          (forall a. a -> a) -> [forall a. a -> a] -> [forall a. a -> a]
-    In the expression:
-      ((:) ::
-         (forall a. a -> a) -> [forall a. a -> a] -> [forall a. a -> a])
-        (head foo) foo
-
-tc211.hs:18:22: error:
-    Couldn't match type ‘forall a3. a3 -> a3’ with ‘a -> a’
-    Expected type: [a -> a]
-      Actual type: [forall a. a -> a]
-    In the first argument of ‘head’, namely ‘foo’
-    In the first argument of ‘(:) ::
-                                (forall a. a -> a)
-                                -> [forall a. a -> a] -> [forall a. a -> a]’, namely
-      ‘(head foo)’
-
-tc211.hs:59:18: error:
-    Couldn't match expected type ‘forall a. a -> a’
-                with actual type ‘a1 -> a1’
-    In the expression:
-        Cons ::
-          (forall a. a -> a)
-          -> List (forall a. a -> a) -> List (forall a. a -> a)
-    In an equation for ‘cons’:
-        cons
-          = Cons ::
-              (forall a. a -> a)
-              -> List (forall a. a -> a) -> List (forall a. a -> a)
-
-tc211.hs:65:8: error:
-    Couldn't match expected type ‘forall a. a -> a’
-                with actual type ‘a0 -> a0’
-    In the expression:
-        Cons ::
-          (forall a. a -> a)
-          -> List (forall a. a -> a) -> List (forall a. a -> a)
-    In the expression:
-      (Cons ::
-         (forall a. a -> a)
-         -> List (forall a. a -> a) -> List (forall a. a -> a))
-        (\ x -> x) Nil
-
 tc211.hs:73:9: error:
-    Couldn't match type ‘forall a4. a4 -> a4’ with ‘a -> a’
+    Couldn't match type ‘forall a1. a1 -> a1’ with ‘a -> a’
     Expected type: List (forall a1. a1 -> a1)
                    -> (forall a1. a1 -> a1) -> a -> a
       Actual type: List (a -> a) -> (a -> a) -> a -> a
@@ -59,3 +12,9 @@ tc211.hs:73:9: error:
          List (forall a. a -> a)
          -> (forall a. a -> a) -> (forall a. a -> a))
         xs1 (\ x -> x)
+    In an equation for ‘bar4’:
+        bar4
+          = (foo2 ::
+               List (forall a. a -> a)
+               -> (forall a. a -> a) -> (forall a. a -> a))
+              xs1 (\ x -> x)
diff --git a/testsuite/tests/typecheck/should_compile/tc243.stderr b/testsuite/tests/typecheck/should_compile/tc243.stderr
index 31cc3c9..0219817 100644
--- a/testsuite/tests/typecheck/should_compile/tc243.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc243.stderr
@@ -1,3 +1,3 @@
 
-tc243.hs:10:1: Warning:
-    Top-level binding with no type signature: (.+.) :: forall t. t
+tc243.hs:10:1: warning:
+    Top-level binding with no type signature: (.+.) :: forall a. a