[commit: testsuite] master: Update test output following change to associated type synonym default kind-checking time (673b434)
Max Bolingbroke
batterseapower at hotmail.com
Mon Sep 26 11:14:39 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/673b434e3966db54c8bc1d1c0a35e0b4ebf58abe
>---------------------------------------------------------------
commit 673b434e3966db54c8bc1d1c0a35e0b4ebf58abe
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date: Mon Sep 26 09:32:21 2011 +0100
Update test output following change to associated type synonym default kind-checking time
>---------------------------------------------------------------
.../indexed-types/should_fail/SimpleFail1b.stderr | 3 ++-
tests/indexed-types/should_fail/SimpleFail4.stderr | 2 +-
tests/typecheck/should_fail/AssocTyDef02.stderr | 2 +-
tests/typecheck/should_fail/AssocTyDef03.stderr | 2 +-
tests/typecheck/should_fail/AssocTyDef04.stderr | 2 +-
tests/typecheck/should_fail/AssocTyDef05.stderr | 2 +-
tests/typecheck/should_fail/AssocTyDef06.stderr | 5 +++--
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/indexed-types/should_fail/SimpleFail1b.stderr b/tests/indexed-types/should_fail/SimpleFail1b.stderr
index e4db86b..8ac486e 100644
--- a/tests/indexed-types/should_fail/SimpleFail1b.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail1b.stderr
@@ -1,4 +1,5 @@
SimpleFail1b.hs:4:1:
- Family instance has too many parameters: `T1'
+ Kind mis-match
+ Expected kind `* -> * -> k0 -> k1', but `T1' has kind `* -> * -> *'
In the data type instance declaration for `T1'
diff --git a/tests/indexed-types/should_fail/SimpleFail4.stderr b/tests/indexed-types/should_fail/SimpleFail4.stderr
index 220c93a..71164f7 100644
--- a/tests/indexed-types/should_fail/SimpleFail4.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail4.stderr
@@ -2,5 +2,5 @@
SimpleFail4.hs:8:3:
Type indexes must match class instance head
Found `Int' but expected `a'
- In the type synonym instance declaration for `S2'
+ In the type synonym instance default declaration for `S2'
In the class declaration for `C2'
diff --git a/tests/typecheck/should_fail/AssocTyDef02.stderr b/tests/typecheck/should_fail/AssocTyDef02.stderr
index 9facede..93832ed 100644
--- a/tests/typecheck/should_fail/AssocTyDef02.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef02.stderr
@@ -2,5 +2,5 @@
AssocTyDef02.hs:6:5:
Type indexes must match class instance head
Found `b' but expected `a'
- In the type synonym instance declaration for `Typ'
+ In the type synonym instance default declaration for `Typ'
In the class declaration for `Cls'
diff --git a/tests/typecheck/should_fail/AssocTyDef03.stderr b/tests/typecheck/should_fail/AssocTyDef03.stderr
index 2572980..668857a 100644
--- a/tests/typecheck/should_fail/AssocTyDef03.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef03.stderr
@@ -1,5 +1,5 @@
AssocTyDef03.hs:6:5:
Wrong category of family instance; declaration was for a data type
- In the type synonym instance declaration for `Typ'
+ In the type synonym instance default declaration for `Typ'
In the class declaration for `Cls'
diff --git a/tests/typecheck/should_fail/AssocTyDef04.stderr b/tests/typecheck/should_fail/AssocTyDef04.stderr
index 5eb9024..e7c32f0 100644
--- a/tests/typecheck/should_fail/AssocTyDef04.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef04.stderr
@@ -3,5 +3,5 @@ AssocTyDef04.hs:6:18:
`Maybe' is not applied to enough type arguments
Expected kind `*', but `Maybe' has kind `* -> *'
In the type `Maybe'
- In the type synonym instance declaration for `Typ'
+ In the type synonym instance default declaration for `Typ'
In the class declaration for `Cls'
diff --git a/tests/typecheck/should_fail/AssocTyDef05.stderr b/tests/typecheck/should_fail/AssocTyDef05.stderr
index 0518c84..181f9f6 100644
--- a/tests/typecheck/should_fail/AssocTyDef05.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef05.stderr
@@ -1,5 +1,5 @@
AssocTyDef05.hs:6:5:
Number of parameters must match family declaration; expected 1
- In the type synonym instance declaration for `Typ'
+ In the type synonym instance default declaration for `Typ'
In the class declaration for `Cls'
diff --git a/tests/typecheck/should_fail/AssocTyDef06.stderr b/tests/typecheck/should_fail/AssocTyDef06.stderr
index 7c79207..d71a83b 100644
--- a/tests/typecheck/should_fail/AssocTyDef06.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef06.stderr
@@ -1,5 +1,6 @@
AssocTyDef06.hs:6:5:
- Family instance has too many parameters: `Typ'
- In the type synonym instance declaration for `Typ'
+ Kind mis-match
+ Expected kind `k0 -> k1 -> k2', but `Typ' has kind `k0 -> *'
+ In the type synonym instance default declaration for `Typ'
In the class declaration for `Cls'
More information about the Cvs-ghc
mailing list