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

[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/ffc812d946e3b06971ffe317939dd052a7b8a830/ghc

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

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

    Testsuite wibbles


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

ffc812d946e3b06971ffe317939dd052a7b8a830
 testsuite/tests/typecheck/bug1465/bug1465.stderr   |  1 +
 .../tests/typecheck/should_compile/FD1.stderr      | 10 ++++-----
 .../tests/typecheck/should_compile/FD2.stderr      | 21 ++++++++++---------
 .../tests/typecheck/should_compile/T2494.stderr    | 24 ++++++++++++----------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/testsuite/tests/typecheck/bug1465/bug1465.stderr b/testsuite/tests/typecheck/bug1465/bug1465.stderr
index 1c67068..4e31c7f 100644
--- a/testsuite/tests/typecheck/bug1465/bug1465.stderr
+++ b/testsuite/tests/typecheck/bug1465/bug1465.stderr
@@ -6,3 +6,4 @@ C.hs:6:11: error:
         ‘bug1465-1.0:A.T’ is defined in ‘A’ in package ‘bug1465-1.0’
     In the expression: B2.f
     In the expression: [B1.f, B2.f]
+    In an equation for ‘x’: x = [B1.f, B2.f]
diff --git a/testsuite/tests/typecheck/should_compile/FD1.stderr b/testsuite/tests/typecheck/should_compile/FD1.stderr
index 2b0ac17..08318d8 100644
--- a/testsuite/tests/typecheck/should_compile/FD1.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD1.stderr
@@ -1,9 +1,9 @@
 
-FD1.hs:16:1:
-    Couldn't match expected type ‘Int -> Int’ with actual type ‘a’
-      ‘a’ is a rigid type variable bound by
-          the type signature for: plus :: E a (Int -> Int) => Int -> a
-          at FD1.hs:15:9
+FD1.hs:16:1: error:
+    Couldn't match expected type ‘a’ with actual type ‘Int -> Int’
+    ‘a’ is a rigid type variable bound by
+        the type signature for: plus :: E a (Int -> Int) => Int -> a
+        at FD1.hs:15:9
     Relevant bindings include plus :: Int -> a (bound at FD1.hs:16:1)
     The equation(s) for ‘plus’ have two arguments,
     but its type ‘Int -> a’ has only one
diff --git a/testsuite/tests/typecheck/should_compile/FD2.stderr b/testsuite/tests/typecheck/should_compile/FD2.stderr
index 0134d87..e0efc60 100644
--- a/testsuite/tests/typecheck/should_compile/FD2.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD2.stderr
@@ -1,19 +1,20 @@
 
-FD2.hs:26:34:
-    Couldn't match expected type ‘e1’ with actual type ‘e’
-      ‘e’ is a rigid type variable bound by
-          the type signature for:
-          foldr1 :: Elem a e => (e -> e -> e) -> a -> e
-          at FD2.hs:21:13
-      ‘e1’ is a rigid type variable bound by
-           the type signature for:
-           mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1
-           at FD2.hs:24:18
+FD2.hs:26:36: error:
+    Couldn't match expected type ‘e’ with actual type ‘e1’
+    ‘e1’ is a rigid type variable bound by
+         the type signature for:
+         mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1
+         at FD2.hs:24:18
+    ‘e’ is a rigid type variable bound by
+        the type signature for:
+        foldr1 :: Elem a e => (e -> e -> e) -> a -> e
+        at FD2.hs:21:13
     Relevant bindings include
       y :: e1 (bound at FD2.hs:26:23)
       x :: e1 (bound at FD2.hs:26:15)
       mf :: e1 -> Maybe e1 -> Maybe e1 (bound at FD2.hs:25:12)
       f :: e -> e -> e (bound at FD2.hs:22:10)
       foldr1 :: (e -> e -> e) -> a -> e (bound at FD2.hs:22:3)
+    In the first argument of ‘f’, namely ‘x’
     In the first argument of ‘Just’, namely ‘(f x y)’
     In the expression: Just (f x y)
diff --git a/testsuite/tests/typecheck/should_compile/T2494.stderr b/testsuite/tests/typecheck/should_compile/T2494.stderr
index 0346e62..6784c2e 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2494.stderr
@@ -1,10 +1,10 @@
 
-T2494.hs:15:14:
+T2494.hs:15:14: error:
     Couldn't match type ‘b’ with ‘a’
-      ‘b’ is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:14:16
-      ‘a’ is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:13:16
+    ‘b’ is a rigid type variable bound by
+        the RULE "foo/foo" at T2494.hs:14:16
+    ‘a’ is a rigid type variable bound by
+        the RULE "foo/foo" at T2494.hs:13:16
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
     Relevant bindings include
@@ -15,14 +15,15 @@ T2494.hs:15:14:
       x :: Maybe a (bound at T2494.hs:14:65)
     In the first argument of ‘foo’, namely ‘g’
     In the second argument of ‘foo’, namely ‘(foo g x)’
+    In the expression: foo f (foo g x)
 
-T2494.hs:15:30:
+T2494.hs:15:30: error:
     Couldn't match type ‘b’ with ‘a’
-      ‘b’ is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:14:16
-      ‘a’ is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:13:16
-    Expected type: Maybe (m a) -> Maybe (m a)
+    ‘b’ is a rigid type variable bound by
+        the RULE "foo/foo" at T2494.hs:14:16
+    ‘a’ is a rigid type variable bound by
+        the RULE "foo/foo" at T2494.hs:13:16
+    Expected type: Maybe (m b) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
     Relevant bindings include
       f :: forall (m :: * -> *). Monad m => Maybe (m a) -> Maybe (m a)
@@ -32,3 +33,4 @@ T2494.hs:15:30:
       x :: Maybe a (bound at T2494.hs:14:65)
     In the second argument of ‘(.)’, namely ‘g’
     In the first argument of ‘foo’, namely ‘(f . g)’
+    In the expression: foo (f . g) x