[commit: testsuite] master: Wibbles to error output (85e0237)

Simon Peyton Jones simonpj at microsoft.com
Wed Apr 3 19:22:15 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

https://github.com/ghc/testsuite/commit/85e023702778840b47e8f6ca1154a6fcdd49d95b

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

commit 85e023702778840b47e8f6ca1154a6fcdd49d95b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 3 18:21:40 2013 +0100

    Wibbles to error output

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

 tests/indexed-types/should_fail/T3330c.stderr |    4 ++--
 tests/typecheck/should_fail/T2714.stderr      |   16 ++++++++--------
 tests/typecheck/should_fail/T3950.stderr      |    4 ++--
 tests/typecheck/should_fail/T5570.stderr      |    4 ++--
 tests/typecheck/should_fail/T7368a.stderr     |    4 ++--
 tests/typecheck/should_fail/tcfail123.stderr  |    4 ++--
 tests/typecheck/should_fail/tcfail159.stderr  |    4 ++--
 tests/typecheck/should_fail/tcfail200.stderr  |    4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/indexed-types/should_fail/T3330c.stderr b/tests/indexed-types/should_fail/T3330c.stderr
index 3d387b5..52d6afe 100644
--- a/tests/indexed-types/should_fail/T3330c.stderr
+++ b/tests/indexed-types/should_fail/T3330c.stderr
@@ -1,9 +1,9 @@
 
 T3330c.hs:23:43:
-    Couldn't match kind ‛* -> *’ with ‛*’
+    Couldn't match kind ‛*’ with ‛* -> *’
     When matching types
-      R :: (* -> *) -> *
       Der ((->) x) :: * -> *
+      R :: (* -> *) -> *
     Expected type: Der ((->) x) (f1 x)
       Actual type: R f1
     In the first argument of ‛plug’, namely ‛rf’
diff --git a/tests/typecheck/should_fail/T2714.stderr b/tests/typecheck/should_fail/T2714.stderr
index 07adee2..4b42c06 100644
--- a/tests/typecheck/should_fail/T2714.stderr
+++ b/tests/typecheck/should_fail/T2714.stderr
@@ -1,9 +1,9 @@
 
 T2714.hs:8:5:
-    Couldn't match type ‛c’ with ‛f0 (a -> b)’
-      ‛c’ is a rigid type variable bound by
-          the type signature for f :: ((a -> b) -> b) -> c -> a
-          at T2714.hs:8:1
+    Couldn't match type ‛a’ with ‛f0 b’
+      ‛a’ is a rigid type variable bound by
+          the type signature for f :: ((a -> b) -> b) -> forall c. c -> a
+          at T2714.hs:7:6
     Expected type: ((a -> b) -> b) -> c -> a
       Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
     Relevant bindings include
@@ -12,10 +12,10 @@ T2714.hs:8:5:
     In an equation for ‛f’: f = ffmap
 
 T2714.hs:8:5:
-    Couldn't match type ‛a’ with ‛f0 b’
-      ‛a’ is a rigid type variable bound by
-          the type signature for f :: ((a -> b) -> b) -> forall c. c -> a
-          at T2714.hs:7:6
+    Couldn't match type ‛c’ with ‛f0 (a -> b)’
+      ‛c’ is a rigid type variable bound by
+          the type signature for f :: ((a -> b) -> b) -> c -> a
+          at T2714.hs:8:1
     Expected type: ((a -> b) -> b) -> c -> a
       Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
     Relevant bindings include
diff --git a/tests/typecheck/should_fail/T3950.stderr b/tests/typecheck/should_fail/T3950.stderr
index d318978..b95b4f8 100644
--- a/tests/typecheck/should_fail/T3950.stderr
+++ b/tests/typecheck/should_fail/T3950.stderr
@@ -1,9 +1,9 @@
 
 T3950.hs:15:13:
-    Couldn't match kind ‛*’ with ‛* -> *’
+    Couldn't match kind ‛* -> *’ with ‛*’
     When matching types
-      Sealed :: (* -> *) -> *
       w :: (* -> * -> *) -> *
+      Sealed :: (* -> *) -> *
     Expected type: w (Id p)
       Actual type: Sealed (Id p0 x0)
     In the first argument of ‛Just’, namely ‛rp'’
diff --git a/tests/typecheck/should_fail/T5570.stderr b/tests/typecheck/should_fail/T5570.stderr
index d9ffbed..90f9155 100644
--- a/tests/typecheck/should_fail/T5570.stderr
+++ b/tests/typecheck/should_fail/T5570.stderr
@@ -1,9 +1,9 @@
 
 T5570.hs:7:16:
-    Couldn't match kind ‛#’ with ‛*’
+    Couldn't match kind ‛*’ with ‛#’
     When matching types
-      Double# :: #
       s0 :: *
+      Double# :: #
     In the second argument of ‛($)’, namely ‛D# $ 3.0##’
     In the expression: print $ D# $ 3.0##
     In an equation for ‛main’: main = print $ D# $ 3.0##
diff --git a/tests/typecheck/should_fail/T7368a.stderr b/tests/typecheck/should_fail/T7368a.stderr
index e9a9344..bc193ca 100644
--- a/tests/typecheck/should_fail/T7368a.stderr
+++ b/tests/typecheck/should_fail/T7368a.stderr
@@ -1,9 +1,9 @@
 
 T7368a.hs:8:6:
-    Couldn't match kind ‛* -> *’ with ‛*’
+    Couldn't match kind ‛*’ with ‛* -> *’
     When matching types
-      Bad :: (* -> *) -> *
       f :: * -> *
+      Bad :: (* -> *) -> *
     Expected type: f (Bad f)
       Actual type: Bad t0
     In the pattern: Bad x
diff --git a/tests/typecheck/should_fail/tcfail123.stderr b/tests/typecheck/should_fail/tcfail123.stderr
index 2f18b19..2a70414 100644
--- a/tests/typecheck/should_fail/tcfail123.stderr
+++ b/tests/typecheck/should_fail/tcfail123.stderr
@@ -1,9 +1,9 @@
 
 tcfail123.hs:11:9:
-    Couldn't match kind ‛#’ with ‛*’
+    Couldn't match kind ‛*’ with ‛#’
     When matching types
-      GHC.Prim.Int# :: #
       t0 :: *
+      GHC.Prim.Int# :: #
     In the first argument of ‛f’, namely ‛3#’
     In the expression: f 3#
     In an equation for ‛h’: h v = f 3#
diff --git a/tests/typecheck/should_fail/tcfail159.stderr b/tests/typecheck/should_fail/tcfail159.stderr
index ab79887..3ff73d8 100644
--- a/tests/typecheck/should_fail/tcfail159.stderr
+++ b/tests/typecheck/should_fail/tcfail159.stderr
@@ -1,9 +1,9 @@
 
 tcfail159.hs:9:11:
-    Couldn't match kind ‛#’ with ‛*’
+    Couldn't match kind ‛*’ with ‛#’
     When matching types
-      (# Int, Int #) :: #
       t0 :: *
+      (# Int, Int #) :: #
     In the pattern: ~(# p, q #)
     In a case alternative: ~(# p, q #) -> p
     In the expression: case h x of { ~(# p, q #) -> p }
diff --git a/tests/typecheck/should_fail/tcfail200.stderr b/tests/typecheck/should_fail/tcfail200.stderr
index 8bc2259..57c174d 100644
--- a/tests/typecheck/should_fail/tcfail200.stderr
+++ b/tests/typecheck/should_fail/tcfail200.stderr
@@ -1,9 +1,9 @@
 
 tcfail200.hs:5:15:
-    Couldn't match kind ‛#’ with ‛*’
+    Couldn't match kind ‛*’ with ‛#’
     When matching types
-      GHC.Prim.Int# :: #
       t1 :: *
+      GHC.Prim.Int# :: #
     In the expression: 1#
     In the expression: (1#, 'c')
     In an equation for ‛x’: x = (1#, 'c')





More information about the ghc-commits mailing list