Use GHC2021 as default language

10 files changed, 30 insertions, 25 deletions

diff --git a/testsuite/tests/generics/GenShouldFail0.hs b/testsuite/tests/generics/GenShouldFail0.hs
index cc1ef6ff42..1e90a94fc4 100644
--- a/testsuite/tests/generics/GenShouldFail0.hs
+++ b/testsuite/tests/generics/GenShouldFail0.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE StandaloneDeriving #-}
 
 module ShouldFail0 where
diff --git a/testsuite/tests/generics/GenShouldFail0.stderr b/testsuite/tests/generics/GenShouldFail0.stderr
index 270c872f56..90fe1bf305 100644
--- a/testsuite/tests/generics/GenShouldFail0.stderr
+++ b/testsuite/tests/generics/GenShouldFail0.stderr
@@ -1,5 +1,5 @@
 
-GenShouldFail0.hs:9:1:
-    Can't make a derived instance of ‘Generic X’:
-      You need DeriveGeneric to derive an instance for this class
-    In the stand-alone deriving instance for ‘Generic X’
+GenShouldFail0.hs:10:1: error:
+    • Can't make a derived instance of ‘Generic X’:
+        You need DeriveGeneric to derive an instance for this class
+    • In the stand-alone deriving instance for ‘Generic X’
diff --git a/testsuite/tests/generics/GenShouldFail1_0.hs b/testsuite/tests/generics/GenShouldFail1_0.hs
index 15f059d65d..180ac2f1a4 100644
--- a/testsuite/tests/generics/GenShouldFail1_0.hs
+++ b/testsuite/tests/generics/GenShouldFail1_0.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE StandaloneDeriving #-}
 
 module ShouldFail1_0 where
diff --git a/testsuite/tests/generics/GenShouldFail1_0.stderr b/testsuite/tests/generics/GenShouldFail1_0.stderr
index e75404f8bb..26dfa8e405 100644
--- a/testsuite/tests/generics/GenShouldFail1_0.stderr
+++ b/testsuite/tests/generics/GenShouldFail1_0.stderr
@@ -1,5 +1,5 @@
 
-GenShouldFail1_0.hs:9:1:
-    Can't make a derived instance of ‘Generic1 X’:
-      You need DeriveGeneric to derive an instance for this class
-    In the stand-alone deriving instance for ‘Generic1 X’
+GenShouldFail1_0.hs:10:1: error:
+    • Can't make a derived instance of ‘Generic1 X’:
+        You need DeriveGeneric to derive an instance for this class
+    • In the stand-alone deriving instance for ‘Generic1 X’
diff --git a/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.hs b/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.hs
index 53ad879702..3ae3bbc565 100644
--- a/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.hs
+++ b/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE PolyKinds #-}
 module T10604_bad_variable_occurrence where
diff --git a/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.stderr b/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.stderr
index 26c6a5562a..a8ac7c7471 100644
--- a/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.stderr
+++ b/testsuite/tests/generics/T10604/T10604_bad_variable_occurrence.stderr
@@ -1,5 +1,5 @@
 
-T10604_bad_variable_occurrence.hs:8:12: error:
+T10604_bad_variable_occurrence.hs:9:12: error:
     • Can't make a derived instance of ‘Generic1 Fix’:
         Constructor ‘In’ applies a type to an argument involving the last parameter
                          but the applied type is not of kind * -> *
diff --git a/testsuite/tests/generics/T10604/T10604_no_PolyKinds.hs b/testsuite/tests/generics/T10604/T10604_no_PolyKinds.hs
index bdb98cab69..50e7251717 100644
--- a/testsuite/tests/generics/T10604/T10604_no_PolyKinds.hs
+++ b/testsuite/tests/generics/T10604/T10604_no_PolyKinds.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE KindSignatures #-}
 module T10604_no_PolyKinds where
diff --git a/testsuite/tests/generics/T10604/T10604_no_PolyKinds.stderr b/testsuite/tests/generics/T10604/T10604_no_PolyKinds.stderr
index 69bc591d01..ca87502a90 100644
--- a/testsuite/tests/generics/T10604/T10604_no_PolyKinds.stderr
+++ b/testsuite/tests/generics/T10604/T10604_no_PolyKinds.stderr
@@ -1,5 +1,5 @@
 
-T10604_no_PolyKinds.hs:7:35: error:
+T10604_no_PolyKinds.hs:8:35: error:
     • Cannot derive well-kinded instance of form ‘Generic1 (F ...)’
         (Perhaps you intended to use PolyKinds)
         Class ‘Generic1’ expects an argument of kind ‘* -> *’
diff --git a/testsuite/tests/generics/T5462No1.hs b/testsuite/tests/generics/T5462No1.hs
index fc24f63431..f1200208f8 100644
--- a/testsuite/tests/generics/T5462No1.hs
+++ b/testsuite/tests/generics/T5462No1.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE FlexibleContexts       #-}
 {-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE DeriveGeneric          #-}
diff --git a/testsuite/tests/generics/T5462No1.stderr b/testsuite/tests/generics/T5462No1.stderr
index c82f1b86ee..0b718d648e 100644
--- a/testsuite/tests/generics/T5462No1.stderr
+++ b/testsuite/tests/generics/T5462No1.stderr
@@ -1,20 +1,20 @@
 [1 of 2] Compiling GFunctor         ( GFunctor/GFunctor.hs, out_T5462No1/GFunctor.o )
 [2 of 2] Compiling T5462No1         ( T5462No1.hs, out_T5462No1/T5462No1.o )
 
-T5462No1.hs:24:42: error:
-    Can't make a derived instance of ‘GFunctor F’:
-      ‘GFunctor’ is not a stock derivable class (Eq, Show, etc.)
-      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
-    In the newtype declaration for ‘F’
-
-T5462No1.hs:26:23: error:
-    Can't make a derived instance of ‘C1 G’:
-      ‘C1’ is not a stock derivable class (Eq, Show, etc.)
-      Try enabling DeriveAnyClass
-    In the data declaration for ‘G’
+T5462No1.hs:25:42: error:
+    • Can't make a derived instance of ‘GFunctor F’:
+        ‘GFunctor’ is not a stock derivable class (Eq, Show, etc.)
+        Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+    • In the newtype declaration for ‘F’
 
 T5462No1.hs:27:23: error:
-    Can't make a derived instance of ‘C2 H’:
-      ‘C2’ is not a stock derivable class (Eq, Show, etc.)
-      Try enabling DeriveAnyClass
-    In the data declaration for ‘H’
+    • Can't make a derived instance of ‘C1 G’:
+        ‘C1’ is not a stock derivable class (Eq, Show, etc.)
+        Try enabling DeriveAnyClass
+    • In the data declaration for ‘G’
+
+T5462No1.hs:28:23: error:
+    • Can't make a derived instance of ‘C2 H’:
+        ‘C2’ is not a stock derivable class (Eq, Show, etc.)
+        Try enabling DeriveAnyClass
+    • In the data declaration for ‘H’