[commit: ghc] wip/T15050: Update test suite output (1c8605c)

[git at git.haskell.org]

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

On branch  : wip/T15050
Link       : http://ghc.haskell.org/trac/ghc/changeset/1c8605c64e7e101a53e8ec948d4c15e920850027/ghc

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

commit 1c8605c64e7e101a53e8ec948d4c15e920850027
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Apr 23 13:17:17 2018 -0400

    Update test suite output
    
    test #15050 passes now (duh).
    
    Other outputs now no longer trip over type variables in pattern
    signatures being bound to full types, and thus give different error
    messages, but nothing worrying, as far as I can tell.


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

1c8605c64e7e101a53e8ec948d4c15e920850027
 testsuite/tests/typecheck/should_compile/all.T        |  2 +-
 testsuite/tests/typecheck/should_compile/tc141.stderr | 12 ++++++------
 testsuite/tests/typecheck/should_fail/T5689.stderr    | 14 +++++---------
 testsuite/tests/typecheck/should_fail/T5691.stderr    |  9 ---------
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 80a8b0e..690ead6 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -602,4 +602,4 @@ test('T14934', [extra_files(['T14934.hs', 'T14934a.hs'])], run_command,
 test('T13643', normal, compile, [''])
 test('SplitWD', normal, compile, [''])
 test('T14441', normal, compile, [''])
-test('T15050', [expect_broken(15050)], compile, [''])
+test('T15050', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index 9c13f17..5fa0854 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -35,11 +35,11 @@ tc141.hs:13:13: error:
         in v
 
 tc141.hs:15:18: error:
-    • Couldn't match expected type ‘a2’ with actual type ‘p’
-        because type variable ‘a2’ would escape its scope
+    • Couldn't match expected type ‘a1’ with actual type ‘p1’
+        because type variable ‘a1’ would escape its scope
       This (rigid, skolem) type variable is bound by
         the type signature for:
-          v :: forall a2. a2
+          v :: forall a1. a1
         at tc141.hs:14:14-19
     • In the expression: b
       In an equation for ‘v’: v = b
@@ -49,6 +49,6 @@ tc141.hs:15:18: error:
           v = b
         in v
     • Relevant bindings include
-        v :: a2 (bound at tc141.hs:15:14)
-        b :: p (bound at tc141.hs:13:5)
-        g :: a -> p -> a1 (bound at tc141.hs:13:1)
+        v :: a1 (bound at tc141.hs:15:14)
+        b :: p1 (bound at tc141.hs:13:5)
+        g :: p -> p1 -> a (bound at tc141.hs:13:1)
diff --git a/testsuite/tests/typecheck/should_fail/T5689.stderr b/testsuite/tests/typecheck/should_fail/T5689.stderr
index 2c7eaa8..5385f57 100644
--- a/testsuite/tests/typecheck/should_fail/T5689.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5689.stderr
@@ -1,10 +1,6 @@
 
-T5689.hs:10:36: error:
-    • Couldn't match expected type ‘Bool’ with actual type ‘t’
-    • In the expression: v
-      In the expression: if v then False else True
-      In the second argument of ‘writeIORef’, namely
-        ‘(\ v -> if v then False else True)’
-    • Relevant bindings include
-        v :: t (bound at T5689.hs:10:28)
-        r :: IORef (t -> t) (bound at T5689.hs:7:14)
+T5689.hs:15:23: error:
+    • No instance for (Num Bool) arising from the literal ‘1234’
+    • In the first argument of ‘c’, namely ‘1234’
+      In the second argument of ‘($)’, namely ‘c 1234’
+      In a stmt of a 'do' block: print $ c 1234
diff --git a/testsuite/tests/typecheck/should_fail/T5691.stderr b/testsuite/tests/typecheck/should_fail/T5691.stderr
index ad5c7e4..d06a4f4 100644
--- a/testsuite/tests/typecheck/should_fail/T5691.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5691.stderr
@@ -1,13 +1,4 @@
 
-T5691.hs:14:9: error:
-    • Couldn't match type ‘p’ with ‘PrintRuleInterp’
-      Expected type: PrintRuleInterp a
-        Actual type: p a
-    • When checking that the pattern signature: p a
-        fits the type of its context: PrintRuleInterp a
-      In the pattern: f :: p a
-      In an equation for ‘test’: test (f :: p a) = MkPRI $ printRule_ f
-
 T5691.hs:24:10: error:
     • No instance for (Alternative RecDecParser)
         arising from the superclasses of an instance declaration