[commit: ghc] wip/T15050: Update more test output (b32988f)
git at git.haskell.org
git at git.haskell.org
Tue Jul 17 17:03:22 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/T15050
Link : http://ghc.haskell.org/trac/ghc/changeset/b32988f79b8025dfa6ef67f83b8360741b878abc/ghc
>---------------------------------------------------------------
commit b32988f79b8025dfa6ef67f83b8360741b878abc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Jul 17 13:02:48 2018 -0400
Update more test output
>---------------------------------------------------------------
b32988f79b8025dfa6ef67f83b8360741b878abc
testsuite/tests/typecheck/should_compile/all.T | 2 +-
testsuite/tests/typecheck/should_compile/tc141.stderr | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 8f14be2..7ae7007 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -620,7 +620,7 @@ test('SplitWD', normal, compile, [''])
# (2) Build the program twice: once with -dynamic, and then
# with -prof using -osuf to set a different object file suffix.
test('T14441', omit_ways(['profasm']), compile, [''])
-test('T15050', [expect_broken(15050)], compile, [''])
+test('T15050', normal, compile, [''])
test('T14735', normal, compile, [''])
test('T15180', normal, compile, [''])
test('T15232', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index f964303..f0cfdef 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -38,13 +38,12 @@ tc141.hs:13:13: error:
tc141.hs:15:18: error:
• 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
+ ‘a1’ is a rigid type variable bound by
the type signature for:
v :: forall a1. a1
at tc141.hs:14:14-19
- ‘p’ is a rigid type variable bound by
- the inferred type of g :: a -> p -> a1
+ ‘p1’ is a rigid type variable bound by
+ the inferred type of g :: p -> p1 -> a
at tc141.hs:(13,1)-(16,13)
• In the expression: b
In an equation for ‘v’: v = b
More information about the ghc-commits
mailing list