[commit: testsuite] master: Follow error-message changes for type holes (61d9b43)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/61d9b43dfc5d40062b5bce1cf352a22a72b41882/testsuite

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

commit 61d9b43dfc5d40062b5bce1cf352a22a72b41882
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Aug 28 16:41:50 2013 +0100

    Follow error-message changes for type holes


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

61d9b43dfc5d40062b5bce1cf352a22a72b41882
 tests/typecheck/should_compile/holes.stderr  |   17 ++++++++++++++++-
 tests/typecheck/should_compile/holes2.stderr |    1 +
 tests/typecheck/should_compile/holes3.stderr |   17 ++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/tests/typecheck/should_compile/holes.stderr b/tests/typecheck/should_compile/holes.stderr
index 6f00061..58d8959 100644
--- a/tests/typecheck/should_compile/holes.stderr
+++ b/tests/typecheck/should_compile/holes.stderr
@@ -3,17 +3,29 @@ holes.hs:5:5: Warning:
     Found hole ‛_’ with type: t
     Where: ‛t’ is a rigid type variable bound by
                the inferred type of f :: t at holes.hs:5:1
-    Relevant bindings include f :: t (bound at holes.hs:5:1)
+    Relevant bindings include
+      z :: forall a. [a] -> [a] (bound at holes.hs:13:1)
+      h :: [Char] (bound at holes.hs:10:1)
+      g :: Int -> Char (bound at holes.hs:8:1)
+      f :: t (bound at holes.hs:5:1)
     In the expression: _
     In an equation for ‛f’: f = _
 
 holes.hs:8:7: Warning:
     Found hole ‛_’ with type: Char
+    Relevant bindings include
+      z :: forall a. [a] -> [a] (bound at holes.hs:13:1)
+      h :: [Char] (bound at holes.hs:10:1)
+      g :: Int -> Char (bound at holes.hs:8:1)
+      x :: Int (bound at holes.hs:8:3)
     In the expression: _
     In an equation for ‛g’: g x = _
 
 holes.hs:10:5: Warning:
     Found hole ‛_’ with type: [Char]
+    Relevant bindings include
+      z :: forall a. [a] -> [a] (bound at holes.hs:13:1)
+      h :: [Char] (bound at holes.hs:10:1)
     In the first argument of ‛(++)’, namely ‛_’
     In the expression: _ ++ "a"
     In an equation for ‛h’: h = _ ++ "a"
@@ -21,6 +33,9 @@ holes.hs:10:5: Warning:
 holes.hs:13:15: Warning:
     Found hole ‛_’ with type: b0
     Where: ‛b0’ is an ambiguous type variable
+    Relevant bindings include
+      z :: [a] -> [a] (bound at holes.hs:13:1)
+      y :: [a] (bound at holes.hs:13:3)
     In the second argument of ‛const’, namely ‛_’
     In the expression: const y _
     In an equation for ‛z’: z y = const y _
diff --git a/tests/typecheck/should_compile/holes2.stderr b/tests/typecheck/should_compile/holes2.stderr
index 5ceb46e..4e0befe 100644
--- a/tests/typecheck/should_compile/holes2.stderr
+++ b/tests/typecheck/should_compile/holes2.stderr
@@ -14,6 +14,7 @@ holes2.hs:5:5: Warning:
 holes2.hs:5:10: Warning:
     Found hole ‛_’ with type: a0
     Where: ‛a0’ is an ambiguous type variable
+    Relevant bindings include f :: String (bound at holes2.hs:5:1)
     In the first argument of ‛show’, namely ‛_’
     In the expression: show _
     In an equation for ‛f’: f = show _
diff --git a/tests/typecheck/should_compile/holes3.stderr b/tests/typecheck/should_compile/holes3.stderr
index a945e5e..dfe6031 100644
--- a/tests/typecheck/should_compile/holes3.stderr
+++ b/tests/typecheck/should_compile/holes3.stderr
@@ -3,17 +3,29 @@ holes3.hs:5:5:
     Found hole ‛_’ with type: t
     Where: ‛t’ is a rigid type variable bound by
                the inferred type of f :: t at holes3.hs:5:1
-    Relevant bindings include f :: t (bound at holes3.hs:5:1)
+    Relevant bindings include
+      z :: forall a. [a] -> [a] (bound at holes3.hs:13:1)
+      h :: [Char] (bound at holes3.hs:10:1)
+      g :: Int -> Char (bound at holes3.hs:8:1)
+      f :: t (bound at holes3.hs:5:1)
     In the expression: _
     In an equation for ‛f’: f = _
 
 holes3.hs:8:7:
     Found hole ‛_gr’ with type: Char
+    Relevant bindings include
+      z :: forall a. [a] -> [a] (bound at holes3.hs:13:1)
+      h :: [Char] (bound at holes3.hs:10:1)
+      g :: Int -> Char (bound at holes3.hs:8:1)
+      x :: Int (bound at holes3.hs:8:3)
     In the expression: _gr
     In an equation for ‛g’: g x = _gr
 
 holes3.hs:10:5:
     Found hole ‛_aa’ with type: [Char]
+    Relevant bindings include
+      z :: forall a. [a] -> [a] (bound at holes3.hs:13:1)
+      h :: [Char] (bound at holes3.hs:10:1)
     In the first argument of ‛(++)’, namely ‛_aa’
     In the expression: _aa ++ "a"
     In an equation for ‛h’: h = _aa ++ "a"
@@ -21,6 +33,9 @@ holes3.hs:10:5:
 holes3.hs:13:15:
     Found hole ‛_x’ with type: b0
     Where: ‛b0’ is an ambiguous type variable
+    Relevant bindings include
+      z :: [a] -> [a] (bound at holes3.hs:13:1)
+      y :: [a] (bound at holes3.hs:13:3)
     In the second argument of ‛const’, namely ‛_x’
     In the expression: const y _x
     In an equation for ‛z’: z y = const y _x