summaryrefslogtreecommitdiff
path: root/testsuite/tests/typecheck
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2012-10-19 01:49:14 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2012-10-19 01:49:14 +0100
commit09cdd12b22bcff1876ea80c0d9878507c2ed4f1f (patch)
treec6474515aa1e2ce3bb6cb9a090f121c0b339be5f /testsuite/tests/typecheck
parentc673422336f4b1a2d5280adddc00a4ab9209426b (diff)
downloadhaskell-09cdd12b22bcff1876ea80c0d9878507c2ed4f1f.tar.gz
Replace Rank2Types and PolymorphicComponents by RankNTypes
Diffstat (limited to 'testsuite/tests/typecheck')
-rw-r--r--testsuite/tests/typecheck/should_compile/T2494-2.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/T2494.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/T2683.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/T3018.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/T4355.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/T5655.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/faxen.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc087.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc092.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc097.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc102.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc105.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc124.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc140.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc144.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc146.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc148.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc157.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc160.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc161.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc162.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc166.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc183.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc194.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc198.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc203.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc206.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc208.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc210.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc213.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc222.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc229.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc233.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc236.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/T7019.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/T7019a.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail076.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail088.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail104.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail110.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail122.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail188.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail201.hs2
43 files changed, 43 insertions, 43 deletions
diff --git a/testsuite/tests/typecheck/should_compile/T2494-2.hs b/testsuite/tests/typecheck/should_compile/T2494-2.hs
index b672cb0a47..543f8f47fe 100644
--- a/testsuite/tests/typecheck/should_compile/T2494-2.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494-2.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
-- Trac #2494, should compile ok
diff --git a/testsuite/tests/typecheck/should_compile/T2494.hs b/testsuite/tests/typecheck/should_compile/T2494.hs
index 55d80a23eb..3e6c09c39c 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
-- Trac #2494, should generate an error message
diff --git a/testsuite/tests/typecheck/should_compile/T2683.hs b/testsuite/tests/typecheck/should_compile/T2683.hs
index 3e8e9e5892..c36eaad9bc 100644
--- a/testsuite/tests/typecheck/should_compile/T2683.hs
+++ b/testsuite/tests/typecheck/should_compile/T2683.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE ExistentialQuantification, MultiParamTypeClasses,
- FunctionalDependencies, Rank2Types #-}
+ FunctionalDependencies, RankNTypes #-}
module Q where
diff --git a/testsuite/tests/typecheck/should_compile/T3018.hs b/testsuite/tests/typecheck/should_compile/T3018.hs
index ffecfc2788..a0868afa24 100644
--- a/testsuite/tests/typecheck/should_compile/T3018.hs
+++ b/testsuite/tests/typecheck/should_compile/T3018.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE OverlappingInstances , UndecidableInstances, EmptyDataDecls #-}
-{-# LANGUAGE Rank2Types, KindSignatures, MultiParamTypeClasses, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, KindSignatures, MultiParamTypeClasses, FlexibleInstances #-}
-- Works with new constraint solver
diff --git a/testsuite/tests/typecheck/should_compile/T4355.hs b/testsuite/tests/typecheck/should_compile/T4355.hs
index 8eff366cdc..712430d4f0 100644
--- a/testsuite/tests/typecheck/should_compile/T4355.hs
+++ b/testsuite/tests/typecheck/should_compile/T4355.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, Rank2Types, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards, DatatypeContexts #-}
+{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, RankNTypes, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards, DatatypeContexts #-}
module T4355 where
diff --git a/testsuite/tests/typecheck/should_compile/T5655.hs b/testsuite/tests/typecheck/should_compile/T5655.hs
index 429f50e56a..232ea6bec2 100644
--- a/testsuite/tests/typecheck/should_compile/T5655.hs
+++ b/testsuite/tests/typecheck/should_compile/T5655.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, GADTs, ConstraintKinds, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, GADTs, ConstraintKinds, RankNTypes #-}
module T5655 where
import GHC.Prim (Constraint)
diff --git a/testsuite/tests/typecheck/should_compile/faxen.hs b/testsuite/tests/typecheck/should_compile/faxen.hs
index c7310529c6..ddc8f7b90d 100644
--- a/testsuite/tests/typecheck/should_compile/faxen.hs
+++ b/testsuite/tests/typecheck/should_compile/faxen.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- A classic test for type inference
-- Taken from "Haskell and principal types", Section 3
diff --git a/testsuite/tests/typecheck/should_compile/tc087.hs b/testsuite/tests/typecheck/should_compile/tc087.hs
index f70472b57c..8ea1901489 100644
--- a/testsuite/tests/typecheck/should_compile/tc087.hs
+++ b/testsuite/tests/typecheck/should_compile/tc087.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
module ShouldSucceed where
diff --git a/testsuite/tests/typecheck/should_compile/tc092.hs b/testsuite/tests/typecheck/should_compile/tc092.hs
index 2f129026a7..b421809b8f 100644
--- a/testsuite/tests/typecheck/should_compile/tc092.hs
+++ b/testsuite/tests/typecheck/should_compile/tc092.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
module ShouldSucceed where
diff --git a/testsuite/tests/typecheck/should_compile/tc097.hs b/testsuite/tests/typecheck/should_compile/tc097.hs
index a65d529dd3..4ec2a17395 100644
--- a/testsuite/tests/typecheck/should_compile/tc097.hs
+++ b/testsuite/tests/typecheck/should_compile/tc097.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- !!! Local universal quantification.
module ShouldSucceed where
diff --git a/testsuite/tests/typecheck/should_compile/tc102.hs b/testsuite/tests/typecheck/should_compile/tc102.hs
index c71b2d0ec0..0bfa55114f 100644
--- a/testsuite/tests/typecheck/should_compile/tc102.hs
+++ b/testsuite/tests/typecheck/should_compile/tc102.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
-- !!! Caused ghc-4.04proto to report a bogus type error
-- !!! (as reported by Keith)
diff --git a/testsuite/tests/typecheck/should_compile/tc105.hs b/testsuite/tests/typecheck/should_compile/tc105.hs
index 6f35fff7fb..b7b8df2fad 100644
--- a/testsuite/tests/typecheck/should_compile/tc105.hs
+++ b/testsuite/tests/typecheck/should_compile/tc105.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_compile/tc124.hs b/testsuite/tests/typecheck/should_compile/tc124.hs
index cd2362be4f..fcf3c5e48f 100644
--- a/testsuite/tests/typecheck/should_compile/tc124.hs
+++ b/testsuite/tests/typecheck/should_compile/tc124.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- !!! Rank 2 polymorphism
-- Both f and g are rejected by Hugs [April 2001]
diff --git a/testsuite/tests/typecheck/should_compile/tc140.hs b/testsuite/tests/typecheck/should_compile/tc140.hs
index 6536e3d47d..23709fb617 100644
--- a/testsuite/tests/typecheck/should_compile/tc140.hs
+++ b/testsuite/tests/typecheck/should_compile/tc140.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- Make sure for-alls can occur in data types
diff --git a/testsuite/tests/typecheck/should_compile/tc144.hs b/testsuite/tests/typecheck/should_compile/tc144.hs
index 29185c8bc4..bb55310415 100644
--- a/testsuite/tests/typecheck/should_compile/tc144.hs
+++ b/testsuite/tests/typecheck/should_compile/tc144.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
-- Rank-2 types with implicit parameters.
-- GHC 5.02 erroneously rejected this
diff --git a/testsuite/tests/typecheck/should_compile/tc146.hs b/testsuite/tests/typecheck/should_compile/tc146.hs
index 4f44e908cf..bc50069983 100644
--- a/testsuite/tests/typecheck/should_compile/tc146.hs
+++ b/testsuite/tests/typecheck/should_compile/tc146.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- The interesting thign about this one is that
-- there's an unbound type variable of kind *->*
diff --git a/testsuite/tests/typecheck/should_compile/tc148.hs b/testsuite/tests/typecheck/should_compile/tc148.hs
index c66f723550..2874426413 100644
--- a/testsuite/tests/typecheck/should_compile/tc148.hs
+++ b/testsuite/tests/typecheck/should_compile/tc148.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- This program tickled a bug in 5.02.2's forall-lifting
diff --git a/testsuite/tests/typecheck/should_compile/tc157.hs b/testsuite/tests/typecheck/should_compile/tc157.hs
index 5e4b711393..ae6faf95de 100644
--- a/testsuite/tests/typecheck/should_compile/tc157.hs
+++ b/testsuite/tests/typecheck/should_compile/tc157.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- Test silly type synonyms
diff --git a/testsuite/tests/typecheck/should_compile/tc160.hs b/testsuite/tests/typecheck/should_compile/tc160.hs
index bf88fc3159..2425221aee 100644
--- a/testsuite/tests/typecheck/should_compile/tc160.hs
+++ b/testsuite/tests/typecheck/should_compile/tc160.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
--Tests alpha-renaming in with extended type-synonyms
diff --git a/testsuite/tests/typecheck/should_compile/tc161.hs b/testsuite/tests/typecheck/should_compile/tc161.hs
index 44f41a57b4..7cb1272b6e 100644
--- a/testsuite/tests/typecheck/should_compile/tc161.hs
+++ b/testsuite/tests/typecheck/should_compile/tc161.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- Blew up GHC 5.04, with:
-- Ambiguous type variable(s) `q' in the constraint `Foo q'
-- arising from a function with an overloaded argument type at Foo.hs:7
diff --git a/testsuite/tests/typecheck/should_compile/tc162.hs b/testsuite/tests/typecheck/should_compile/tc162.hs
index 91a3272a92..88da03fe0b 100644
--- a/testsuite/tests/typecheck/should_compile/tc162.hs
+++ b/testsuite/tests/typecheck/should_compile/tc162.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- These ones failed with 5.04. They need a coercion
-- in the pattern matching compiler, so they are a bit
diff --git a/testsuite/tests/typecheck/should_compile/tc166.hs b/testsuite/tests/typecheck/should_compile/tc166.hs
index 2e69c3ad56..75ea65c650 100644
--- a/testsuite/tests/typecheck/should_compile/tc166.hs
+++ b/testsuite/tests/typecheck/should_compile/tc166.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies,
- ExistentialQuantification, Rank2Types,
+ ExistentialQuantification, RankNTypes,
FlexibleInstances #-}
-- Arguably, the type signature for f1 should be enough to make
diff --git a/testsuite/tests/typecheck/should_compile/tc183.hs b/testsuite/tests/typecheck/should_compile/tc183.hs
index 5015af3c91..a565ab04ab 100644
--- a/testsuite/tests/typecheck/should_compile/tc183.hs
+++ b/testsuite/tests/typecheck/should_compile/tc183.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ExistentialQuantification, Rank2Types #-}
+{-# LANGUAGE ExistentialQuantification, RankNTypes #-}
-- An interesting interaction of universals and existentials, prompted by
-- http://www.haskell.org/pipermail/haskell-cafe/2004-October/007160.html
diff --git a/testsuite/tests/typecheck/should_compile/tc194.hs b/testsuite/tests/typecheck/should_compile/tc194.hs
index 07b0ed4f02..c9eae1e4cf 100644
--- a/testsuite/tests/typecheck/should_compile/tc194.hs
+++ b/testsuite/tests/typecheck/should_compile/tc194.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
-- Tests the special case of
-- non-recursive, function binding,
diff --git a/testsuite/tests/typecheck/should_compile/tc198.hs b/testsuite/tests/typecheck/should_compile/tc198.hs
index e931ac5cb8..9df5d9f483 100644
--- a/testsuite/tests/typecheck/should_compile/tc198.hs
+++ b/testsuite/tests/typecheck/should_compile/tc198.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
-- This should work, because the type sig and the type
-- in the pattern match exactly
diff --git a/testsuite/tests/typecheck/should_compile/tc203.hs b/testsuite/tests/typecheck/should_compile/tc203.hs
index 2579896458..a2a361514a 100644
--- a/testsuite/tests/typecheck/should_compile/tc203.hs
+++ b/testsuite/tests/typecheck/should_compile/tc203.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- Check that we can have a forall after a forall
diff --git a/testsuite/tests/typecheck/should_compile/tc206.hs b/testsuite/tests/typecheck/should_compile/tc206.hs
index c54618950a..68e751c0de 100644
--- a/testsuite/tests/typecheck/should_compile/tc206.hs
+++ b/testsuite/tests/typecheck/should_compile/tc206.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- This one showed up a bug in pre-subsumption
diff --git a/testsuite/tests/typecheck/should_compile/tc208.hs b/testsuite/tests/typecheck/should_compile/tc208.hs
index 0bfb1d4e81..0874d0249b 100644
--- a/testsuite/tests/typecheck/should_compile/tc208.hs
+++ b/testsuite/tests/typecheck/should_compile/tc208.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
-- This program failed to typecheck in an early version of
-- GHC with impredicative polymorphism, but it was fixed by
diff --git a/testsuite/tests/typecheck/should_compile/tc210.hs b/testsuite/tests/typecheck/should_compile/tc210.hs
index a2cc717122..b4a377f761 100644
--- a/testsuite/tests/typecheck/should_compile/tc210.hs
+++ b/testsuite/tests/typecheck/should_compile/tc210.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_compile/tc213.hs b/testsuite/tests/typecheck/should_compile/tc213.hs
index e9e3069e7b..1f0b46449a 100644
--- a/testsuite/tests/typecheck/should_compile/tc213.hs
+++ b/testsuite/tests/typecheck/should_compile/tc213.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables, FlexibleInstances,
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, FlexibleInstances,
MultiParamTypeClasses, FunctionalDependencies #-}
-- This tests scoped type variables, used in an expression
diff --git a/testsuite/tests/typecheck/should_compile/tc222.hs b/testsuite/tests/typecheck/should_compile/tc222.hs
index 4c418ca232..ee8fb1cb6f 100644
--- a/testsuite/tests/typecheck/should_compile/tc222.hs
+++ b/testsuite/tests/typecheck/should_compile/tc222.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
-- Tests impredivative polymorphism with left-to-right
-- flow information; see the uses of "$"
diff --git a/testsuite/tests/typecheck/should_compile/tc229.hs b/testsuite/tests/typecheck/should_compile/tc229.hs
index bf48342ee9..5c879fd89b 100644
--- a/testsuite/tests/typecheck/should_compile/tc229.hs
+++ b/testsuite/tests/typecheck/should_compile/tc229.hs
@@ -2,7 +2,7 @@
-- trac #1406: Constraint doesn't reduce in the presence of quantified
-- type variables
-{-# LANGUAGE FlexibleInstances, UndecidableInstances, Rank2Types,
+{-# LANGUAGE FlexibleInstances, UndecidableInstances, RankNTypes,
MultiParamTypeClasses, FunctionalDependencies #-}
module Problem where
diff --git a/testsuite/tests/typecheck/should_compile/tc233.hs b/testsuite/tests/typecheck/should_compile/tc233.hs
index 6421ae7a82..0f031e0fcf 100644
--- a/testsuite/tests/typecheck/should_compile/tc233.hs
+++ b/testsuite/tests/typecheck/should_compile/tc233.hs
@@ -1,5 +1,5 @@
-{-# OPTIONS_GHC -XPolymorphicComponents #-}
+{-# LANGUAGE RankNTypes #-}
module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_compile/tc236.hs b/testsuite/tests/typecheck/should_compile/tc236.hs
index c555cec38a..11edebc17c 100644
--- a/testsuite/tests/typecheck/should_compile/tc236.hs
+++ b/testsuite/tests/typecheck/should_compile/tc236.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_fail/T7019.hs b/testsuite/tests/typecheck/should_fail/T7019.hs
index 45df18ef92..ea482f0301 100644
--- a/testsuite/tests/typecheck/should_fail/T7019.hs
+++ b/testsuite/tests/typecheck/should_fail/T7019.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE UndecidableInstances #-}
diff --git a/testsuite/tests/typecheck/should_fail/T7019a.hs b/testsuite/tests/typecheck/should_fail/T7019a.hs
index a4fb4df252..a0143d7fd3 100644
--- a/testsuite/tests/typecheck/should_fail/T7019a.hs
+++ b/testsuite/tests/typecheck/should_fail/T7019a.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
module T7019a where
diff --git a/testsuite/tests/typecheck/should_fail/tcfail076.hs b/testsuite/tests/typecheck/should_fail/tcfail076.hs
index abe96c5640..e8a34558b6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail076.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
{-
From: Ralf Hinze <ralf@uran.informatik.uni-bonn.de>
diff --git a/testsuite/tests/typecheck/should_fail/tcfail088.hs b/testsuite/tests/typecheck/should_fail/tcfail088.hs
index 6b9f50751e..4b8dcd7e39 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail088.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail088.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, FlexibleInstances #-}
-- !!! Check that forall types can't be arguments
module ShouldFail where
diff --git a/testsuite/tests/typecheck/should_fail/tcfail104.hs b/testsuite/tests/typecheck/should_fail/tcfail104.hs
index 292780541c..7a6a50547c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail104.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail104.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
-- Test the handling of conditionals in rank-n stuff
-- Should fail, regardless of branch ordering
diff --git a/testsuite/tests/typecheck/should_fail/tcfail110.hs b/testsuite/tests/typecheck/should_fail/tcfail110.hs
index 92aeb56c06..f9d1bb9c58 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail110.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail110.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_fail/tcfail122.hs b/testsuite/tests/typecheck/should_fail/tcfail122.hs
index ae2bef8bea..0576f5f9d0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail122.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail122.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, KindSignatures #-}
+{-# LANGUAGE RankNTypes, KindSignatures #-}
module ShouldFail where
diff --git a/testsuite/tests/typecheck/should_fail/tcfail188.hs b/testsuite/tests/typecheck/should_fail/tcfail188.hs
index a79087d90d..d9b3058e19 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail188.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail188.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, KindSignatures #-}
+{-# LANGUAGE RankNTypes, KindSignatures #-}
{-# OPTIONS_GHC -Werror #-}
-- Trac #959
diff --git a/testsuite/tests/typecheck/should_fail/tcfail201.hs b/testsuite/tests/typecheck/should_fail/tcfail201.hs
index 276efd05ae..f9d3188682 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail201.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
-- Claus reported by email that