[commit: testsuite] master: Error message wibbles now that we do less defaulting when there are insolubles (b572594)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master http://hackage.haskell.org/trac/ghc/changeset/b5725940b066c8a6acb29fe77246e6736414e1e7 >--------------------------------------------------------------- commit b5725940b066c8a6acb29fe77246e6736414e1e7 Author: Simon Peyton Jones <[email protected]> Date: Thu Oct 4 17:57:41 2012 +0100 Error message wibbles now that we do less defaulting when there are insolubles >--------------------------------------------------------------- tests/typecheck/should_fail/mc24.stderr | 4 ++-- tests/typecheck/should_fail/tcfail004.stderr | 6 +++--- tests/typecheck/should_fail/tcfail005.stderr | 3 +-- tests/typecheck/should_fail/tcfail140.stderr | 4 ++-- tests/typecheck/should_fail/tcfail189.stderr | 4 ++-- tests/typecheck/should_fail/tcfail206.stderr | 9 ++++----- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/typecheck/should_fail/mc24.stderr b/tests/typecheck/should_fail/mc24.stderr index 1249bc2..92b66b0 100644 --- a/tests/typecheck/should_fail/mc24.stderr +++ b/tests/typecheck/should_fail/mc24.stderr @@ -1,7 +1,7 @@ mc24.hs:10:31: - Couldn't match type `[a0]' with `a -> Integer' - Expected type: (a -> Integer) -> [a] -> t [a] + 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 diff --git a/tests/typecheck/should_fail/tcfail004.stderr b/tests/typecheck/should_fail/tcfail004.stderr index db24fb2..112a3aa 100644 --- a/tests/typecheck/should_fail/tcfail004.stderr +++ b/tests/typecheck/should_fail/tcfail004.stderr @@ -1,9 +1,9 @@ tcfail004.hs:3:9: - Couldn't match expected type `(t, t1)' - with actual type `(Integer, Integer, Integer)' + Couldn't match expected type `(t, t3)' + with actual type `(t0, t1, t2)' Relevant bindings include - g :: t1 (bound at tcfail004.hs:3:4) + g :: t3 (bound at tcfail004.hs:3:4) f :: t (bound at tcfail004.hs:3:2) In the expression: (1, 2, 3) In a pattern binding: (f, g) = (1, 2, 3) diff --git a/tests/typecheck/should_fail/tcfail005.stderr b/tests/typecheck/should_fail/tcfail005.stderr index 9cfae02..fa97c98 100644 --- a/tests/typecheck/should_fail/tcfail005.stderr +++ b/tests/typecheck/should_fail/tcfail005.stderr @@ -1,7 +1,6 @@ tcfail005.hs:3:9: - Couldn't match expected type `[t]' - with actual type `(Integer, Char)' + Couldn't match expected type `[t]' with actual type `(t0, Char)' Relevant bindings include i :: [t] (bound at tcfail005.hs:3:4) h :: t (bound at tcfail005.hs:3:2) diff --git a/tests/typecheck/should_fail/tcfail140.stderr b/tests/typecheck/should_fail/tcfail140.stderr index 0d9cd34..4315837 100644 --- a/tests/typecheck/should_fail/tcfail140.stderr +++ b/tests/typecheck/should_fail/tcfail140.stderr @@ -1,6 +1,6 @@ tcfail140.hs:10:7: - Couldn't match expected type `Integer -> t' with actual type `Int' + Couldn't match expected type `a0 -> t' with actual type `Int' Relevant bindings include bar :: t (bound at tcfail140.hs:10:1) The function `f' is applied to two arguments, but its type `Int -> Int' has only one @@ -8,7 +8,7 @@ tcfail140.hs:10:7: In an equation for `bar': bar = f 3 9 tcfail140.hs:12:10: - Couldn't match expected type `Integer -> t1' with actual type `Int' + Couldn't match expected type `a1 -> t1' with actual type `Int' Relevant bindings include rot :: t -> t1 (bound at tcfail140.hs:12:1) The operator `f' takes two arguments, diff --git a/tests/typecheck/should_fail/tcfail189.stderr b/tests/typecheck/should_fail/tcfail189.stderr index 0e95356..6364cc2 100644 --- a/tests/typecheck/should_fail/tcfail189.stderr +++ b/tests/typecheck/should_fail/tcfail189.stderr @@ -1,7 +1,7 @@ tcfail189.hs:10:31: - Couldn't match type `[a0]' with `a -> Integer' - Expected type: (a -> Integer) -> [a] -> [[a]] + 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 diff --git a/tests/typecheck/should_fail/tcfail206.stderr b/tests/typecheck/should_fail/tcfail206.stderr index 706933d..b5b9aef 100644 --- a/tests/typecheck/should_fail/tcfail206.stderr +++ b/tests/typecheck/should_fail/tcfail206.stderr @@ -7,9 +7,9 @@ tcfail206.hs:5:5: In an equation for `a': a = (, True) tcfail206.hs:8:5: - Couldn't match type `(Integer, Int)' with `Bool -> (Int, Bool)' + Couldn't match type `(t0, Int)' with `Bool -> (Int, Bool)' Expected type: Int -> Bool -> (Int, Bool) - Actual type: Int -> (Integer, Int) + Actual type: Int -> (t0, Int) In the expression: (1,) In an equation for `b': b = (1,) @@ -21,9 +21,8 @@ tcfail206.hs:14:5: In an equation for `d': d = (# , True #) tcfail206.hs:17:5: - Couldn't match type `(# Integer, Int #)' - with `Bool -> (# Int, Bool #)' + Couldn't match type `(# a0, Int #)' with `Bool -> (# Int, Bool #)' Expected type: Int -> Bool -> (# Int, Bool #) - Actual type: Int -> (# Integer, Int #) + Actual type: Int -> (# a0, Int #) In the expression: (# 1, #) In an equation for `e': e = (# 1, #)