[commit: ghc] master: Trac #6022 is actually fine now (4721167)

[git at git.haskell.org]

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

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

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

commit 4721167a0118e4c8bc6c8266c3357a8a2ac4f4e2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Nov 27 14:32:38 2014 +0000

    Trac #6022 is actually fine now


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

4721167a0118e4c8bc6c8266c3357a8a2ac4f4e2
 testsuite/tests/typecheck/should_fail/T6022.stderr | 10 +++++-----
 testsuite/tests/typecheck/should_fail/all.T        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testsuite/tests/typecheck/should_fail/T6022.stderr b/testsuite/tests/typecheck/should_fail/T6022.stderr
index dffeccf..4408910 100644
--- a/testsuite/tests/typecheck/should_fail/T6022.stderr
+++ b/testsuite/tests/typecheck/should_fail/T6022.stderr
@@ -1,6 +1,6 @@
 
-T6022.hs:3:9:
-    No instance for (Eq ([a] -> a)) arising from a use of `=='
-    Possible fix: add an instance declaration for (Eq ([a] -> a))
-    In the expression: x == head
-    In an equation for `f': f x = x == head
+T6022.hs:3:1:
+    Non type-variable argument in the constraint: Eq ([a] -> a)
+    (Use FlexibleContexts to permit this)
+    When checking that ‘f’ has the inferred type
+      f :: forall a. Eq ([a] -> a) => ([a] -> a) -> Bool
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 05f77bb..96c1908 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -274,7 +274,7 @@ test('T5684', normal, compile_fail, [''])
 test('T5858', normal, compile_fail, [''])
 test('T5957', normal, compile_fail, [''])
 test('T6001', normal, compile_fail, [''])
-test('T6022', expect_broken(6022), compile_fail, [''])
+test('T6022', normal, compile_fail, [''])
 test('T5853', normal, compile_fail, [''])
 test('T6078', normal, compile_fail, [''])
 test('FDsFromGivens', normal, compile_fail, [''])