Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/bad37dc2576662bcb203e04f0eede2be7bddb3c2 >--------------------------------------------------------------- commit bad37dc2576662bcb203e04f0eede2be7bddb3c2 Author: Manuel M T Chakravarty <[email protected]> Date: Thu Aug 25 00:19:35 2011 +1000 Accept benign changes to stderr after removing a hack in the type checker that affects dictionary order >--------------------------------------------------------------- tests/indexed-types/should_compile/T3017.stderr | 2 +- tests/indexed-types/should_fail/NoMatchErr.stderr | 10 +++++----- tests/indexed-types/should_fail/T1897b.stderr | 2 +- tests/indexed-types/should_fail/T2544.stderr | 10 +++++----- tests/indexed-types/should_fail/T2627b.stderr | 2 +- tests/indexed-types/should_fail/T2693.stderr | 2 +- tests/indexed-types/should_fail/T4099.stderr | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/indexed-types/should_compile/T3017.stderr b/tests/indexed-types/should_compile/T3017.stderr index 5afb822..a41b6fe 100644 --- a/tests/indexed-types/should_compile/T3017.stderr +++ b/tests/indexed-types/should_compile/T3017.stderr @@ -1,7 +1,7 @@ TYPE SIGNATURES emptyL :: forall a. ListColl a test2 :: forall c t t1. - (Num t, Num t1, Coll c, Elem c ~ (t, t1)) => + (Num t1, Num t, Coll c, Elem c ~ (t, t1)) => c -> c TYPE CONSTRUCTORS data ListColl a diff --git a/tests/indexed-types/should_fail/NoMatchErr.stderr b/tests/indexed-types/should_fail/NoMatchErr.stderr index bd19673..713afea 100644 --- a/tests/indexed-types/should_fail/NoMatchErr.stderr +++ b/tests/indexed-types/should_fail/NoMatchErr.stderr @@ -1,13 +1,13 @@ -NoMatchErr.hs:20:12: - Could not deduce (Memo d0 ~ Memo d) +NoMatchErr.hs:20:5: + Could not deduce (Memo d ~ Memo d0) from the context (Fun d) bound by the type signature for f :: Fun d => Memo d a -> Memo d a at NoMatchErr.hs:20:1-15 NB: `Memo' is a type function, and may not be injective Expected type: Memo d a Actual type: Memo d0 a - Expected type: Memo d a -> d0 -> a - Actual type: Memo d0 a -> d0 -> a - In the second argument of `(.)', namely `appl' + Expected type: Memo d a -> Memo d a + Actual type: Memo d0 a -> Memo d0 a In the expression: abst . appl + In an equation for `f': f = abst . appl diff --git a/tests/indexed-types/should_fail/T1897b.stderr b/tests/indexed-types/should_fail/T1897b.stderr index ef35bac..f2f5250 100644 --- a/tests/indexed-types/should_fail/T1897b.stderr +++ b/tests/indexed-types/should_fail/T1897b.stderr @@ -1,6 +1,6 @@ T1897b.hs:16:1: - Could not deduce (Depend a0 ~ Depend a) + Could not deduce (Depend a ~ Depend a0) from the context (Bug a) bound by the inferred type for `isValid': Bug a => [Depend a] -> Bool diff --git a/tests/indexed-types/should_fail/T2544.stderr b/tests/indexed-types/should_fail/T2544.stderr index 6c977bf..d25e4b0 100644 --- a/tests/indexed-types/should_fail/T2544.stderr +++ b/tests/indexed-types/should_fail/T2544.stderr @@ -1,12 +1,12 @@ -T2544.hs:15:18: - Could not deduce (IxMap i0 ~ IxMap l) +T2544.hs:15:12: + Could not deduce (IxMap l ~ IxMap i0) from the context (Ix l, Ix r) bound by the instance declaration at T2544.hs:13:10-37 NB: `IxMap' is a type function, and may not be injective - Expected type: IxMap l [Int] - Actual type: IxMap i0 [Int] - In the first argument of `BiApp', namely `empty' + Expected type: IxMap (l :|: r) [Int] + Actual type: BiApp (IxMap i0) (IxMap r) [Int] + In the return type of a call of `BiApp' In the expression: BiApp empty empty In an equation for `empty': empty = BiApp empty empty diff --git a/tests/indexed-types/should_fail/T2627b.stderr b/tests/indexed-types/should_fail/T2627b.stderr index a8e2324..c0e03ce 100644 --- a/tests/indexed-types/should_fail/T2627b.stderr +++ b/tests/indexed-types/should_fail/T2627b.stderr @@ -1,7 +1,7 @@ T2627b.hs:20:24: Occurs check: cannot construct the infinite type: - a0 = Dual (Dual a0) + b0 = Dual (Dual b0) In the expression: conn undefined undefined In an equation for `conn': conn (Rd k) (Wr a r) = conn undefined undefined diff --git a/tests/indexed-types/should_fail/T2693.stderr b/tests/indexed-types/should_fail/T2693.stderr index 3acf815..9bbe1c3 100644 --- a/tests/indexed-types/should_fail/T2693.stderr +++ b/tests/indexed-types/should_fail/T2693.stderr @@ -1,6 +1,6 @@ T2693.hs:10:7: - Couldn't match type `TFn a0' with `TFn a' + Couldn't match type `TFn a' with `TFn a0' NB: `TFn' is a type function, and may not be injective When checking that `x' has the inferred type `forall a. TFn a' Probable cause: the inferred type is ambiguous diff --git a/tests/indexed-types/should_fail/T4099.stderr b/tests/indexed-types/should_fail/T4099.stderr index 1f5a917..4d19356 100644 --- a/tests/indexed-types/should_fail/T4099.stderr +++ b/tests/indexed-types/should_fail/T4099.stderr @@ -1,6 +1,6 @@ T4099.hs:11:14: - Couldn't match type `T b' with `T a0' + Couldn't match type `T a0' with `T b' NB: `T' is a type function, and may not be injective In the first argument of `foo', namely `x' In the expression: foo x _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
