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

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/9c7080f0949831980c03e44b3e49575a9fcf7f73

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

commit 9c7080f0949831980c03e44b3e49575a9fcf7f73
Author: Richard Eisenberg <e...@cis.upenn.edu>
Date:   Wed Nov 21 14:43:29 2012 -0500

    Updated stderr output on indexed-types tests

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

 tests/indexed-types/should_compile/T3017.stderr  |    2 +-
 tests/indexed-types/should_fail/Overlap10.stderr |    2 ++
 tests/indexed-types/should_fail/Overlap6.stderr  |    4 ++++
 tests/indexed-types/should_fail/Overlap9.stderr  |    3 +++
 4 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/tests/indexed-types/should_compile/T3017.stderr 
b/tests/indexed-types/should_compile/T3017.stderr
index 04a523d..30b5e01 100644
--- a/tests/indexed-types/should_compile/T3017.stderr
+++ b/tests/indexed-types/should_compile/T3017.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
   Coll :: * -> Constraint
   class Coll c
       RecFlag NonRecursive
-      type family Elem c1 :: *
+      type family Elem c :: *
       empty :: c insert :: Elem c -> c -> c
   ListColl :: * -> *
   data ListColl a
diff --git a/tests/indexed-types/should_fail/Overlap10.stderr 
b/tests/indexed-types/should_fail/Overlap10.stderr
index 22eb517..c8f68ba 100644
--- a/tests/indexed-types/should_fail/Overlap10.stderr
+++ b/tests/indexed-types/should_fail/Overlap10.stderr
@@ -1,5 +1,7 @@
 
 Overlap10.hs:11:5:
     Couldn't match expected type `F a Bool' with actual type `Bool'
+    Relevant bindings include
+      g :: F a Bool (bound at Overlap10.hs:11:1)
     In the expression: False
     In an equation for `g': g = False
diff --git a/tests/indexed-types/should_fail/Overlap6.stderr 
b/tests/indexed-types/should_fail/Overlap6.stderr
index 8bd6a1d..8149e2d 100644
--- a/tests/indexed-types/should_fail/Overlap6.stderr
+++ b/tests/indexed-types/should_fail/Overlap6.stderr
@@ -7,5 +7,9 @@ Overlap6.hs:16:7:
           at Overlap6.hs:15:6
     Expected type: Proxy Bool (And x 'True)
       Actual type: Proxy Bool x
+    Relevant bindings include
+      g :: Proxy Bool x -> Proxy Bool (And x 'True)
+        (bound at Overlap6.hs:16:1)
+      x :: Proxy Bool x (bound at Overlap6.hs:16:3)
     In the expression: x
     In an equation for `g': g x = x
diff --git a/tests/indexed-types/should_fail/Overlap9.stderr 
b/tests/indexed-types/should_fail/Overlap9.stderr
index 046d073..d70a76c 100644
--- a/tests/indexed-types/should_fail/Overlap9.stderr
+++ b/tests/indexed-types/should_fail/Overlap9.stderr
@@ -4,6 +4,9 @@ Overlap9.hs:11:7:
     from the context (Show a)
       bound by the type signature for g :: Show a => a -> F a
       at Overlap9.hs:10:6-23
+    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)



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

Reply via email to