Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7228d50df2a07ce997e68d90cc023814e6b55af1

>---------------------------------------------------------------

commit 7228d50df2a07ce997e68d90cc023814e6b55af1
Author: Richard Eisenberg <e...@cis.upenn.edu>
Date:   Sat Jan 5 00:08:27 2013 -0500

    Updated stderr outputs to reflect changes in FamInst

>---------------------------------------------------------------

 .../indexed-types/should_fail/SimpleFail2a.stderr  |    8 ++------
 tests/indexed-types/should_fail/SimpleFail9.stderr |    3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/indexed-types/should_fail/SimpleFail2a.stderr 
b/tests/indexed-types/should_fail/SimpleFail2a.stderr
index 5769e47..9c1f1c9 100644
--- a/tests/indexed-types/should_fail/SimpleFail2a.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail2a.stderr
@@ -1,11 +1,7 @@
 
-SimpleFail2a.hs:11:11:
+SimpleFail2a.hs:11:3:
     Type indexes must match class instance head
     Found `a' but expected `Int'
     In the data declaration for `Sd'
+    In the data instance declaration for `Sd'
     In the instance declaration for `C Int'
-
-SimpleFail2a.hs:11:11:
-    Conflicting family instance declarations:
-      Sd a -- Defined at SimpleFail2a.hs:11:11
-      Sd Int -- Defined at SimpleFail2a.hs:12:11
diff --git a/tests/indexed-types/should_fail/SimpleFail9.stderr 
b/tests/indexed-types/should_fail/SimpleFail9.stderr
index 4eecbde..4d6ea1c 100644
--- a/tests/indexed-types/should_fail/SimpleFail9.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail9.stderr
@@ -1,6 +1,7 @@
 
-SimpleFail9.hs:13:8:
+SimpleFail9.hs:13:3:
     Type indexes must match class instance head
     Found `(b, Int)' but expected `(a, Int)'
     In the data declaration for `S7'
+    In the data instance declaration for `S7'
     In the instance declaration for `C7 Char (a, Int)'



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to