Use GHC2021 as default language

13 files changed, 34 insertions, 27 deletions

diff --git a/testsuite/tests/rename/should_fail/RnFail055.hs b/testsuite/tests/rename/should_fail/RnFail055.hs
index bd95add36b..b71d0a7c3a 100644
--- a/testsuite/tests/rename/should_fail/RnFail055.hs
+++ b/testsuite/tests/rename/should_fail/RnFail055.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MultiParamTypeClasses,RankNTypes,ExistentialQuantification,DatatypeContexts #-}
 module RnFail055 where
 
diff --git a/testsuite/tests/rename/should_fail/RnFail055.hs-boot b/testsuite/tests/rename/should_fail/RnFail055.hs-boot
index 57a97d3695..ae2e81db21 100644
--- a/testsuite/tests/rename/should_fail/RnFail055.hs-boot
+++ b/testsuite/tests/rename/should_fail/RnFail055.hs-boot
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MultiParamTypeClasses,RankNTypes,ExistentialQuantification,DatatypeContexts #-}
 module RnFail055 where
 
diff --git a/testsuite/tests/rename/should_fail/T11663.hs b/testsuite/tests/rename/should_fail/T11663.hs
index 2b8380fba1..318f89e670 100644
--- a/testsuite/tests/rename/should_fail/T11663.hs
+++ b/testsuite/tests/rename/should_fail/T11663.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module T11663 where
 
 -- All of these should fail as type signatures are not allowed
diff --git a/testsuite/tests/rename/should_fail/T11663.stderr b/testsuite/tests/rename/should_fail/T11663.stderr
index 18ee6e62d1..77e2999cec 100644
--- a/testsuite/tests/rename/should_fail/T11663.stderr
+++ b/testsuite/tests/rename/should_fail/T11663.stderr
@@ -1,16 +1,16 @@
 
-T11663.hs:5:12: error:
+T11663.hs:6:12: error:
     Illegal type signature: ‘Int’
       Type signatures are only allowed in patterns with ScopedTypeVariables
 
-T11663.hs:6:9: error:
+T11663.hs:7:9: error:
     Illegal type signature: ‘Int’
       Type signatures are only allowed in patterns with ScopedTypeVariables
 
-T11663.hs:7:22: error:
+T11663.hs:8:22: error:
     Illegal type signature: ‘Int’
       Type signatures are only allowed in patterns with ScopedTypeVariables
 
-T11663.hs:8:32: error:
+T11663.hs:9:32: error:
     Illegal type signature: ‘Int’
       Type signatures are only allowed in patterns with ScopedTypeVariables
diff --git a/testsuite/tests/rename/should_fail/T3265.hs b/testsuite/tests/rename/should_fail/T3265.hs
index 8e34fc2849..a04fffb8cd 100644
--- a/testsuite/tests/rename/should_fail/T3265.hs
+++ b/testsuite/tests/rename/should_fail/T3265.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 
 -- Test #3265
diff --git a/testsuite/tests/rename/should_fail/T3265.stderr b/testsuite/tests/rename/should_fail/T3265.stderr
index 999b6b3ed2..42d89d0b4e 100644
--- a/testsuite/tests/rename/should_fail/T3265.stderr
+++ b/testsuite/tests/rename/should_fail/T3265.stderr
@@ -1,8 +1,8 @@
 
-T3265.hs:7:8:
+T3265.hs:8:8: error:
     Illegal declaration of a type or class operator ‘:+:’
       Use TypeOperators to declare operators in type and declarations
 
-T3265.hs:9:9:
+T3265.hs:10:9: error:
     Illegal declaration of a type or class operator ‘:*:’
       Use TypeOperators to declare operators in type and declarations
diff --git a/testsuite/tests/rename/should_fail/rnfail052.hs b/testsuite/tests/rename/should_fail/rnfail052.hs
index bffb7e0d96..a3fc361432 100644
--- a/testsuite/tests/rename/should_fail/rnfail052.hs
+++ b/testsuite/tests/rename/should_fail/rnfail052.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- Error messages when you use 'forall' *without* the RankN flags
 -- Test cases similar to #2114
 
diff --git a/testsuite/tests/rename/should_fail/rnfail052.stderr b/testsuite/tests/rename/should_fail/rnfail052.stderr
index b8501cfad1..b818a4b6be 100644
--- a/testsuite/tests/rename/should_fail/rnfail052.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail052.stderr
@@ -1,15 +1,15 @@
 
-rnfail052.hs:6:6: error:
+rnfail052.hs:7:6: error:
     Illegal symbol ‘forall’ in type
     Perhaps you intended to use RankNTypes or a similar language
     extension to enable explicit-forall syntax: forall <tvs>. <type>
 
-rnfail052.hs:9:14: error:
+rnfail052.hs:10:14: error:
     Illegal symbol ‘forall’ in type
     Perhaps you intended to use RankNTypes or a similar language
     extension to enable explicit-forall syntax: forall <tvs>. <type>
 
-rnfail052.hs:12:15: error:
+rnfail052.hs:13:15: error:
     Illegal symbol ‘forall’ in type
     Perhaps you intended to use RankNTypes or a similar language
     extension to enable explicit-forall syntax: forall <tvs>. <type>
diff --git a/testsuite/tests/rename/should_fail/rnfail053.hs b/testsuite/tests/rename/should_fail/rnfail053.hs
index 1135f42b8a..6250b5d181 100644
--- a/testsuite/tests/rename/should_fail/rnfail053.hs
+++ b/testsuite/tests/rename/should_fail/rnfail053.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- Test #2114 (error message)
 
 module ShouldFail where
diff --git a/testsuite/tests/rename/should_fail/rnfail053.stderr b/testsuite/tests/rename/should_fail/rnfail053.stderr
index ab96278504..4d438c3821 100644
--- a/testsuite/tests/rename/should_fail/rnfail053.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail053.stderr
@@ -1,5 +1,5 @@
 
-rnfail053.hs:5:10: error:
+rnfail053.hs:6:10: error:
     • Data constructor ‘MkT’ has existential type variables, a context, or a specialised result type
         MkT :: forall a. a -> T
         (Enable ExistentialQuantification or GADTs to allow this)
diff --git a/testsuite/tests/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index ef4b09fd3a..28b20d989a 100644
--- a/testsuite/tests/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
@@ -1,18 +1,18 @@
 
-RnFail055.hs:1:73: warning:
+RnFail055.hs:2:73: warning:
     -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
-RnFail055.hs-boot:1:73: warning:
+RnFail055.hs-boot:2:73: warning:
     -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
-RnFail055.hs-boot:4:1: error:
+RnFail055.hs-boot:5:1: error:
     Identifier ‘f1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: f1 :: Int -> Float
     Boot file:   f1 :: Float -> Int
     The two types are different
 
-RnFail055.hs-boot:6:1: error:
+RnFail055.hs-boot:7:1: error:
     Type constructor ‘S1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type S1 :: * -> * -> *
@@ -21,7 +21,7 @@ RnFail055.hs-boot:6:1: error:
                  type S1 a b c = (a, b)
     The types have different kinds
 
-RnFail055.hs-boot:8:1: error:
+RnFail055.hs-boot:9:1: error:
     Type constructor ‘S2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type S2 :: * -> * -> *
@@ -31,7 +31,7 @@ RnFail055.hs-boot:8:1: error:
     The roles do not match.
     Roles on abstract types default to ‘representational’ in boot files.
 
-RnFail055.hs-boot:12:1: error:
+RnFail055.hs-boot:13:1: error:
     Type constructor ‘T1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type T1 :: * -> * -> *
@@ -40,7 +40,7 @@ RnFail055.hs-boot:12:1: error:
                  data T1 a b = T1 [a] [b]
     The constructors do not match: The types for ‘T1’ differ
 
-RnFail055.hs-boot:14:1: error:
+RnFail055.hs-boot:15:1: error:
     Type constructor ‘T2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type role T2 representational nominal
@@ -53,13 +53,13 @@ RnFail055.hs-boot:14:1: error:
     Roles on abstract types default to ‘representational’ in boot files.
     The datatype contexts do not match
 
-RnFail055.hs-boot:16:11: error:
+RnFail055.hs-boot:17:11: error:
     ‘T3’ is exported by the hs-boot file, but not exported by the module
 
-RnFail055.hs-boot:17:12: error:
+RnFail055.hs-boot:18:12: error:
     ‘T3'’ is exported by the hs-boot file, but not exported by the module
 
-RnFail055.hs-boot:21:1: error:
+RnFail055.hs-boot:22:1: error:
     Type constructor ‘T5’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type T5 :: * -> *
@@ -69,7 +69,7 @@ RnFail055.hs-boot:21:1: error:
     The constructors do not match:
       The record label lists for ‘T5’ differ
 
-RnFail055.hs-boot:23:1: error:
+RnFail055.hs-boot:24:1: error:
     Type constructor ‘T6’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type T6 :: *
@@ -79,7 +79,7 @@ RnFail055.hs-boot:23:1: error:
     The constructors do not match:
       The strictness annotations for ‘T6’ differ
 
-RnFail055.hs-boot:25:1: error:
+RnFail055.hs-boot:26:1: error:
     Type constructor ‘T7’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type role T7 phantom
@@ -91,10 +91,10 @@ RnFail055.hs-boot:25:1: error:
     Roles on abstract types default to ‘representational’ in boot files.
     The constructors do not match: The types for ‘T7’ differ
 
-RnFail055.hs-boot:27:22: error:
+RnFail055.hs-boot:28:22: error:
     ‘RnFail055.m1’ is exported by the hs-boot file, but not exported by the module
 
-RnFail055.hs-boot:28:1: error:
+RnFail055.hs-boot:29:1: error:
     Class ‘C2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type C2 :: * -> * -> Constraint
@@ -109,7 +109,7 @@ RnFail055.hs-boot:28:1: error:
     The methods do not match: There are different numbers of methods
     The MINIMAL pragmas are not compatible
 
-RnFail055.hs-boot:29:1: error:
+RnFail055.hs-boot:30:1: error:
     Class ‘C3’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type C3 :: * -> Constraint
diff --git a/testsuite/tests/rename/should_fail/rnfail056.hs b/testsuite/tests/rename/should_fail/rnfail056.hs
index 23ec008dc6..f41baec38e 100644
--- a/testsuite/tests/rename/should_fail/rnfail056.hs
+++ b/testsuite/tests/rename/should_fail/rnfail056.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- TupleSections not enabled
 {-# LANGUAGE UnboxedTuples #-}
 
diff --git a/testsuite/tests/rename/should_fail/rnfail056.stderr b/testsuite/tests/rename/should_fail/rnfail056.stderr
index 19c1188ce4..b32a31d58c 100644
--- a/testsuite/tests/rename/should_fail/rnfail056.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail056.stderr
@@ -1,4 +1,4 @@
 
-rnfail056.hs:6:7: Illegal tuple section: use TupleSections
+rnfail056.hs:7:7: error: Illegal tuple section: use TupleSections
 
-rnfail056.hs:8:7: Illegal tuple section: use TupleSections
+rnfail056.hs:9:7: error: Illegal tuple section: use TupleSections