summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2012-02-28 10:03:37 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2012-02-28 10:03:37 +0000
commit5b7328c4e32c680d3d001cc1dc0e7961eb08c4b0 (patch)
tree75f8e733d9519949cf87b8b7d5c473ae09b5d625 /testsuite
parent36c9b792a565dc095a8ff3c43a11b61dae23d030 (diff)
downloadhaskell-5b7328c4e32c680d3d001cc1dc0e7961eb08c4b0.tar.gz
Wibbles to error messages
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/ghci/scripts/Defer02.stderr2
-rw-r--r--testsuite/tests/ghci/scripts/Defer02.stdout2
-rw-r--r--testsuite/tests/indexed-types/should_fail/T3330c.stderr18
-rw-r--r--testsuite/tests/polykinds/PolyKinds02.stderr2
4 files changed, 7 insertions, 17 deletions
diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index 4a17b34d19..21cade847d 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -46,7 +46,7 @@
Couldn't match expected type `Bool' with actual type `T a'
In the return type of a call of `K'
In the first argument of `not', namely `(K a)'
- In the first argument of `seq', namely `(not (K a))'
+ In the expression: (not (K a))
../../typecheck/should_run/Defer01.hs:43:5: Warning:
No instance for (MyClass a1)
diff --git a/testsuite/tests/ghci/scripts/Defer02.stdout b/testsuite/tests/ghci/scripts/Defer02.stdout
index 85d447abc1..6dde368833 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stdout
+++ b/testsuite/tests/ghci/scripts/Defer02.stdout
@@ -45,7 +45,7 @@ Hello World*** Exception: ../../typecheck/should_run/Defer01.hs:11:40:
Couldn't match expected type `Bool' with actual type `T a'
In the return type of a call of `K'
In the first argument of `not', namely `(K a)'
- In the first argument of `seq', namely `(not (K a))'
+ In the expression: (not (K a))
(deferred type error)
"*** Exception: ../../typecheck/should_run/Defer01.hs:43:5:
No instance for (MyClass a1)
diff --git a/testsuite/tests/indexed-types/should_fail/T3330c.stderr b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
index b9db62a887..b7341bbd1e 100644
--- a/testsuite/tests/indexed-types/should_fail/T3330c.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
@@ -1,20 +1,10 @@
T3330c.hs:23:43:
- Could not deduce (f1 ~ t0 x)
- from the context (f ~ (f1 :+: g))
- bound by a pattern with constructor
- RSum :: forall (f :: * -> *) (g :: * -> *).
- R f -> R g -> R (f :+: g),
- in an equation for plug'
- at T3330c.hs:23:8-17
- `f1' is a rigid type variable bound by
- a pattern with constructor
- RSum :: forall (f :: * -> *) (g :: * -> *).
- R f -> R g -> R (f :+: g),
- in an equation for plug'
- at T3330c.hs:23:8
+ Couldn't match kind `* -> *' with `*'
Expected type: Der ((->) x) (t0 x)
Actual type: R f1
+ Kind incompatibility when matching types:
+ f1 :: * -> *
+ t0 x :: *
In the first argument of `plug', namely `rf'
In the first argument of `Inl', namely `(plug rf df x)'
- In the expression: Inl (plug rf df x)
diff --git a/testsuite/tests/polykinds/PolyKinds02.stderr b/testsuite/tests/polykinds/PolyKinds02.stderr
index 3c61552662..2ee85b5e2b 100644
--- a/testsuite/tests/polykinds/PolyKinds02.stderr
+++ b/testsuite/tests/polykinds/PolyKinds02.stderr
@@ -1,6 +1,6 @@
PolyKinds02.hs:13:16:
Kind mis-match
- The second argument of `Vec' should have kind `Nat',
+ The second argument of `Vec' should have kind 'Nat,
but `Nat' has kind `*'
In the type signature for `vec': vec :: Vec Nat Nat