[commit: testsuite] master: Error message wibbles (b8eca74)

[Simon Peyton Jones]

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

On branch  : master

https://github.com/ghc/testsuite/commit/b8eca74b2b0239822526eb2af715ed734e666f3f

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

commit b8eca74b2b0239822526eb2af715ed734e666f3f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Apr 23 09:14:36 2013 +0100

    Error message wibbles

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

 tests/ghci/scripts/Defer02.stderr            |    5 +++++
 tests/indexed-types/should_fail/T7786.stderr |   13 +------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/ghci/scripts/Defer02.stderr b/tests/ghci/scripts/Defer02.stderr
index 26cac57..b1fb11e 100644
--- a/tests/ghci/scripts/Defer02.stderr
+++ b/tests/ghci/scripts/Defer02.stderr
@@ -88,6 +88,11 @@
     In the type signature for ‛k’: k :: Int ~ Bool => Int -> Bool
 
 ../../typecheck/should_run/Defer01.hs:45:6: Warning:
+    Couldn't match expected type ‛Bool’ with actual type ‛Int’
+    In the ambiguity check for: Int ~ Bool => Int -> Bool
+    In the type signature for ‛k’: k :: Int ~ Bool => Int -> Bool
+
+../../typecheck/should_run/Defer01.hs:45:6: Warning:
     Couldn't match type ‛Int’ with ‛Bool’
     Inaccessible code in
       the type signature for k :: Int ~ Bool => Int -> Bool
diff --git a/tests/indexed-types/should_fail/T7786.stderr b/tests/indexed-types/should_fail/T7786.stderr
index 64febe6..359c84f 100644
--- a/tests/indexed-types/should_fail/T7786.stderr
+++ b/tests/indexed-types/should_fail/T7786.stderr
@@ -1,22 +1,11 @@
 
 T7786.hs:89:22:
-    Couldn't match type ‛Intersect
-                           [KeySegment] (BuriedUnder sub k ('Empty [KeySegment])) inv’
-                  with ‛'Empty [KeySegment]’
+    Couldn't match type ‛xxx’ with ‛'Empty [KeySegment]’
     Inaccessible code in
       a pattern with constructor
         Nil :: forall (k :: BOX). Sing (Inventory k) ('Empty k),
       in a pattern binding in
            'do' block
-    Relevant bindings include
-      addSub :: Database inv
-                -> Sing [KeySegment] k
-                -> Database sub
-                -> Maybe (Database (BuriedUnder sub k inv))
-        (bound at T7786.hs:89:1)
-      db :: Database inv (bound at T7786.hs:89:8)
-      k :: Sing [KeySegment] k (bound at T7786.hs:89:11)
-      sub :: Database sub (bound at T7786.hs:89:13)
     In the pattern: Nil
     In the pattern: Nil :: Sing xxx
     In a stmt of a 'do' block: