Merge branch 'master' of http://darcs.haskell.org/testsuite

testsuite/tests/typecheck/should_compile/tc145.hs

-{-# LANGUAGE ImplicitParams, UnboxedTuples #-}
+{-# LANGUAGE RankNTypes, ImplicitParams, UnboxedTuples #-}
 
 -- Test two slightly exotic things about type signatures
 

testsuite/tests/typecheck/should_compile/tc158.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Types should be checked for well-formedness only after
 -- expanding type synonyms.  GHC 5.03 fails this

testsuite/tests/typecheck/should_compile/tc230.hs

-{-# LANGUAGE ImplicitParams #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- Trac #1445
 

testsuite/tests/typecheck/should_fail/T2714.hs

-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE ScopedTypeVariables, RankNTypes #-}
 
 -- Trac #2714
 

testsuite/tests/typecheck/should_fail/T5957.hs

+module T5957 where
+
+flex :: Int -> Show a => a -> String
+flex i a = show a ++ show i

testsuite/tests/typecheck/should_fail/T5957.stderr

+
+T5957.hs:3:9:
+    Illegal polymorphic or qualified type: Show a => a -> String
+    Perhaps you intended to use -XRankNTypes or -XRank2Types
+    In the type signature for `flex':
+      flex :: Int -> Show a => a -> String

testsuite/tests/typecheck/should_fail/all.T

@@ -271,3 +271,4 @@ test('T5573b', normal, compile_fail, [''])
 test('T5689', normal, compile_fail, [''])
 test('T5684', normal, compile_fail, [''])
 test('T5858', normal, compile_fail, [''])
+test('T5957', normal, compile_fail, [''])