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

[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/85a0aa998e90046122d6cf6e2f28e4dc28e42b53/ghc

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

commit 85a0aa998e90046122d6cf6e2f28e4dc28e42b53
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Aug 6 09:42:02 2015 -0400

    Testsuite wibbles


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

85a0aa998e90046122d6cf6e2f28e4dc28e42b53
 libraries/base/tests/T9681.stderr                  |  2 +-
 .../tests/annotations/should_fail/annfail08.stderr |  2 +-
 testsuite/tests/arrows/should_fail/T5380.stderr    | 23 ++++++++++++----------
 .../tests/deSugar/should_compile/T2431.stderr      |  5 +++--
 testsuite/tests/driver/T2182.stderr                |  4 ++--
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/libraries/base/tests/T9681.stderr b/libraries/base/tests/T9681.stderr
index 7945ff7..af6e7dc 100644
--- a/libraries/base/tests/T9681.stderr
+++ b/libraries/base/tests/T9681.stderr
@@ -1,5 +1,5 @@
 
-T9681.hs:3:9:
+T9681.hs:3:7: error:
     No instance for (Num [Char]) arising from a use of ‘+’
     In the expression: 1 + "\n"
     In an equation for ‘foo’: foo = 1 + "\n"
diff --git a/testsuite/tests/annotations/should_fail/annfail08.stderr b/testsuite/tests/annotations/should_fail/annfail08.stderr
index 66e9c7e..68d5f0d 100644
--- a/testsuite/tests/annotations/should_fail/annfail08.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail08.stderr
@@ -4,7 +4,7 @@ annfail08.hs:9:1: error:
       (maybe you haven't applied a function to enough arguments?)
     In the annotation: {-# ANN f (id + 1) #-}
 
-annfail08.hs:9:15: error:
+annfail08.hs:9:12: error:
     No instance for (Num (a0 -> a0)) arising from a use of ‘+’
       (maybe you haven't applied a function to enough arguments?)
     In the annotation: {-# ANN f (id + 1) #-}
diff --git a/testsuite/tests/arrows/should_fail/T5380.stderr b/testsuite/tests/arrows/should_fail/T5380.stderr
index bff48f5..a2b5869 100644
--- a/testsuite/tests/arrows/should_fail/T5380.stderr
+++ b/testsuite/tests/arrows/should_fail/T5380.stderr
@@ -1,23 +1,25 @@
 
-T5380.hs:7:27:
+T5380.hs:7:27: error:
     Couldn't match expected type ‘Bool’ with actual type ‘not_bool’
-      ‘not_bool’ is a rigid type variable bound by
-                 the type signature for:
-                 testB :: not_bool -> (() -> ()) -> () -> not_unit
-                 at T5380.hs:6:10
+    ‘not_bool’ is a rigid type variable bound by
+               the type signature for:
+               testB :: not_bool -> (() -> ()) -> () -> not_unit
+               at T5380.hs:6:10
     Relevant bindings include
       b :: not_bool (bound at T5380.hs:7:7)
       testB :: not_bool -> (() -> ()) -> () -> not_unit
         (bound at T5380.hs:7:1)
     In the expression: b
     In the expression: proc () -> if b then f -< () else f -< ()
+    In an equation for ‘testB’:
+        testB b f = proc () -> if b then f -< () else f -< ()
 
-T5380.hs:7:34:
+T5380.hs:7:34: error:
     Couldn't match type ‘not_unit’ with ‘()’
-      ‘not_unit’ is a rigid type variable bound by
-                 the type signature for:
-                 testB :: not_bool -> (() -> ()) -> () -> not_unit
-                 at T5380.hs:6:10
+    ‘not_unit’ is a rigid type variable bound by
+               the type signature for:
+               testB :: not_bool -> (() -> ()) -> () -> not_unit
+               at T5380.hs:6:10
     Expected type: () -> not_unit
       Actual type: () -> ()
     Relevant bindings include
@@ -25,3 +27,4 @@ T5380.hs:7:34:
         (bound at T5380.hs:7:1)
     In the expression: f
     In the command: f -< ()
+    In the expression: proc () -> if b then f -< () else f -< ()
diff --git a/testsuite/tests/deSugar/should_compile/T2431.stderr b/testsuite/tests/deSugar/should_compile/T2431.stderr
index 607ecc1..745ceaa 100644
--- a/testsuite/tests/deSugar/should_compile/T2431.stderr
+++ b/testsuite/tests/deSugar/should_compile/T2431.stderr
@@ -13,8 +13,9 @@ T2431.$WRefl [InlPrag=INLINE] :: forall a. a :~: a
 T2431.$WRefl = \ (@ a) -> T2431.Refl @ a @ a @~ <a>_N
 
 absurd :: forall a. Int :~: Bool -> a
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>b]
-absurd = \ (@ a) (x :: Int :~: Bool) -> case x of _ [Occ=Dead] { }
+[GblId[sig], Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>b]
+absurd =
+  \ (@ a) (ds :: Int :~: Bool) -> case ds of _ [Occ=Dead] { }
 
 
 
diff --git a/testsuite/tests/driver/T2182.stderr b/testsuite/tests/driver/T2182.stderr
index 0585e4c..b5a5f1d 100644
--- a/testsuite/tests/driver/T2182.stderr
+++ b/testsuite/tests/driver/T2182.stderr
@@ -5,7 +5,7 @@ T2182.hs:5:5: error:
     In the expression: show (\ x -> x)
     In an equation for ‘y’: y = show (\ x -> x)
 
-T2182.hs:6:15: error:
+T2182.hs:6:5: error:
     No instance for (Eq (t0 -> t0)) arising from a use of ‘==’
       (maybe you haven't applied a function to enough arguments?)
     In the expression: (\ x -> x) == (\ y -> y)
@@ -17,7 +17,7 @@ T2182.hs:5:5: error:
     In the expression: show (\ x -> x)
     In an equation for ‘y’: y = show (\ x -> x)
 
-T2182.hs:6:15: error:
+T2182.hs:6:5: error:
     No instance for (Eq (t0 -> t0)) arising from a use of ‘==’
       (maybe you haven't applied a function to enough arguments?)
     In the expression: (\ x -> x) == (\ y -> y)