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

[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/0dcce275899f5abdb1500422c9334ecde999e972/ghc

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

commit 0dcce275899f5abdb1500422c9334ecde999e972
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Aug 5 08:36:20 2015 -0400

    Testsuite wibbles


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

0dcce275899f5abdb1500422c9334ecde999e972
 .../tests/typecheck/should_fail/tcfail201.stderr   | 11 ++++----
 .../tests/typecheck/should_fail/tcfail204.stderr   |  6 ++---
 .../tests/typecheck/should_fail/tcfail206.stderr   | 31 +++++++++++-----------
 .../tests/typecheck/should_fail/tcfail208.stderr   |  2 +-
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/testsuite/tests/typecheck/should_fail/tcfail201.stderr b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
index 3e67742..ebcfa10 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail201.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
@@ -1,11 +1,11 @@
 
 tcfail201.hs:17:58: error:
     Couldn't match expected type ‘a’ with actual type ‘HsDoc id0’
-      ‘a’ is a rigid type variable bound by
-          the type signature for:
-          gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)
-                     -> (forall g. g -> c g) -> a -> c a
-          at tcfail201.hs:15:12
+    ‘a’ is a rigid type variable bound by
+        the type signature for:
+        gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)
+                   -> (forall g. g -> c g) -> a -> c a
+        at tcfail201.hs:15:12
     Relevant bindings include
       hsDoc :: a (bound at tcfail201.hs:16:13)
       gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)
@@ -13,3 +13,4 @@ tcfail201.hs:17:58: error:
         (bound at tcfail201.hs:16:1)
     In the first argument of ‘z’, namely ‘DocEmpty’
     In the expression: z DocEmpty
+    In a case alternative: DocEmpty -> z DocEmpty
diff --git a/testsuite/tests/typecheck/should_fail/tcfail204.stderr b/testsuite/tests/typecheck/should_fail/tcfail204.stderr
index e8ecfc0..057e191 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail204.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail204.stderr
@@ -1,13 +1,13 @@
 
-tcfail204.hs:10:15: Warning:
+tcfail204.hs:10:15: warning:
     Defaulting the following constraint(s) to type ‘Double’
       (Fractional a0)
         arising from the literal ‘6.3’ at tcfail204.hs:10:15-17
       (RealFrac a0)
-        arising from a use of ‘ceiling’ at tcfail204.hs:10:7-13
+        arising from a use of ‘ceiling’ at tcfail204.hs:10:7-17
     In the first argument of ‘ceiling’, namely ‘6.3’
     In the expression: ceiling 6.3
     In an equation for ‘foo’: foo = ceiling 6.3
 
-<no location info>: 
+<no location info>: error: 
 Failing due to -Werror.
diff --git a/testsuite/tests/typecheck/should_fail/tcfail206.stderr b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
index bd3d90d..988eaf6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail206.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
@@ -1,50 +1,51 @@
 
-tcfail206.hs:5:5:
+tcfail206.hs:5:5: error:
     Couldn't match type ‘Bool’ with ‘Int’
     Expected type: Bool -> (Int, Bool)
-      Actual type: Bool -> (Bool, Bool)
+      Actual type: Int -> (Int, Bool)
     In the expression: (, True)
     In an equation for ‘a’: a = (, True)
 
-tcfail206.hs:8:5:
+tcfail206.hs:8:5: error:
     Couldn't match type ‘(Integer, Int)’ with ‘Bool -> (Int, Bool)’
     Expected type: Int -> Bool -> (Int, Bool)
       Actual type: Int -> (Integer, Int)
     In the expression: (1,)
     In an equation for ‘b’: b = (1,)
 
-tcfail206.hs:11:5:
+tcfail206.hs:11:5: error:
     Couldn't match type ‘a’ with ‘Bool’
-      ‘a’ is a rigid type variable bound by
-          the type signature for: c :: a -> (a, Bool) at tcfail206.hs:10:6
+    ‘a’ is a rigid type variable bound by
+        the type signature for: c :: a -> (a, Bool) at tcfail206.hs:10:6
     Expected type: a -> (a, Bool)
-      Actual type: a -> (a, a)
+      Actual type: Bool -> (a, Bool)
     Relevant bindings include
       c :: a -> (a, Bool) (bound at tcfail206.hs:11:1)
     In the expression: (True || False,)
     In an equation for ‘c’: c = (True || False,)
 
-tcfail206.hs:14:5:
+tcfail206.hs:14:5: error:
     Couldn't match type ‘Bool’ with ‘Int’
     Expected type: Bool -> (# Int, Bool #)
-      Actual type: Bool -> (# Bool, Bool #)
+      Actual type: Int -> (# Int, Bool #)
     In the expression: (# , True #)
     In an equation for ‘d’: d = (# , True #)
 
-tcfail206.hs:17:5:
+tcfail206.hs:17:5: error:
     Couldn't match type ‘(# Integer, Int #)’
-                  with ‘Bool -> (# Int, Bool #)’
+                   with ‘Bool -> (# Int, Bool #)’
     Expected type: Int -> Bool -> (# Int, Bool #)
       Actual type: Int -> (# Integer, Int #)
     In the expression: (# 1, #)
     In an equation for ‘e’: e = (# 1, #)
 
-tcfail206.hs:20:5:
+tcfail206.hs:20:5: error:
     Couldn't match type ‘a’ with ‘Bool’
-      ‘a’ is a rigid type variable bound by
-          the type signature for: f :: a -> (# a, Bool #) at tcfail206.hs:19:6
+    ‘a’ is a rigid type variable bound by
+        the type signature for: f :: a -> (# a, Bool #)
+        at tcfail206.hs:19:6
     Expected type: a -> (# a, Bool #)
-      Actual type: a -> (# a, a #)
+      Actual type: Bool -> (# a, Bool #)
     Relevant bindings include
       f :: a -> (# a, Bool #) (bound at tcfail206.hs:20:1)
     In the expression: (# True || False, #)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail208.stderr b/testsuite/tests/typecheck/should_fail/tcfail208.stderr
index 4b88fc0..4605f85 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail208.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail208.stderr
@@ -1,5 +1,5 @@
 
-tcfail208.hs:4:19:
+tcfail208.hs:4:10: error:
     Could not deduce (Eq (m a)) arising from a use of ‘==’
     from the context: (Monad m, Eq a)
       bound by the type signature for: