summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2013-04-29 17:33:32 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2013-04-29 17:34:16 +0100
commitd5bd2d37a84ec0fdb8a987ef58c3ad071a35afa3 (patch)
treed15ba2c43d8fe574db64129acb3a03bd745406c8 /testsuite
parentf5d36751dad2d6d6d52649b746bb3c73a4ece076 (diff)
downloadhaskell-d5bd2d37a84ec0fdb8a987ef58c3ad071a35afa3.tar.gz
Wibbles to error messages, following the fix for Trac #7851
In effect, the error context for naked variables now takes up a "slot" in the context stack; but it is often empty. So the context stack becomes one shorter in those cases. I don't think this matters; indeed, it's aguably an improvement. Anyway that's why so many tests are affected.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/annotations/should_fail/annfail07.stderr1
-rw-r--r--testsuite/tests/arrows/should_fail/T5380.stderr4
-rw-r--r--testsuite/tests/gadt/T3169.stderr3
-rw-r--r--testsuite/tests/gadt/gadt-escape1.stderr2
-rw-r--r--testsuite/tests/gadt/gadt7.stderr1
-rw-r--r--testsuite/tests/gadt/rw.stderr1
-rw-r--r--testsuite/tests/ghci/scripts/Defer02.stderr9
-rw-r--r--testsuite/tests/ghci/scripts/ghci050.stderr1
-rw-r--r--testsuite/tests/ghci/scripts/ghci052.stderr3
-rw-r--r--testsuite/tests/ghci/scripts/ghci053.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/Overlap9.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T2544.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_fail/T2693.stderr6
-rw-r--r--testsuite/tests/indexed-types/should_fail/T3330a.stderr3
-rw-r--r--testsuite/tests/indexed-types/should_fail/T3330c.stderr49
-rw-r--r--testsuite/tests/indexed-types/should_fail/T3440.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T4093a.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T4099.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_fail/T4179.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T5439.stderr3
-rw-r--r--testsuite/tests/indexed-types/should_fail/T7010.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T7194.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T7354.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T7354a.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T7729.stderr1
-rw-r--r--testsuite/tests/indexed-types/should_fail/T7729a.stderr1
-rw-r--r--testsuite/tests/polykinds/T7594.stderr1
-rw-r--r--testsuite/tests/rename/should_compile/T3823.stderr1
-rw-r--r--testsuite/tests/rename/should_fail/rnfail026.stderr4
-rw-r--r--testsuite/tests/simplCore/should_compile/simpl017.stderr6
-rw-r--r--testsuite/tests/typecheck/bug1465/bug1465.stderr1
-rw-r--r--testsuite/tests/typecheck/should_compile/FD2.stderr1
-rw-r--r--testsuite/tests/typecheck/should_compile/T2494.stderr2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc141.stderr6
-rw-r--r--testsuite/tests/typecheck/should_compile/tc211.stderr174
-rw-r--r--testsuite/tests/typecheck/should_fail/T1899.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/T2414.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/T2688.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/T3102.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/T3613.stderr5
-rw-r--r--testsuite/tests/typecheck/should_fail/T3950.stderr24
-rw-r--r--testsuite/tests/typecheck/should_fail/T5689.stderr7
-rw-r--r--testsuite/tests/typecheck/should_fail/T5691.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/T6069.stderr3
-rw-r--r--testsuite/tests/typecheck/should_fail/T7264.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/T7368.stderr20
-rw-r--r--testsuite/tests/typecheck/should_fail/T7453.stderr10
-rw-r--r--testsuite/tests/typecheck/should_fail/T7734.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/mc19.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/mc21.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/mc22.stderr43
-rw-r--r--testsuite/tests/typecheck/should_fail/mc23.stderr3
-rw-r--r--testsuite/tests/typecheck/should_fail/mc24.stderr3
-rw-r--r--testsuite/tests/typecheck/should_fail/mc25.stderr37
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail014.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail016.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail033.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail065.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail068.stderr6
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail076.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail099.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail103.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail104.stderr4
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail131.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail153.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail168.stderr7
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail174.stderr67
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail177.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail178.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail179.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail185.stderr6
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail189.stderr3
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail191.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail192.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail193.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail194.stderr3
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail198.stderr1
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail207.stderr4
79 files changed, 205 insertions, 377 deletions
diff --git a/testsuite/tests/annotations/should_fail/annfail07.stderr b/testsuite/tests/annotations/should_fail/annfail07.stderr
index 678a1609ec..86a579919a 100644
--- a/testsuite/tests/annotations/should_fail/annfail07.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail07.stderr
@@ -3,4 +3,3 @@ annfail07.hs:9:17:
Couldn't match expected type ‛[a0]’ with actual type ‛Bool’
In the first argument of ‛head’, namely ‛True’
In the expression: (head True)
- In the annotation: {-# ANN f (head True) #-}
diff --git a/testsuite/tests/arrows/should_fail/T5380.stderr b/testsuite/tests/arrows/should_fail/T5380.stderr
index 567450ef27..6ffe59955a 100644
--- a/testsuite/tests/arrows/should_fail/T5380.stderr
+++ b/testsuite/tests/arrows/should_fail/T5380.stderr
@@ -11,8 +11,6 @@ T5380.hs:7:27:
b :: not_bool (bound at T5380.hs:7:7)
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:
Couldn't match type ‛not_unit’ with ‛()’
@@ -27,5 +25,3 @@ T5380.hs:7:34:
(bound at T5380.hs:7:1)
In the expression: f
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 -< ()
diff --git a/testsuite/tests/gadt/T3169.stderr b/testsuite/tests/gadt/T3169.stderr
index 292342031a..c095f958e8 100644
--- a/testsuite/tests/gadt/T3169.stderr
+++ b/testsuite/tests/gadt/T3169.stderr
@@ -16,6 +16,3 @@ T3169.hs:13:22:
m :: Map (a, b) elt (bound at T3169.hs:12:17)
In the second argument of ‛lookup’, namely ‛m’
In the expression: lookup a m :: Maybe (Map b elt)
- In the expression:
- case lookup a m :: Maybe (Map b elt) of {
- Just (m2 :: Map b elt) -> lookup b m2 :: Maybe elt }
diff --git a/testsuite/tests/gadt/gadt-escape1.stderr b/testsuite/tests/gadt/gadt-escape1.stderr
index fbc1b6703a..f701402e30 100644
--- a/testsuite/tests/gadt/gadt-escape1.stderr
+++ b/testsuite/tests/gadt/gadt-escape1.stderr
@@ -15,5 +15,3 @@ gadt-escape1.hs:19:58:
weird1 :: t (bound at gadt-escape1.hs:19:1)
In the expression: a
In a case alternative: Hidden (ExpInt _) a -> a
- In the expression:
- case (hval :: Hidden) of { Hidden (ExpInt _) a -> a }
diff --git a/testsuite/tests/gadt/gadt7.stderr b/testsuite/tests/gadt/gadt7.stderr
index 186bfd33fb..d4c0468b5f 100644
--- a/testsuite/tests/gadt/gadt7.stderr
+++ b/testsuite/tests/gadt/gadt7.stderr
@@ -17,4 +17,3 @@ gadt7.hs:16:38:
y1 :: t1 (bound at gadt7.hs:16:16)
In the expression: y1
In a case alternative: K -> y1
- In the expression: case t1 of { K -> y1 }
diff --git a/testsuite/tests/gadt/rw.stderr b/testsuite/tests/gadt/rw.stderr
index 584c94475b..584eebb7a8 100644
--- a/testsuite/tests/gadt/rw.stderr
+++ b/testsuite/tests/gadt/rw.stderr
@@ -25,4 +25,3 @@ rw.hs:19:51:
ref :: IORef a (bound at rw.hs:17:12)
In the second argument of ‛(.)’, namely ‛not’
In the second argument of ‛(>>=)’, namely ‛(print . not)’
- In the expression: readIORef ref >>= (print . not)
diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index b1fb11ecc5..53a58f83e6 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -51,14 +51,12 @@
x :: a (bound at ../../typecheck/should_run/Defer01.hs:34:3)
In the expression: x
In the expression: (x, 'c')
- In an equation for ‛h’: h x = (x, 'c')
../../typecheck/should_run/Defer01.hs:39:17: Warning:
Couldn't match expected type ‛Bool’ with actual type ‛T a’
Relevant bindings include
i :: a -> () (bound at ../../typecheck/should_run/Defer01.hs:39:1)
a :: a (bound at ../../typecheck/should_run/Defer01.hs:39:3)
- In the return type of a call of ‛K’
In the first argument of ‛not’, namely ‛(K a)’
In the expression: (not (K a))
@@ -105,9 +103,9 @@
../../typecheck/should_run/Defer01.hs:49:5: Warning:
Couldn't match expected type ‛IO a0’
with actual type ‛Char -> IO ()’
+ Probable cause: ‛putChar’ is applied to too few arguments
In the first argument of ‛(>>)’, namely ‛putChar’
In the expression: putChar >> putChar 'p'
- In an equation for ‛l’: l = putChar >> putChar 'p'
*** Exception: ../../typecheck/should_run/Defer01.hs:11:40:
Couldn't match type ‛Char’ with ‛[Char]’
Expected type: String
@@ -131,7 +129,6 @@
Couldn't match type ‛Bool’ with ‛Int’
Expected type: C Int
Actual type: C Bool
- In the return type of a call of ‛C2’
In the first argument of ‛c’, namely ‛(C2 True)’
In the first argument of ‛print’, namely ‛(c (C2 True))’
*** Exception: ../../typecheck/should_run/Defer01.hs:28:5:
@@ -159,14 +156,12 @@
x :: a (bound at ../../typecheck/should_run/Defer01.hs:34:3)
In the expression: x
In the expression: (x, 'c')
- In an equation for ‛h’: h x = (x, 'c')
(deferred type error)
*** Exception: ../../typecheck/should_run/Defer01.hs:39:17:
Couldn't match expected type ‛Bool’ with actual type ‛T a’
Relevant bindings include
i :: a -> () (bound at ../../typecheck/should_run/Defer01.hs:39:1)
a :: a (bound at ../../typecheck/should_run/Defer01.hs:39:3)
- In the return type of a call of ‛K’
In the first argument of ‛not’, namely ‛(K a)’
In the expression: (not (K a))
(deferred type error)
@@ -184,7 +179,7 @@
*** Exception: ../../typecheck/should_run/Defer01.hs:49:5:
Couldn't match expected type ‛IO a0’
with actual type ‛Char -> IO ()’
+ Probable cause: ‛putChar’ is applied to too few arguments
In the first argument of ‛(>>)’, namely ‛putChar’
In the expression: putChar >> putChar 'p'
- In an equation for ‛l’: l = putChar >> putChar 'p'
(deferred type error)
diff --git a/testsuite/tests/ghci/scripts/ghci050.stderr b/testsuite/tests/ghci/scripts/ghci050.stderr
index 77c552575a..440547707c 100644
--- a/testsuite/tests/ghci/scripts/ghci050.stderr
+++ b/testsuite/tests/ghci/scripts/ghci050.stderr
@@ -11,4 +11,3 @@
b :: a (bound at <interactive>:6:43)
In the expression: a
In the expression: [a, b]
- In an equation for ‛asList’: asList (a, b) = [a, b]
diff --git a/testsuite/tests/ghci/scripts/ghci052.stderr b/testsuite/tests/ghci/scripts/ghci052.stderr
index 2efada5344..089785b27f 100644
--- a/testsuite/tests/ghci/scripts/ghci052.stderr
+++ b/testsuite/tests/ghci/scripts/ghci052.stderr
@@ -4,21 +4,18 @@
with actual type ‛Planet’
In the first argument of ‛pn’, namely ‛Mercury’
In the expression: pn Mercury
- In an equation for ‛it’: it = pn Mercury
<interactive>:8:4:
Couldn't match expected type ‛main::Interactive.Planet’
with actual type ‛Planet’
In the first argument of ‛pn’, namely ‛Venus’
In the expression: pn Venus
- In an equation for ‛it’: it = pn Venus
<interactive>:9:4:
Couldn't match expected type ‛main::Interactive.Planet’
with actual type ‛Planet’
In the first argument of ‛pn’, namely ‛Mars’
In the expression: pn Mars
- In an equation for ‛it’: it = pn Mars
<interactive>:11:44:
Couldn't match expected type ‛Planet’
diff --git a/testsuite/tests/ghci/scripts/ghci053.stderr b/testsuite/tests/ghci/scripts/ghci053.stderr
index f97df8f63c..5f9b598574 100644
--- a/testsuite/tests/ghci/scripts/ghci053.stderr
+++ b/testsuite/tests/ghci/scripts/ghci053.stderr
@@ -4,11 +4,9 @@
with actual type ‛Planet’
In the second argument of ‛(==)’, namely ‛Mercury’
In the expression: mercury == Mercury
- In an equation for ‛it’: it = mercury == Mercury
<interactive>:10:10:
Couldn't match expected type ‛Planet’
with actual type ‛main::Interactive.Planet’
In the second argument of ‛(==)’, namely ‛Earth’
In the expression: Venus == Earth
- In an equation for ‛it’: it = Venus == Earth
diff --git a/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr b/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
index aa6eedc88c..bcde2e3c16 100644
--- a/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
+++ b/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
@@ -18,4 +18,3 @@ GADTwrong1.hs:12:19:
y :: a1 (bound at GADTwrong1.hs:12:14)
In the expression: y
In a case alternative: T y -> y
- In the expression: case T x :: T (Const b) of { T y -> y }
diff --git a/testsuite/tests/indexed-types/should_fail/Overlap9.stderr b/testsuite/tests/indexed-types/should_fail/Overlap9.stderr
index 97c59c2a87..a0a6ea8ee6 100644
--- a/testsuite/tests/indexed-types/should_fail/Overlap9.stderr
+++ b/testsuite/tests/indexed-types/should_fail/Overlap9.stderr
@@ -7,6 +7,5 @@ Overlap9.hs:11:7:
Relevant bindings include
g :: a -> F a (bound at Overlap9.hs:11:1)
x :: a (bound at Overlap9.hs:11:3)
- In the return type of a call of ‛length’
In the expression: length (show x)
In an equation for ‛g’: g x = length (show x)
diff --git a/testsuite/tests/indexed-types/should_fail/T2544.stderr b/testsuite/tests/indexed-types/should_fail/T2544.stderr
index 33e36a0aa5..a068ef3268 100644
--- a/testsuite/tests/indexed-types/should_fail/T2544.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2544.stderr
@@ -11,7 +11,6 @@ T2544.hs:15:18:
empty :: IxMap (l :|: r) [Int] (bound at T2544.hs:15:4)
In the first argument of ‛BiApp’, namely ‛empty’
In the expression: BiApp empty empty
- In an equation for ‛empty’: empty = BiApp empty empty
T2544.hs:15:24:
Could not deduce (IxMap i1 ~ IxMap r)
@@ -25,4 +24,3 @@ T2544.hs:15:24:
empty :: IxMap (l :|: r) [Int] (bound at T2544.hs:15:4)
In the second argument of ‛BiApp’, namely ‛empty’
In the expression: BiApp empty empty
- In an equation for ‛empty’: empty = BiApp empty empty
diff --git a/testsuite/tests/indexed-types/should_fail/T2693.stderr b/testsuite/tests/indexed-types/should_fail/T2693.stderr
index 8c02ea263d..34fdfbde74 100644
--- a/testsuite/tests/indexed-types/should_fail/T2693.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2693.stderr
@@ -20,7 +20,6 @@ T2693.hs:19:15:
Relevant bindings include n :: a2 (bound at T2693.hs:19:7)
In the first argument of ‛fst’, namely ‛x’
In the first argument of ‛(+)’, namely ‛fst x’
- In the expression: fst x + snd x
T2693.hs:19:23:
Couldn't match expected type ‛(a4, a2)’ with actual type ‛TFn a5’
@@ -28,7 +27,6 @@ T2693.hs:19:23:
Relevant bindings include n :: a2 (bound at T2693.hs:19:7)
In the first argument of ‛snd’, namely ‛x’
In the second argument of ‛(+)’, namely ‛snd x’
- In the expression: fst x + snd x
T2693.hs:29:20:
Couldn't match type ‛TFn a0’ with ‛PVR a1’
@@ -37,7 +35,3 @@ T2693.hs:29:20:
Actual type: () -> Maybe (TFn a0)
In the first argument of ‛mapM’, namely ‛g’
In a stmt of a 'do' block: pvs <- mapM g undefined
- In the expression:
- do { pvs <- mapM g undefined;
- let n = (map pvrX pvs) `min` (map pvrX pvs);
- undefined }
diff --git a/testsuite/tests/indexed-types/should_fail/T3330a.stderr b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
index 9c4fedfa45..220eb522ba 100644
--- a/testsuite/tests/indexed-types/should_fail/T3330a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
@@ -14,7 +14,6 @@ T3330a.hs:19:34:
x :: PF s r ix (bound at T3330a.hs:19:12)
In the first argument of ‛hmapM’, namely ‛p’
In the first argument of ‛execWriter’, namely ‛(hmapM p collect x)’
- In the expression: execWriter (hmapM p collect x)
T3330a.hs:19:34:
Couldn't match type ‛s’ with ‛(->) (s0 ix0 -> ix1)’
@@ -30,7 +29,6 @@ T3330a.hs:19:34:
x :: PF s r ix (bound at T3330a.hs:19:12)
In the first argument of ‛hmapM’, namely ‛p’
In the first argument of ‛execWriter’, namely ‛(hmapM p collect x)’
- In the expression: execWriter (hmapM p collect x)
T3330a.hs:19:44:
Couldn't match type ‛ix’ with ‛r0 ix0 -> Writer [AnyF s0] (r0 ix0)’
@@ -45,4 +43,3 @@ T3330a.hs:19:44:
x :: PF s r ix (bound at T3330a.hs:19:12)
In the third argument of ‛hmapM’, namely ‛x’
In the first argument of ‛execWriter’, namely ‛(hmapM p collect x)’
- In the expression: execWriter (hmapM p collect x)
diff --git a/testsuite/tests/indexed-types/should_fail/T3330c.stderr b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
index 7fa660cf13..09e5304eac 100644
--- a/testsuite/tests/indexed-types/should_fail/T3330c.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
@@ -1,25 +1,24 @@
-
-T3330c.hs:23:43:
- Could not deduce (f1 ~ f1 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
- Expected type: Der ((->) x) (f1 x)
- Actual type: R f1
- Relevant bindings include
- plug' :: R f -> Der f x -> x -> f x (bound at T3330c.hs:23:1)
- rf :: R f1 (bound at T3330c.hs:23:13)
- df :: f1 x (bound at T3330c.hs:23:25)
- x :: x (bound at T3330c.hs:23:29)
- 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)
+
+T3330c.hs:23:43:
+ Could not deduce (f1 ~ f1 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
+ Expected type: Der ((->) x) (f1 x)
+ Actual type: R f1
+ Relevant bindings include
+ plug' :: R f -> Der f x -> x -> f x (bound at T3330c.hs:23:1)
+ rf :: R f1 (bound at T3330c.hs:23:13)
+ df :: f1 x (bound at T3330c.hs:23:25)
+ x :: x (bound at T3330c.hs:23:29)
+ In the first argument of ‛plug’, namely ‛rf’
+ In the first argument of ‛Inl’, namely ‛(plug rf df x)’
diff --git a/testsuite/tests/indexed-types/should_fail/T3440.stderr b/testsuite/tests/indexed-types/should_fail/T3440.stderr
index af8b90fd74..1889938545 100644
--- a/testsuite/tests/indexed-types/should_fail/T3440.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3440.stderr
@@ -20,4 +20,3 @@ T3440.hs:11:22:
y :: Fam a1 (bound at T3440.hs:11:16)
In the expression: x
In the expression: (x, y)
- In an equation for ‛unwrap’: unwrap (GADT x y) = (x, y)
diff --git a/testsuite/tests/indexed-types/should_fail/T4093a.stderr b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
index 83578248ae..8dfd987b36 100644
--- a/testsuite/tests/indexed-types/should_fail/T4093a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
@@ -10,6 +10,5 @@ T4093a.hs:8:8:
Expected type: Foo e
Actual type: Maybe ()
Relevant bindings include hang :: Foo e (bound at T4093a.hs:8:1)
- In the return type of a call of ‛Just’
In the expression: Just ()
In an equation for ‛hang’: hang = Just ()
diff --git a/testsuite/tests/indexed-types/should_fail/T4099.stderr b/testsuite/tests/indexed-types/should_fail/T4099.stderr
index 312b0b6443..ed0e572c44 100644
--- a/testsuite/tests/indexed-types/should_fail/T4099.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4099.stderr
@@ -9,7 +9,6 @@ T4099.hs:11:30:
x :: T b (bound at T4099.hs:11:8)
In the second argument of ‛foo’, namely ‛x’
In the expression: foo (error "urk") x
- In an equation for ‛bar1’: bar1 a x = foo (error "urk") x
T4099.hs:14:30:
Couldn't match expected type ‛T a1’ with actual type ‛Maybe b’
@@ -20,4 +19,3 @@ T4099.hs:14:30:
x :: Maybe b (bound at T4099.hs:14:8)
In the second argument of ‛foo’, namely ‛x’
In the expression: foo (error "urk") x
- In an equation for ‛bar2’: bar2 a x = foo (error "urk") x
diff --git a/testsuite/tests/indexed-types/should_fail/T4179.stderr b/testsuite/tests/indexed-types/should_fail/T4179.stderr
index 8f5ded1ffe..4ab033d7eb 100644
--- a/testsuite/tests/indexed-types/should_fail/T4179.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4179.stderr
@@ -18,4 +18,3 @@ T4179.hs:26:16:
(bound at T4179.hs:26:1)
In the first argument of ‛foldDoC’, namely ‛op’
In the expression: foldDoC op
- In an equation for ‛fCon’: fCon = foldDoC op
diff --git a/testsuite/tests/indexed-types/should_fail/T5439.stderr b/testsuite/tests/indexed-types/should_fail/T5439.stderr
index 4f8340481f..18b1bec721 100644
--- a/testsuite/tests/indexed-types/should_fail/T5439.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T5439.stderr
@@ -15,13 +15,10 @@ T5439.hs:83:28:
(bound at T5439.hs:65:9)
In the first argument of ‛complete’, namely ‛ev’
In the expression: complete ev
- In a stmt of a 'do' block:
- c <- complete ev $ inj $ Failure (e :: SomeException)
T5439.hs:83:39:
Couldn't match expected type ‛Peano n0’
with actual type ‛Attempt α0’
- In the return type of a call of ‛Failure’
In the second argument of ‛($)’, namely
‛Failure (e :: SomeException)’
In the second argument of ‛($)’, namely
diff --git a/testsuite/tests/indexed-types/should_fail/T7010.stderr b/testsuite/tests/indexed-types/should_fail/T7010.stderr
index 50c4bd0fd0..d0c300c962 100644
--- a/testsuite/tests/indexed-types/should_fail/T7010.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7010.stderr
@@ -5,4 +5,3 @@ T7010.hs:53:27:
Actual type: (Float, ValueTuple Float)
In the first argument of ‛withArgs’, namely ‛plug’
In the expression: withArgs plug
- In an equation for ‛filterFormants’: filterFormants = withArgs plug
diff --git a/testsuite/tests/indexed-types/should_fail/T7194.stderr b/testsuite/tests/indexed-types/should_fail/T7194.stderr
index a575dde330..c55d44a93f 100644
--- a/testsuite/tests/indexed-types/should_fail/T7194.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7194.stderr
@@ -9,6 +9,5 @@ T7194.hs:18:35:
x :: b0 (bound at T7194.hs:17:9)
g :: a -> Int (bound at T7194.hs:18:18)
y :: a (bound at T7194.hs:18:20)
- In the return type of a call of ‛foo’
In the expression: foo y
In the first argument of ‛length’, namely ‛[x, foo y]’
diff --git a/testsuite/tests/indexed-types/should_fail/T7354.stderr b/testsuite/tests/indexed-types/should_fail/T7354.stderr
index 1fb91e4dad..c548f151ca 100644
--- a/testsuite/tests/indexed-types/should_fail/T7354.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7354.stderr
@@ -8,4 +8,3 @@ T7354.hs:28:11:
foo :: Prim [a] a -> t (bound at T7354.hs:28:1)
In the first argument of ‛ana’, namely ‛alg’
In the expression: ana alg
- In an equation for ‛foo’: foo = ana alg
diff --git a/testsuite/tests/indexed-types/should_fail/T7354a.stderr b/testsuite/tests/indexed-types/should_fail/T7354a.stderr
index d05b0f9b68..dbad7967ea 100644
--- a/testsuite/tests/indexed-types/should_fail/T7354a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7354a.stderr
@@ -4,4 +4,3 @@ T7354a.hs:5:13:
Relevant bindings include foo :: t (bound at T7354a.hs:5:1)
In the first argument of ‛embed’, namely ‛()’
In the expression: embed ()
- In an equation for ‛foo’: foo = embed ()
diff --git a/testsuite/tests/indexed-types/should_fail/T7729.stderr b/testsuite/tests/indexed-types/should_fail/T7729.stderr
index 4b12b29d96..6b0d203a9b 100644
--- a/testsuite/tests/indexed-types/should_fail/T7729.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7729.stderr
@@ -14,4 +14,3 @@ T7729.hs:28:14:
(bound at T7729.hs:28:3)
In the first argument of ‛(.)’, namely ‛liftPrim’
In the expression: liftPrim . lift
- In an equation for ‛liftPrim’: liftPrim = liftPrim . lift
diff --git a/testsuite/tests/indexed-types/should_fail/T7729a.stderr b/testsuite/tests/indexed-types/should_fail/T7729a.stderr
index 54eeea02f4..326607b66b 100644
--- a/testsuite/tests/indexed-types/should_fail/T7729a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7729a.stderr
@@ -5,4 +5,3 @@ T7729a.hs:28:31:
Actual type: BasePrimMonad (Rand m) a
In the first argument of ‛lift’, namely ‛x’
In the first argument of ‛liftPrim’, namely ‛(lift x)’
- In the expression: liftPrim (lift x)
diff --git a/testsuite/tests/polykinds/T7594.stderr b/testsuite/tests/polykinds/T7594.stderr
index c813a65e8c..64d0fa2f8c 100644
--- a/testsuite/tests/polykinds/T7594.stderr
+++ b/testsuite/tests/polykinds/T7594.stderr
@@ -13,4 +13,3 @@ T7594.hs:25:11:
Relevant bindings include bar :: b (bound at T7594.hs:25:1)
In the first argument of ‛app’, namely ‛print’
In the expression: app print q
- In an equation for ‛bar’: bar = app print q
diff --git a/testsuite/tests/rename/should_compile/T3823.stderr b/testsuite/tests/rename/should_compile/T3823.stderr
index 90e3c864ed..4672d3ccb8 100644
--- a/testsuite/tests/rename/should_compile/T3823.stderr
+++ b/testsuite/tests/rename/should_compile/T3823.stderr
@@ -3,4 +3,3 @@ T3823B.hs:8:7:
Couldn't match expected type ‛A’ with actual type ‛Bool’
In the first argument of ‛y’, namely ‛a’
In the expression: y a
- In an equation for ‛b’: b = y a
diff --git a/testsuite/tests/rename/should_fail/rnfail026.stderr b/testsuite/tests/rename/should_fail/rnfail026.stderr
index f082327d56..1b17272ae1 100644
--- a/testsuite/tests/rename/should_fail/rnfail026.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail026.stderr
@@ -1,7 +1,7 @@
-rnfail026.hs:16:35:
+rnfail026.hs:16:17:
The first argument of ‛Monad’ should have kind ‛* -> *’,
- but ‛Set a’ has kind ‛*’
+ but ‛forall a. Eq a => Set a’ has kind ‛*’
In the instance declaration for ‛Monad (forall a. Eq a => Set a)’
rnfail026.hs:19:10:
diff --git a/testsuite/tests/simplCore/should_compile/simpl017.stderr b/testsuite/tests/simplCore/should_compile/simpl017.stderr
index 26068534b3..9bb1737fda 100644
--- a/testsuite/tests/simplCore/should_compile/simpl017.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl017.stderr
@@ -10,12 +10,6 @@ simpl017.hs:44:12:
f :: [E m i] -> E' v0 m a (bound at simpl017.hs:43:9)
In the first argument of ‛return’, namely ‛f’
In a stmt of a 'do' block: return f
- In the first argument of ‛E’, namely
- ‛(do { let ix :: [E m i] -> m i
- ix [i] = runE i
- {-# INLINE f #-}
- ....;
- return f })’
simpl017.hs:63:5:
Couldn't match type ‛forall v.
diff --git a/testsuite/tests/typecheck/bug1465/bug1465.stderr b/testsuite/tests/typecheck/bug1465/bug1465.stderr
index 3108183be2..15f5f648d9 100644
--- a/testsuite/tests/typecheck/bug1465/bug1465.stderr
+++ b/testsuite/tests/typecheck/bug1465/bug1465.stderr
@@ -4,4 +4,3 @@ C.hs:6:11:
with actual type ‛A.T’
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/FD2.stderr b/testsuite/tests/typecheck/should_compile/FD2.stderr
index c98c9cf480..cd75dabf64 100644
--- a/testsuite/tests/typecheck/should_compile/FD2.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD2.stderr
@@ -26,6 +26,5 @@ FD2.hs:26:34:
mf :: e1 -> Maybe e1 -> Maybe e1 (bound at FD2.hs:25:12)
x :: e1 (bound at FD2.hs:26:15)
y :: e1 (bound at FD2.hs:26:23)
- In the return type of a call of ‛f’
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 68b8dd4be1..370290df82 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2494.stderr
@@ -15,7 +15,6 @@ T2494.hs:15:14:
(bound at T2494.hs:13:11)
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:
Couldn't match type ‛a’ with ‛b’
@@ -33,4 +32,3 @@ T2494.hs:15:30:
(bound at T2494.hs:13:11)
In the second argument of ‛(.)’, namely ‛g’
In the first argument of ‛foo’, namely ‛(f . g)’
- In the expression: foo (f . g) x
diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index 55aac9e943..9284620f9e 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -19,7 +19,6 @@ tc141.hs:11:31:
p :: a (bound at tc141.hs:11:12)
In the expression: q :: a
In the expression: (q :: a, p)
- In the expression: let (p :: a, q :: a) = x in (q :: a, p)
tc141.hs:13:13:
You cannot bind scoped type variable ‛a’
@@ -45,8 +44,3 @@ tc141.hs:15:18:
v :: a2 (bound at tc141.hs:15:14)
In the expression: b
In an equation for ‛v’: v = b
- In the expression:
- let
- v :: a
- v = b
- in v
diff --git a/testsuite/tests/typecheck/should_compile/tc211.stderr b/testsuite/tests/typecheck/should_compile/tc211.stderr
index c140ba619b..00e1d0351d 100644
--- a/testsuite/tests/typecheck/should_compile/tc211.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc211.stderr
@@ -1,92 +1,82 @@
-
-tc211.hs:15:22:
- Couldn't match type ‛forall a6. a6 -> a6’ with ‛a -> a’
- Expected type: [a -> a]
- Actual type: [forall a. a -> a]
- In the first argument of ‛head’, namely ‛foo’
- In the first argument of ‛(:) ::
- (forall a. a -> a)
- -> [forall a. a -> a] -> [forall a. a -> a]’, namely
- ‛(head foo)’
- In the expression:
- ((:) ::
- (forall a. a -> a) -> [forall a. a -> a] -> [forall a. a -> a])
- (head foo) foo
-
-tc211.hs:48:19:
- Could not deduce (Num a2) arising from the literal ‛3’
- from the context (Num a)
- bound by the inferred type of
- h1 :: Num a => (forall a1. a1 -> a1) -> a
- at tc211.hs:(47,1)-(49,9)
- The type variable ‛a2’ is ambiguous
- Relevant bindings include
- y :: Pair a2 (Pair a3 b1) (bound at tc211.hs:48:10)
- Note: there are several potential instances:
- instance Num Double -- Defined in ‛GHC.Float’
- instance Num Float -- Defined in ‛GHC.Float’
- instance Integral a => Num (GHC.Real.Ratio a)
- -- Defined in ‛GHC.Real’
- ...plus three others
- In the first argument of ‛g’, namely ‛3’
- In the first argument of ‛P’, namely ‛(g 3)’
- In the expression: P (g 3) (g (P 3 4))
-
-tc211.hs:48:28:
- Could not deduce (Num a3) arising from the literal ‛3’
- from the context (Num a)
- bound by the inferred type of
- h1 :: Num a => (forall a1. a1 -> a1) -> a
- at tc211.hs:(47,1)-(49,9)
- The type variable ‛a3’ is ambiguous
- Relevant bindings include
- y :: Pair a2 (Pair a3 b1) (bound at tc211.hs:48:10)
- Note: there are several potential instances:
- instance Num Double -- Defined in ‛GHC.Float’
- instance Num Float -- Defined in ‛GHC.Float’
- instance Integral a => Num (GHC.Real.Ratio a)
- -- Defined in ‛GHC.Real’
- ...plus three others
- In the first argument of ‛P’, namely ‛3’
- In the first argument of ‛g’, namely ‛(P 3 4)’
- In the second argument of ‛P’, namely ‛(g (P 3 4))’
-
-tc211.hs:48:30:
- Could not deduce (Num b1) arising from the literal ‛4’
- from the context (Num a)
- bound by the inferred type of
- h1 :: Num a => (forall a1. a1 -> a1) -> a
- at tc211.hs:(47,1)-(49,9)
- The type variable ‛b1’ is ambiguous
- Relevant bindings include
- y :: Pair a2 (Pair a3 b1) (bound at tc211.hs:48:10)
- Note: there are several potential instances:
- instance Num Double -- Defined in ‛GHC.Float’
- instance Num Float -- Defined in ‛GHC.Float’
- instance Integral a => Num (GHC.Real.Ratio a)
- -- Defined in ‛GHC.Real’
- ...plus three others
- In the second argument of ‛P’, namely ‛4’
- In the first argument of ‛g’, namely ‛(P 3 4)’
- In the second argument of ‛P’, namely ‛(g (P 3 4))’
-
-tc211.hs:70:9:
- Couldn't match type ‛forall a7. a7 -> a7’ with ‛a6 -> a6’
- Expected type: List (forall a. a -> a)
- -> (forall a. a -> a) -> a6 -> a6
- Actual type: List (forall a. a -> a)
- -> (forall a. a -> a) -> forall a. a -> a
- In the expression:
- foo2 ::
- List (forall a. a -> a) -> (forall a. a -> a) -> (forall a. a -> a)
- In the expression:
- (foo2 ::
- List (forall a. a -> a)
- -> (forall a. a -> a) -> (forall a. a -> a))
- xs1 (\ x -> x)
- In an equation for ‛bar4’:
- bar4
- = (foo2 ::
- List (forall a. a -> a)
- -> (forall a. a -> a) -> (forall a. a -> a))
- xs1 (\ x -> x)
+
+tc211.hs:15:22:
+ Couldn't match type ‛forall a6. a6 -> a6’ with ‛a -> a’
+ Expected type: [a -> a]
+ Actual type: [forall a. a -> a]
+ In the first argument of ‛head’, namely ‛foo’
+ In the first argument of ‛(:) ::
+ (forall a. a -> a)
+ -> [forall a. a -> a] -> [forall a. a -> a]’, namely
+ ‛(head foo)’
+
+tc211.hs:48:19:
+ Could not deduce (Num a2) arising from the literal ‛3’
+ from the context (Num a)
+ bound by the inferred type of
+ h1 :: Num a => (forall a1. a1 -> a1) -> a
+ at tc211.hs:(47,1)-(49,9)
+ The type variable ‛a2’ is ambiguous
+ Relevant bindings include
+ y :: Pair a2 (Pair a3 b1) (bound at tc211.hs:48:10)
+ Note: there are several potential instances:
+ instance Num Double -- Defined in ‛GHC.Float’
+ instance Num Float -- Defined in ‛GHC.Float’
+ instance Integral a => Num (GHC.Real.Ratio a)
+ -- Defined in ‛GHC.Real’
+ ...plus three others
+ In the first argument of ‛g’, namely ‛3’
+ In the first argument of ‛P’, namely ‛(g 3)’
+ In the expression: P (g 3) (g (P 3 4))
+
+tc211.hs:48:28:
+ Could not deduce (Num a3) arising from the literal ‛3’
+ from the context (Num a)
+ bound by the inferred type of
+ h1 :: Num a => (forall a1. a1 -> a1) -> a
+ at tc211.hs:(47,1)-(49,9)
+ The type variable ‛a3’ is ambiguous
+ Relevant bindings include
+ y :: Pair a2 (Pair a3 b1) (bound at tc211.hs:48:10)
+ Note: there are several potential instances:
+ instance Num Double -- Defined in ‛GHC.Float’
+ instance Num Float -- Defined in ‛GHC.Float’
+ instance Integral a => Num (GHC.Real.Ratio a)
+ -- Defined in ‛GHC.Real’
+ ...plus three others
+ In the first argument of ‛P’, namely ‛3’
+ In the first argument of ‛g’, namely ‛(P 3 4)’
+ In the second argument of ‛P’, namely ‛(g (P 3 4))’
+
+tc211.hs:48:30:
+ Could not deduce (Num b1) arising from the literal ‛4’
+ from the context (Num a)
+ bound by the inferred type of
+ h1 :: Num a => (forall a1. a1 -> a1) -> a
+ at tc211.hs:(47,1)-(49,9)
+ The type variable ‛b1’ is ambiguous
+ Relevant bindings include
+ y :: Pair a2 (Pair a3 b1) (bound at tc211.hs:48:10)
+ Note: there are several potential instances:
+ instance Num Double -- Defined in ‛GHC.Float’
+ instance Num Float -- Defined in ‛GHC.Float’
+ instance Integral a => Num (GHC.Real.Ratio a)
+ -- Defined in ‛GHC.Real’
+ ...plus three others
+ In the second argument of ‛P’, namely ‛4’
+ In the first argument of ‛g’, namely ‛(P 3 4)’
+ In the second argument of ‛P’, namely ‛(g (P 3 4))’
+
+tc211.hs:70:9:
+ Couldn't match type ‛forall a7. a7 -> a7’ with ‛a6 -> a6’
+ Expected type: List (forall a. a -> a)
+ -> (forall a. a -> a) -> a6 -> a6
+ Actual type: List (forall a. a -> a)
+ -> (forall a. a -> a) -> forall a. a -> a
+ In the expression:
+ foo2 ::
+ List (forall a. a -> a) -> (forall a. a -> a) -> (forall a. a -> a)
+ In the expression:
+ (foo2 ::
+ List (forall a. a -> a)
+ -> (forall a. a -> a) -> (forall a. a -> a))
+ xs1 (\ x -> x)
diff --git a/testsuite/tests/typecheck/should_fail/T1899.stderr b/testsuite/tests/typecheck/should_fail/T1899.stderr
index d637ac7a0a..50754a6cb5 100644
--- a/testsuite/tests/typecheck/should_fail/T1899.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1899.stderr
@@ -7,6 +7,5 @@ T1899.hs:12:29:
Relevant bindings include
transRHS :: [a] -> Int -> Constraint a (bound at T1899.hs:10:2)
varSet :: [a] (bound at T1899.hs:10:11)
- In the return type of a call of ‛Auxiliary’
In the first argument of ‛Prop’, namely ‛(Auxiliary undefined)’
In the expression: Prop (Auxiliary undefined)
diff --git a/testsuite/tests/typecheck/should_fail/T2414.stderr b/testsuite/tests/typecheck/should_fail/T2414.stderr
index af968d90da..cedf04d8cf 100644
--- a/testsuite/tests/typecheck/should_fail/T2414.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2414.stderr
@@ -5,4 +5,3 @@ T2414.hs:9:13:
Actual type: b0 -> Maybe b0
In the first argument of ‛unfoldr’, namely ‛Just’
In the expression: unfoldr Just
- In an equation for ‛f’: f = unfoldr Just
diff --git a/testsuite/tests/typecheck/should_fail/T2688.stderr b/testsuite/tests/typecheck/should_fail/T2688.stderr
index e4fef7d182..1729f65126 100644
--- a/testsuite/tests/typecheck/should_fail/T2688.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2688.stderr
@@ -14,4 +14,3 @@ T2688.hs:8:22:
s :: s (bound at T2688.hs:8:10)
In the second argument of ‛(/)’, namely ‛s’
In the second argument of ‛(*^)’, namely ‛(1 / s)’
- In the expression: v *^ (1 / s)
diff --git a/testsuite/tests/typecheck/should_fail/T3102.stderr b/testsuite/tests/typecheck/should_fail/T3102.stderr
index b3f69d3761..1d4348ed12 100644
--- a/testsuite/tests/typecheck/should_fail/T3102.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3102.stderr
@@ -7,4 +7,3 @@ T3102.hs:11:12:
Actual type: ((?p::Int) => a0) -> String
In the first argument of ‛f’, namely ‛t’
In the expression: f t
- In an equation for ‛result’: result = f t
diff --git a/testsuite/tests/typecheck/should_fail/T3613.stderr b/testsuite/tests/typecheck/should_fail/T3613.stderr
index 956e20cb76..cbd4889b57 100644
--- a/testsuite/tests/typecheck/should_fail/T3613.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3613.stderr
@@ -5,7 +5,6 @@ T3613.hs:14:20:
Actual type: IO ()
In the first argument of ‛(>>)’, namely ‛bar’
In the first argument of ‛fooThen’, namely ‛(bar >> undefined)’
- In the expression: fooThen (bar >> undefined)
T3613.hs:17:24:
Couldn't match type ‛IO’ with ‛Maybe’
@@ -15,7 +14,3 @@ T3613.hs:17:24:
In the first argument of ‛fooThen’, namely
‛(do { bar;
undefined })’
- In the expression:
- fooThen
- (do { bar;
- undefined })
diff --git a/testsuite/tests/typecheck/should_fail/T3950.stderr b/testsuite/tests/typecheck/should_fail/T3950.stderr
index b5244154b6..56e69e2c43 100644
--- a/testsuite/tests/typecheck/should_fail/T3950.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3950.stderr
@@ -1,15 +1,9 @@
-
-T3950.hs:15:13:
- Couldn't match type ‛Id p0 x0’ with ‛Id p’
- Expected type: w (Id p)
- Actual type: Sealed (Id p0 x0)
- Relevant bindings include
- rp :: Bool -> Maybe (w (Id p)) (bound at T3950.hs:15:1)
- In the first argument of ‛Just’, namely ‛rp'’
- In the expression: Just rp'
- In an equation for ‛rp’:
- rp _
- = Just rp'
- where
- rp' :: Sealed (Id p x)
- rp' = undefined
+
+T3950.hs:15:13:
+ Couldn't match type ‛Id p0 x0’ with ‛Id p’
+ Expected type: w (Id p)
+ Actual type: Sealed (Id p0 x0)
+ Relevant bindings include
+ rp :: Bool -> Maybe (w (Id p)) (bound at T3950.hs:15:1)
+ In the first argument of ‛Just’, namely ‛rp'’
+ In the expression: Just rp'
diff --git a/testsuite/tests/typecheck/should_fail/T5689.stderr b/testsuite/tests/typecheck/should_fail/T5689.stderr
index 6fb1f222d6..6a67b2cac6 100644
--- a/testsuite/tests/typecheck/should_fail/T5689.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5689.stderr
@@ -6,8 +6,6 @@ T5689.hs:10:36:
v :: t (bound at T5689.hs:10:28)
In the expression: v
In the expression: if v then False else True
- In the second argument of ‛writeIORef’, namely
- ‛(\ v -> if v then False else True)’
T5689.hs:10:43:
Couldn't match expected type ‛t’ with actual type ‛Bool’
@@ -16,8 +14,6 @@ T5689.hs:10:43:
v :: t (bound at T5689.hs:10:28)
In the expression: False
In the expression: if v then False else True
- In the second argument of ‛writeIORef’, namely
- ‛(\ v -> if v then False else True)’
T5689.hs:10:54:
Couldn't match expected type ‛t’ with actual type ‛Bool’
@@ -26,8 +22,6 @@ T5689.hs:10:54:
v :: t (bound at T5689.hs:10:28)
In the expression: True
In the expression: if v then False else True
- In the second argument of ‛writeIORef’, namely
- ‛(\ v -> if v then False else True)’
T5689.hs:14:23:
Couldn't match expected type ‛t’ with actual type ‛Bool’
@@ -36,4 +30,3 @@ T5689.hs:14:23:
c :: t -> t (bound at T5689.hs:12:13)
In the first argument of ‛c’, namely ‛True’
In the second argument of ‛($)’, namely ‛c True’
- In a stmt of a 'do' block: print $ c True
diff --git a/testsuite/tests/typecheck/should_fail/T5691.stderr b/testsuite/tests/typecheck/should_fail/T5691.stderr
index 4b5676374c..497ec7794a 100644
--- a/testsuite/tests/typecheck/should_fail/T5691.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5691.stderr
@@ -14,4 +14,3 @@ T5691.hs:15:24:
Relevant bindings include f :: p a (bound at T5691.hs:14:9)
In the first argument of ‛printRule_’, namely ‛f’
In the second argument of ‛($)’, namely ‛printRule_ f’
- In the expression: MkPRI $ printRule_ f
diff --git a/testsuite/tests/typecheck/should_fail/T6069.stderr b/testsuite/tests/typecheck/should_fail/T6069.stderr
index 750dcbc540..4f82c0d896 100644
--- a/testsuite/tests/typecheck/should_fail/T6069.stderr
+++ b/testsuite/tests/typecheck/should_fail/T6069.stderr
@@ -5,7 +5,6 @@ T6069.hs:13:15:
Actual type: (forall s. ST s b0) -> b0
In the second argument of ‛(.)’, namely ‛runST’
In the expression: print . runST
- In the expression: (print . runST) fourty_two
T6069.hs:14:15:
Couldn't match type ‛ST s1 Int’ with ‛forall s. ST s b1’
@@ -13,7 +12,6 @@ T6069.hs:14:15:
Actual type: (forall s. ST s b1) -> b1
In the second argument of ‛(.)’, namely ‛runST’
In the expression: (print . runST)
- In the expression: (print . runST) $ fourty_two
T6069.hs:15:16:
Couldn't match type ‛ST s2 Int’ with ‛forall s. ST s b2’
@@ -21,4 +19,3 @@ T6069.hs:15:16:
Actual type: (forall s. ST s b2) -> b2
In the second argument of ‛(.)’, namely ‛runST’
In the first argument of ‛($)’, namely ‛(print . runST)’
- In the expression: (print . runST) $
diff --git a/testsuite/tests/typecheck/should_fail/T7264.stderr b/testsuite/tests/typecheck/should_fail/T7264.stderr
index 3c0c068afd..71964fbb0e 100644
--- a/testsuite/tests/typecheck/should_fail/T7264.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7264.stderr
@@ -10,4 +10,3 @@ T7264.hs:13:19:
val :: a (bound at T7264.hs:13:8)
In the first argument of ‛mmap’, namely ‛Foo’
In the expression: mmap Foo (Just val)
- In an equation for ‛mkFoo2’: mkFoo2 val = mmap Foo (Just val)
diff --git a/testsuite/tests/typecheck/should_fail/T7368.stderr b/testsuite/tests/typecheck/should_fail/T7368.stderr
index 091cafb378..b4e1042346 100644
--- a/testsuite/tests/typecheck/should_fail/T7368.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7368.stderr
@@ -1,11 +1,9 @@
-
-T7368.hs:3:10:
- Kind incompatibility when matching types:
- c0 :: (* -> *) -> *
- (->) a0 :: * -> *
- Expected type: a0 -> b0
- Actual type: c0 Maybe
- In the return type of a call of ‛l’
- Probable cause: ‛l’ is applied to too many arguments
- In the first argument of ‛b’, namely ‛(l Nothing)’
- In the expression: b (l Nothing)
+
+T7368.hs:3:10:
+ Kind incompatibility when matching types:
+ c0 :: (* -> *) -> *
+ (->) a0 :: * -> *
+ Expected type: a0 -> b0
+ Actual type: c0 Maybe
+ In the first argument of ‛b’, namely ‛(l Nothing)’
+ In the expression: b (l Nothing)
diff --git a/testsuite/tests/typecheck/should_fail/T7453.stderr b/testsuite/tests/typecheck/should_fail/T7453.stderr
index 4a95105f44..9345595fb4 100644
--- a/testsuite/tests/typecheck/should_fail/T7453.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7453.stderr
@@ -12,7 +12,6 @@ T7453.hs:10:30:
aux :: Id t1 (bound at T7453.hs:10:21)
In the first argument of ‛Id’, namely ‛v’
In the expression: Id v
- In an equation for ‛aux’: aux = Id v
T7453.hs:16:33:
Couldn't match expected type ‛t2’ with actual type ‛t’
@@ -27,7 +26,6 @@ T7453.hs:16:33:
aux :: b -> t2 (bound at T7453.hs:16:21)
In the first argument of ‛const’, namely ‛v’
In the expression: const v
- In an equation for ‛aux’: aux = const v
T7453.hs:21:15:
Couldn't match expected type ‛t2’ with actual type ‛t’
@@ -45,11 +43,3 @@ T7453.hs:21:15:
z = v
where
aux = const v
- In an equation for ‛cast3’:
- cast3 v
- = z
- where
- z :: t
- z = v
- where
- aux = const v
diff --git a/testsuite/tests/typecheck/should_fail/T7734.stderr b/testsuite/tests/typecheck/should_fail/T7734.stderr
index 539de1eaea..0748826acb 100644
--- a/testsuite/tests/typecheck/should_fail/T7734.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7734.stderr
@@ -6,7 +6,6 @@ T7734.hs:4:13:
x :: t2 -> t1 (bound at T7734.hs:4:1)
In the first argument of ‛x’, namely ‛x’
In the expression: x x
- In an equation for ‛f’: x `f` y = x x
T7734.hs:5:13:
Occurs check: cannot construct the infinite type: t2 ~ t2 -> t1
@@ -15,4 +14,3 @@ T7734.hs:5:13:
x :: t2 -> t1 (bound at T7734.hs:5:5)
In the first argument of ‛x’, namely ‛x’
In the expression: x x
- In an equation for ‛&’: (&) x y = x x
diff --git a/testsuite/tests/typecheck/should_fail/mc19.stderr b/testsuite/tests/typecheck/should_fail/mc19.stderr
index de2367cfe4..a5e9bc5e7f 100644
--- a/testsuite/tests/typecheck/should_fail/mc19.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc19.stderr
@@ -7,4 +7,3 @@ mc19.hs:10:31:
Actual type: [a] -> [[a]]
In the expression: inits
In a stmt of a monad comprehension: then inits
- In the expression: [x | x <- [3, 2, 1], then inits]
diff --git a/testsuite/tests/typecheck/should_fail/mc21.stderr b/testsuite/tests/typecheck/should_fail/mc21.stderr
index eeda10a396..853f982979 100644
--- a/testsuite/tests/typecheck/should_fail/mc21.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc21.stderr
@@ -5,6 +5,5 @@ mc21.hs:12:26:
a type expected by the context: [a] -> [[a]] at mc21.hs:12:9
Expected type: [a] -> [[a]]
Actual type: [a] -> [a]
- In the return type of a call of ‛take’
In the expression: take 5
In a stmt of a monad comprehension: then group using take 5
diff --git a/testsuite/tests/typecheck/should_fail/mc22.stderr b/testsuite/tests/typecheck/should_fail/mc22.stderr
index 3a149fdcba..23b53d7e07 100644
--- a/testsuite/tests/typecheck/should_fail/mc22.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc22.stderr
@@ -1,22 +1,21 @@
-
-mc22.hs:10:9:
- No instance for (Functor t) arising from a use of ‛fmap’
- Possible fix:
- add (Functor t) to the context of
- a type expected by the context: (a -> b) -> t a -> t b
- or the inferred type of foo :: [t [Char]]
- In the expression: fmap
- In a stmt of a monad comprehension: then group using take 5
- In the expression:
- [x + 1 | x <- ["Hello", "World"], then group using take 5]
-
-mc22.hs:10:26:
- Couldn't match type ‛a’ with ‛t a’
- ‛a’ is a rigid type variable bound by
- a type expected by the context: [a] -> [t a] at mc22.hs:10:9
- Expected type: [a] -> [t a]
- Actual type: [a] -> [a]
- Relevant bindings include foo :: [t [Char]] (bound at mc22.hs:8:1)
- In the return type of a call of ‛take’
- In the expression: take 5
- In a stmt of a monad comprehension: then group using take 5
+
+mc22.hs:10:9:
+ No instance for (Functor t) arising from a use of ‛fmap’
+ Possible fix:
+ add (Functor t) to the context of
+ a type expected by the context: (a -> b) -> t a -> t b
+ or the inferred type of foo :: [t [Char]]
+ In the expression: fmap
+ In a stmt of a monad comprehension: then group using take 5
+ In the expression:
+ [x + 1 | x <- ["Hello", "World"], then group using take 5]
+
+mc22.hs:10:26:
+ Couldn't match type ‛a’ with ‛t a’
+ ‛a’ is a rigid type variable bound by
+ a type expected by the context: [a] -> [t a] at mc22.hs:10:9
+ Expected type: [a] -> [t a]
+ Actual type: [a] -> [a]
+ Relevant bindings include foo :: [t [Char]] (bound at mc22.hs:8:1)
+ In the expression: take 5
+ In a stmt of a monad comprehension: then group using take 5
diff --git a/testsuite/tests/typecheck/should_fail/mc23.stderr b/testsuite/tests/typecheck/should_fail/mc23.stderr
index 674c5571d1..4bd18c10c7 100644
--- a/testsuite/tests/typecheck/should_fail/mc23.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc23.stderr
@@ -4,7 +4,6 @@ mc23.hs:9:29:
Expected type: (a -> b) -> [a] -> t a
Actual type: [a0] -> [a0]
Relevant bindings include z :: t b (bound at mc23.hs:9:1)
- In the return type of a call of ‛take’
- Probable cause: ‛take’ is applied to too many arguments
+ Possible cause: ‛take’ is applied to too many arguments
In the expression: take 5
In a stmt of a monad comprehension: then take 5 by x
diff --git a/testsuite/tests/typecheck/should_fail/mc24.stderr b/testsuite/tests/typecheck/should_fail/mc24.stderr
index 8a67d364d0..2e0515b282 100644
--- a/testsuite/tests/typecheck/should_fail/mc24.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc24.stderr
@@ -3,7 +3,6 @@ mc24.hs:10:31:
Couldn't match type ‛[a0]’ with ‛a -> a1’
Expected type: (a -> a1) -> [a] -> t [a]
Actual type: [a0] -> [a0]
- In the return type of a call of ‛take’
- Probable cause: ‛take’ is applied to too many arguments
+ Possible cause: ‛take’ is applied to too many arguments
In the expression: take 2
In a stmt of a monad comprehension: then group by x using take 2
diff --git a/testsuite/tests/typecheck/should_fail/mc25.stderr b/testsuite/tests/typecheck/should_fail/mc25.stderr
index 52b40c75dd..042de5b620 100644
--- a/testsuite/tests/typecheck/should_fail/mc25.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc25.stderr
@@ -1,19 +1,18 @@
-
-mc25.hs:9:24:
- No instance for (Functor t1) arising from a use of ‛fmap’
- Possible fix:
- add (Functor t1) to the context of
- a type expected by the context: (a -> b) -> t1 a -> t1 b
- or the inferred type of z :: [t1 t]
- In the expression: fmap
- In a stmt of a monad comprehension: then group by x using take
- In the expression: [x | x <- [1 .. 10], then group by x using take]
-
-mc25.hs:9:46:
- Couldn't match type ‛Int’ with ‛a -> t’
- Expected type: (a -> t) -> [a] -> [t1 a]
- Actual type: Int -> [a] -> [a]
- Relevant bindings include z :: [t1 t] (bound at mc25.hs:9:1)
- In the expression: take
- In a stmt of a monad comprehension: then group by x using take
- In the expression: [x | x <- [1 .. 10], then group by x using take]
+
+mc25.hs:9:24:
+ No instance for (Functor t1) arising from a use of ‛fmap’
+ Possible fix:
+ add (Functor t1) to the context of
+ a type expected by the context: (a -> b) -> t1 a -> t1 b
+ or the inferred type of z :: [t1 t]
+ In the expression: fmap
+ In a stmt of a monad comprehension: then group by x using take
+ In the expression: [x | x <- [1 .. 10], then group by x using take]
+
+mc25.hs:9:46:
+ Couldn't match type ‛Int’ with ‛a -> t’
+ Expected type: (a -> t) -> [a] -> [t1 a]
+ Actual type: Int -> [a] -> [a]
+ Relevant bindings include z :: [t1 t] (bound at mc25.hs:9:1)
+ In the expression: take
+ In a stmt of a monad comprehension: then group by x using take
diff --git a/testsuite/tests/typecheck/should_fail/tcfail014.stderr b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
index 1e4b637a9f..d34411af96 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail014.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
@@ -6,4 +6,3 @@ tcfail014.hs:5:33:
z :: t8 -> t7 (bound at tcfail014.hs:5:27)
In the first argument of ‛z’, namely ‛z’
In the expression: z z
- In an equation for ‛h’: h z = z z
diff --git a/testsuite/tests/typecheck/should_fail/tcfail016.stderr b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
index 15122e8e1b..a18f8032c1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail016.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
@@ -9,7 +9,6 @@ tcfail016.hs:9:20:
e2 :: AnnExpr t (bound at tcfail016.hs:9:11)
In the first argument of ‛g’, namely ‛e1’
In the first argument of ‛(++)’, namely ‛(g e1)’
- In the expression: (g e1) ++ (g e2)
tcfail016.hs:9:28:
Couldn't match type ‛(t, Expr t)’ with ‛Expr t’
@@ -21,4 +20,3 @@ tcfail016.hs:9:28:
e2 :: AnnExpr t (bound at tcfail016.hs:9:11)
In the first argument of ‛g’, namely ‛e2’
In the second argument of ‛(++)’, namely ‛(g e2)’
- In the expression: (g e1) ++ (g e2)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail033.stderr b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
index 0ebb5c826e..3a9496ead1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail033.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
@@ -7,4 +7,3 @@ tcfail033.hs:4:12:
y :: t1 (bound at tcfail033.hs:4:19)
In the expression: x
In the expression: [x | (x, y) <- buglet]
- In an equation for ‛buglet’: buglet = [x | (x, y) <- buglet]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
index 8599dfeb2a..75aad77065 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
@@ -11,4 +11,3 @@ tcfail065.hs:29:20:
x :: x1 (bound at tcfail065.hs:29:8)
In the first argument of ‛X’, namely ‛x’
In the expression: X x
- In an equation for ‛setX’: setX x (X _) = X x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
index 4e889720e1..e50e3da859 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
@@ -17,7 +17,6 @@ tcfail068.hs:14:9:
Relevant bindings include
itgen :: (Int, Int) -> a -> IndTree s a
(bound at tcfail068.hs:12:1)
- In the return type of a call of ‛newSTArray’
In the first argument of ‛runST’, namely
‛(newSTArray ((1, 1), n) x)’
In the expression: runST (newSTArray ((1, 1), n) x)
@@ -45,9 +44,6 @@ tcfail068.hs:19:21:
arr :: IndTree s a (bound at tcfail068.hs:17:11)
In the first argument of ‛readSTArray’, namely ‛arr’
In the first argument of ‛(>>=)’, namely ‛readSTArray arr i’
- In the first argument of ‛runST’, namely
- ‛(readSTArray arr i
- >>= \ val -> writeSTArray arr i (f val) >> return arr)’
tcfail068.hs:24:35:
Could not deduce (s ~ s1)
@@ -75,7 +71,6 @@ tcfail068.hs:24:35:
(bound at tcfail068.hs:29:9)
itrap' :: Int -> Int -> GHC.ST.ST s (IndTree s a)
(bound at tcfail068.hs:26:9)
- In the return type of a call of ‛itrap'’
In the first argument of ‛runST’, namely ‛(itrap' i k)’
In the expression: runST (itrap' i k)
@@ -122,6 +117,5 @@ tcfail068.hs:36:46:
(bound at tcfail068.hs:41:9)
itrapstate' :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b)
(bound at tcfail068.hs:38:9)
- In the return type of a call of ‛itrapstate'’
In the first argument of ‛runST’, namely ‛(itrapstate' i k s)’
In the expression: runST (itrapstate' i k s)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail076.stderr b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
index c5bd8a5bc8..6ae9951e71 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail076.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
@@ -12,6 +12,5 @@ tcfail076.hs:18:82:
Relevant bindings include
cont :: a -> m res (bound at tcfail076.hs:18:37)
cont' :: b -> m res1 (bound at tcfail076.hs:18:73)
- In the return type of a call of ‛cont’
In the expression: cont a
In the first argument of ‛KContT’, namely ‛(\ cont' -> cont a)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail099.stderr b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
index f4b77b770a..3cedf90a5c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail099.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
@@ -13,4 +13,3 @@ tcfail099.hs:9:20:
arg :: t (bound at tcfail099.hs:9:12)
In the first argument of ‛f’, namely ‛arg’
In the expression: f arg
- In an equation for ‛call’: call (C f) arg = f arg
diff --git a/testsuite/tests/typecheck/should_fail/tcfail103.stderr b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
index ba581be12f..928939e737 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail103.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
@@ -13,4 +13,3 @@ tcfail103.hs:15:23:
g :: ST s Int (bound at tcfail103.hs:15:9)
In the first argument of ‛readSTRef’, namely ‛v’
In the expression: readSTRef v
- In an equation for ‛g’: g = readSTRef v
diff --git a/testsuite/tests/typecheck/should_fail/tcfail104.stderr b/testsuite/tests/typecheck/should_fail/tcfail104.stderr
index a32e413f6b..ea41dfad92 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail104.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail104.stderr
@@ -4,13 +4,9 @@ tcfail104.hs:16:19:
with actual type ‛forall a. a -> a’
In the expression: x
In the expression: (\ x -> x)
- In the expression:
- if v then (\ (x :: forall a. a -> a) -> x) else (\ x -> x)
tcfail104.hs:22:39:
Couldn't match expected type ‛forall a. a -> a’
with actual type ‛a0 -> a0’
In the expression: x
In the expression: (\ (x :: forall a. a -> a) -> x)
- In the expression:
- if v then (\ x -> x) else (\ (x :: forall a. a -> a) -> x)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail131.stderr b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
index 7cdcb6f2f9..c664ba45e4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail131.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
@@ -9,6 +9,5 @@ tcfail131.hs:7:9:
Relevant bindings include
g :: b -> b (bound at tcfail131.hs:7:3)
x :: b (bound at tcfail131.hs:7:5)
- In the return type of a call of ‛f’
In the expression: f x x
In an equation for ‛g’: g x = f x x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail153.stderr b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
index ba1da78d4e..6b360719d1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail153.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
@@ -8,7 +8,6 @@ tcfail153.hs:6:7:
Relevant bindings include
f :: a -> [a] (bound at tcfail153.hs:6:1)
x :: a (bound at tcfail153.hs:6:3)
- In the return type of a call of ‛g’
In the expression: g x
In an equation for ‛f’:
f x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail168.stderr b/testsuite/tests/typecheck/should_fail/tcfail168.stderr
index 99cd5a129f..4eec056fa3 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail168.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail168.stderr
@@ -2,6 +2,7 @@
tcfail168.hs:7:11:
Couldn't match expected type ‛IO a0’
with actual type ‛Char -> IO ()’
+ Probable cause: ‛putChar’ is applied to too few arguments
In a stmt of a 'do' block: putChar
In the expression:
do { putChar;
@@ -9,9 +10,3 @@ tcfail168.hs:7:11:
putChar 'a';
putChar 'a';
.... }
- In an equation for ‛foo’:
- foo
- = do { putChar;
- putChar 'a';
- putChar 'a';
- .... }
diff --git a/testsuite/tests/typecheck/should_fail/tcfail174.stderr b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
index cdf21761f7..f37bcdf73b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail174.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
@@ -1,35 +1,32 @@
-
-tcfail174.hs:9:10:
- Couldn't match expected type ‛forall a. a -> a’
- with actual type ‛a0 -> a0’
- In the first argument of ‛Base’, namely ‛id’
- In the expression: Base id
- In an equation for ‛g’: g = Base id
-
-tcfail174.hs:13:14:
- Couldn't match type ‛a’ with ‛a1’
- because type variable ‛a1’ would escape its scope
- This (rigid, skolem) type variable is bound by
- the type forall a2. a2 -> a2
- at tcfail174.hs:13:14
- Expected type: Capture (forall x. x -> a)
- Actual type: Capture (forall a. a -> a)
- Relevant bindings include
- h1 :: Capture a (bound at tcfail174.hs:13:1)
- In the first argument of ‛Capture’, namely ‛g’
- In the expression: Capture g
- In an equation for ‛h1’: h1 = Capture g
-
-tcfail174.hs:16:14:
- Couldn't match type ‛a’ with ‛b’
- ‛a’ is a rigid type variable bound by
- the type forall a1. a1 -> a1 at tcfail174.hs:16:14
- ‛b’ is a rigid type variable bound by
- the type signature for h2 :: Capture b at tcfail174.hs:15:7
- Expected type: Capture (forall x. x -> b)
- Actual type: Capture (forall a. a -> a)
- Relevant bindings include
- h2 :: Capture b (bound at tcfail174.hs:16:1)
- In the first argument of ‛Capture’, namely ‛g’
- In the expression: Capture g
- In an equation for ‛h2’: h2 = Capture g
+
+tcfail174.hs:9:10:
+ Couldn't match expected type ‛forall a. a -> a’
+ with actual type ‛a0 -> a0’
+ In the first argument of ‛Base’, namely ‛id’
+ In the expression: Base id
+
+tcfail174.hs:13:14:
+ Couldn't match type ‛a’ with ‛a1’
+ because type variable ‛a1’ would escape its scope
+ This (rigid, skolem) type variable is bound by
+ the type forall a2. a2 -> a2
+ at tcfail174.hs:13:14
+ Expected type: Capture (forall x. x -> a)
+ Actual type: Capture (forall a. a -> a)
+ Relevant bindings include
+ h1 :: Capture a (bound at tcfail174.hs:13:1)
+ In the first argument of ‛Capture’, namely ‛g’
+ In the expression: Capture g
+
+tcfail174.hs:16:14:
+ Couldn't match type ‛a’ with ‛b’
+ ‛a’ is a rigid type variable bound by
+ the type forall a1. a1 -> a1 at tcfail174.hs:16:14
+ ‛b’ is a rigid type variable bound by
+ the type signature for h2 :: Capture b at tcfail174.hs:15:7
+ Expected type: Capture (forall x. x -> b)
+ Actual type: Capture (forall a. a -> a)
+ Relevant bindings include
+ h2 :: Capture b (bound at tcfail174.hs:16:1)
+ In the first argument of ‛Capture’, namely ‛g’
+ In the expression: Capture g
diff --git a/testsuite/tests/typecheck/should_fail/tcfail177.stderr b/testsuite/tests/typecheck/should_fail/tcfail177.stderr
index 5ef31f8d34..a2d6e7bac9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail177.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail177.stderr
@@ -1,7 +1,6 @@
tcfail177.hs:10:12:
Couldn't match expected type ‛Bool’ with actual type ‛Int’
- In the return type of a call of ‛foo’
In the expression:
foo
[a ~?= b, "Three" ~?= "3", "Four" ~?= "4", "Five" ~?= "5", ....]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail178.stderr b/testsuite/tests/typecheck/should_fail/tcfail178.stderr
index fe0ffa71c6..62af0f9051 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail178.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail178.stderr
@@ -6,11 +6,9 @@ tcfail178.hs:15:7:
Relevant bindings include c :: [a] (bound at tcfail178.hs:15:1)
In the first argument of ‛a’, namely ‛y’
In the expression: a y
- In an equation for ‛c’: c = a y
tcfail178.hs:18:7:
Couldn't match expected type ‛Bool -> [a]’ with actual type ‛()’
Relevant bindings include d :: [a] (bound at tcfail178.hs:18:1)
In the first argument of ‛a’, namely ‛()’
In the expression: a ()
- In an equation for ‛d’: d = a ()
diff --git a/testsuite/tests/typecheck/should_fail/tcfail179.stderr b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
index 89cd804371..2892bddbf0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail179.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
@@ -15,4 +15,3 @@ tcfail179.hs:14:39:
x :: x (bound at tcfail179.hs:14:26)
In the first argument of ‛g’, namely ‛x’
In the expression: g x id
- In a pattern binding: (x, _, b) = g x id
diff --git a/testsuite/tests/typecheck/should_fail/tcfail185.stderr b/testsuite/tests/typecheck/should_fail/tcfail185.stderr
index f46211e4fa..2c39b007d4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail185.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail185.stderr
@@ -9,9 +9,3 @@ tcfail185.hs:7:46:
y3 = y2
....
in x
- In the expression:
- \ x y
- -> let
- y1 = ...
- ....
- in x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail189.stderr b/testsuite/tests/typecheck/should_fail/tcfail189.stderr
index a7105907a7..fd86dbdf70 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail189.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail189.stderr
@@ -3,7 +3,6 @@ tcfail189.hs:10:31:
Couldn't match type ‛[a0]’ with ‛a -> a1’
Expected type: (a -> a1) -> [a] -> [[a]]
Actual type: [a0] -> [a0]
- In the return type of a call of ‛take’
- Probable cause: ‛take’ is applied to too many arguments
+ Possible cause: ‛take’ is applied to too many arguments
In the expression: take 2
In a stmt of a list comprehension: then group by x using take 2
diff --git a/testsuite/tests/typecheck/should_fail/tcfail191.stderr b/testsuite/tests/typecheck/should_fail/tcfail191.stderr
index b84f6f7701..e82a54af6e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail191.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail191.stderr
@@ -5,6 +5,5 @@ tcfail191.hs:11:26:
a type expected by the context: [a] -> [[a]] at tcfail191.hs:11:9
Expected type: [a] -> [[a]]
Actual type: [a] -> [a]
- In the return type of a call of ‛take’
In the expression: take 5
In a stmt of a list comprehension: then group using take 5
diff --git a/testsuite/tests/typecheck/should_fail/tcfail192.stderr b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
index 0fcced9cc3..b6388c25ed 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail192.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
@@ -5,6 +5,5 @@ tcfail192.hs:10:26:
a type expected by the context: [a] -> [[a]] at tcfail192.hs:10:9
Expected type: [a] -> [[a]]
Actual type: [a] -> [a]
- In the return type of a call of ‛take’
In the expression: take 5
In a stmt of a list comprehension: then group using take 5
diff --git a/testsuite/tests/typecheck/should_fail/tcfail193.stderr b/testsuite/tests/typecheck/should_fail/tcfail193.stderr
index 9c9e94b150..0ae78576c5 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail193.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail193.stderr
@@ -7,4 +7,3 @@ tcfail193.hs:10:31:
Actual type: [a] -> [[a]]
In the expression: inits
In a stmt of a list comprehension: then inits
- In the expression: [x | x <- [3, 2, 1], then inits]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail194.stderr b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
index 9140c16427..1b21e5a616 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail194.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
@@ -4,7 +4,6 @@ tcfail194.hs:9:29:
Expected type: (a -> t) -> [a] -> [a]
Actual type: [a0] -> [a0]
Relevant bindings include z :: [t] (bound at tcfail194.hs:9:1)
- In the return type of a call of ‛take’
- Probable cause: ‛take’ is applied to too many arguments
+ Possible cause: ‛take’ is applied to too many arguments
In the expression: take 5
In a stmt of a list comprehension: then take 5 by x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail198.stderr b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
index a2c66aa4bf..f8ec0405da 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail198.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
@@ -11,4 +11,3 @@ tcfail198.hs:6:36:
xs :: [a] (bound at tcfail198.hs:6:21)
In the expression: x :: a
In the second argument of ‛(++)’, namely ‛[x :: a]’
- In the expression: xs ++ [x :: a]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail207.stderr b/testsuite/tests/typecheck/should_fail/tcfail207.stderr
index f647a324ba..3263589203 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail207.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail207.stderr
@@ -2,15 +2,13 @@
tcfail207.hs:5:7:
Couldn't match expected type ‛[Int] -> [Int]’
with actual type ‛[a1]’
- In the return type of a call of ‛take’
- Probable cause: ‛take’ is applied to too many arguments
+ Possible cause: ‛take’ is applied to too many arguments
In the expression: take x []
In an equation for ‛f’: f x = take x []
tcfail207.hs:9:5:
Couldn't match expected type ‛[Int]’
with actual type ‛[a0] -> [a0]’
- In the return type of a call of ‛take’
Probable cause: ‛take’ is applied to too few arguments
In the expression: take 3
In an equation for ‛g’: g = take 3