[commit: ghc] master: testsuite: tweak error messages for new Show instance (f37bb54)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f37bb548157dae1e8c59d054c488b905c0f5abe0/ghc

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

commit f37bb548157dae1e8c59d054c488b905c0f5abe0
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Fri Feb 12 17:43:18 2016 +0000

    testsuite: tweak error messages for new Show instance
    
    be3d7f661968a7b8c6751c0be3bf23e703b32c3e added Show
    instance for Callstack.
    
    That made a couple of error messages to drift as:
    
                 instance Show Ordering -- Defined in ‘GHC.Show’
                 instance Show Integer -- Defined in ‘GHC.Show’
                 ...plus 23 others
        -        ...plus 20 instances involving out-of-scope types
        +        ...plus 21 instances involving out-of-scope types
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

f37bb548157dae1e8c59d054c488b905c0f5abe0
 testsuite/tests/ghci.debugger/scripts/break006.stderr                 | 4 ++--
 testsuite/tests/ghci.debugger/scripts/print019.stderr                 | 2 +-
 .../tests/overloadedlists/should_fail/overloadedlistsfail01.stderr    | 4 ++--
 testsuite/tests/typecheck/should_compile/holes2.stderr                | 2 +-
 testsuite/tests/typecheck/should_fail/tcfail133.stderr                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index 68fa3bd..79656bc 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
@@ -10,7 +10,7 @@
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show Integer -- Defined in ‘GHC.Show’
         ...plus 23 others
-        ...plus 20 instances involving out-of-scope types
+        ...plus 21 instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In a stmt of an interactive GHCi command: print it
 
@@ -25,6 +25,6 @@
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show Integer -- Defined in ‘GHC.Show’
         ...plus 23 others
-        ...plus 20 instances involving out-of-scope types
+        ...plus 21 instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr
index e9f9d53..2282681 100644
--- a/testsuite/tests/ghci.debugger/scripts/print019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr
@@ -9,6 +9,6 @@
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show Integer -- Defined in ‘GHC.Show’
         ...plus 30 others
-        ...plus 9 instances involving out-of-scope types
+        ...plus 10 instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr b/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr
index 56934ab..0faaaec 100644
--- a/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr
+++ b/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr
@@ -8,7 +8,7 @@ overloadedlistsfail01.hs:5:8: error:
         instance Show Integer -- Defined in ‘GHC.Show’
         instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’
         ...plus 22 others
-        ...plus five instances involving out-of-scope types
+        ...plus six instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In the expression: print [1]
       In an equation for ‘main’: main = print [1]
@@ -19,7 +19,7 @@ overloadedlistsfail01.hs:5:14: error:
       Probable fix: use a type annotation to specify what ‘a0’ should be.
       These potential instances exist:
         instance GHC.Exts.IsList [a] -- Defined in ‘GHC.Exts’
-        ...plus one instance involving out-of-scope types
+        ...plus two instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In the first argument of ‘print’, namely ‘[1]’
       In the expression: print [1]
diff --git a/testsuite/tests/typecheck/should_compile/holes2.stderr b/testsuite/tests/typecheck/should_compile/holes2.stderr
index 00fb9ff..08d1b46 100644
--- a/testsuite/tests/typecheck/should_compile/holes2.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes2.stderr
@@ -8,7 +8,7 @@ holes2.hs:3:5: warning:
         instance Show Integer -- Defined in ‘GHC.Show’
         instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’
         ...plus 22 others
-        ...plus four instances involving out-of-scope types
+        ...plus five instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In the expression: show _
       In an equation for ‘f’: f = show _
diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
index 0fb4973..72dc14e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
@@ -12,7 +12,7 @@ tcfail133.hs:68:7: error:
         instance (Show a, Show b, Number a, Digit b) => Show (a :@ b)
           -- Defined at tcfail133.hs:11:54
         ...plus 25 others
-        ...plus four instances involving out-of-scope types
+        ...plus five instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In the expression: show $ add (One :@ Zero) (One :@ One)
       In an equation for ‘foo’: