Use GHC2021 as default language

27 files changed, 34 insertions, 16 deletions

diff --git a/testsuite/tests/backpack/should_compile/T13140.bkp b/testsuite/tests/backpack/should_compile/T13140.bkp
index aa04b98c1e..0125a6400b 100644
--- a/testsuite/tests/backpack/should_compile/T13140.bkp
+++ b/testsuite/tests/backpack/should_compile/T13140.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RoleAnnotations #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_compile/bkp32.bkp b/testsuite/tests/backpack/should_compile/bkp32.bkp
index 92f37a5a05..c90a323d59 100644
--- a/testsuite/tests/backpack/should_compile/bkp32.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp32.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 unit prelude-sig where
diff --git a/testsuite/tests/backpack/should_compile/bkp37.bkp b/testsuite/tests/backpack/should_compile/bkp37.bkp
index 7f116dc93d..9bd70ff6ec 100644
--- a/testsuite/tests/backpack/should_compile/bkp37.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp37.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE FlexibleInstances #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_compile/bkp38.bkp b/testsuite/tests/backpack/should_compile/bkp38.bkp
index 952367512c..41ea93cf24 100644
--- a/testsuite/tests/backpack/should_compile/bkp38.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp38.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE RoleAnnotations #-}
 unit p where
diff --git a/testsuite/tests/backpack/should_compile/bkp39.bkp b/testsuite/tests/backpack/should_compile/bkp39.bkp
index a6216edc24..4af903856f 100644
--- a/testsuite/tests/backpack/should_compile/bkp39.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp39.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ConstraintKinds #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_compile/bkp40.bkp b/testsuite/tests/backpack/should_compile/bkp40.bkp
index 3f97456686..d149d75877 100644
--- a/testsuite/tests/backpack/should_compile/bkp40.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp40.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE FlexibleInstances #-}
diff --git a/testsuite/tests/backpack/should_compile/bkp48.bkp b/testsuite/tests/backpack/should_compile/bkp48.bkp
index d48d0359d2..75c8bb6e2f 100644
--- a/testsuite/tests/backpack/should_compile/bkp48.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp48.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail17.bkp b/testsuite/tests/backpack/should_fail/bkpfail17.bkp
index 847bdfaf58..5729d8c662 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail17.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail17.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 unit p where
     signature ShouldFail where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail17.stderr b/testsuite/tests/backpack/should_fail/bkpfail17.stderr
index 81e47ec524..2777b503ed 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail17.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail17.stderr
@@ -2,8 +2,8 @@
   [1 of 1] Compiling ShouldFail[sig]  ( p/ShouldFail.hsig, nothing )
 [2 of 2] Processing q
   Instantiating q
-  [1 of 1] Including p[ShouldFail=base-4.13.0.0:Prelude]
-    Instantiating p[ShouldFail=base-4.13.0.0:Prelude]
+  [1 of 1] Including p[ShouldFail=base-4.16.0.0:Prelude]
+    Instantiating p[ShouldFail=base-4.16.0.0:Prelude]
     [1 of 1] Compiling ShouldFail[sig]  ( p/ShouldFail.hsig, bkpfail17.out/p/p-2W6J7O3LvroH97zGxbPEGF/ShouldFail.o )
 
 <no location info>: error:
diff --git a/testsuite/tests/backpack/should_fail/bkpfail23.bkp b/testsuite/tests/backpack/should_fail/bkpfail23.bkp
index a7e52cef4f..831ce42c72 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail23.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail23.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs, RoleAnnotations #-}
 unit p where
     signature H where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail23.stderr b/testsuite/tests/backpack/should_fail/bkpfail23.stderr
index 6a2eb8ce1e..a8144dbde5 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail23.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail23.stderr
@@ -10,7 +10,7 @@
     Instantiating p[H=h:H]
     [1 of 2] Compiling H[sig]           ( p/H.hsig, bkpfail23.out/p/p-6KeuBvYi0jvLWqVbkSAZMq/H.o )
 
-bkpfail23.bkp:14:9: error:
+bkpfail23.bkp:15:9: error:
     • Type constructor ‘F’ has conflicting definitions in the module
       and its hsig file
       Main module: type F :: * -> *
diff --git a/testsuite/tests/backpack/should_fail/bkpfail25.bkp b/testsuite/tests/backpack/should_fail/bkpfail25.bkp
index 322a70a93e..234e9bd137 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail25.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail25.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 unit p where
     signature H where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail25.stderr b/testsuite/tests/backpack/should_fail/bkpfail25.stderr
index cedcd30399..08cb0711fe 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail25.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail25.stderr
@@ -2,7 +2,7 @@
   [1 of 2] Compiling H[sig]           ( p/H.hsig, nothing )
   [2 of 2] Compiling M                ( p/M.hs, nothing )
 
-bkpfail25.bkp:7:18: warning: [-Wmissing-methods (in -Wdefault)]
+bkpfail25.bkp:8:18: warning: [-Wmissing-methods (in -Wdefault)]
     • No explicit implementation for
         ‘fmap’
     • In the instance declaration for ‘Functor T’
@@ -15,7 +15,7 @@ bkpfail25.bkp:7:18: warning: [-Wmissing-methods (in -Wdefault)]
     Instantiating p[H=q:H]
     [1 of 2] Compiling H[sig]           ( p/H.hsig, bkpfail25.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o )
 
-bkpfail25.bkp:12:9: error:
+bkpfail25.bkp:13:9: error:
     • Type constructor ‘T’ has conflicting definitions in the module
       and its hsig file
       Main module: type T :: * -> *
diff --git a/testsuite/tests/backpack/should_fail/bkpfail26.bkp b/testsuite/tests/backpack/should_fail/bkpfail26.bkp
index 5ea5b6bada..13592b682f 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail26.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail26.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 unit p where
     signature H where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail26.stderr b/testsuite/tests/backpack/should_fail/bkpfail26.stderr
index 09410cedfe..f697f47212 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail26.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail26.stderr
@@ -10,7 +10,7 @@
     Instantiating p[H=q:H]
     [1 of 2] Compiling H[sig]           ( p/H.hsig, bkpfail26.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o )
 
-bkpfail26.bkp:15:9: error:
+bkpfail26.bkp:16:9: error:
     • Type constructor ‘T’ has conflicting definitions in the module
       and its hsig file
       Main module: type T :: * -> *
diff --git a/testsuite/tests/backpack/should_fail/bkpfail28.bkp b/testsuite/tests/backpack/should_fail/bkpfail28.bkp
index aa3f1a489b..5c3ba454f7 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail28.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail28.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE FlexibleInstances #-}
 -- This doesn't work: GHC MUST pick the wrong one!
 -- {-# LANGUAGE IncoherentInstances #-}
diff --git a/testsuite/tests/backpack/should_fail/bkpfail28.stderr b/testsuite/tests/backpack/should_fail/bkpfail28.stderr
index 4850e19240..ef8d72cfe3 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail28.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail28.stderr
@@ -6,22 +6,22 @@
   [1 of 4] Compiling A[sig]           ( r/A.hsig, nothing )
   [2 of 4] Compiling R                ( r/R.hs, nothing )
 
-bkpfail28.bkp:18:13: error:
+bkpfail28.bkp:19:13: error:
     • Overlapping instances for Show (K a) arising from a use of ‘show’
       Matching instances:
         instance [safe] Show a => Show (K a)
-          -- Defined at bkpfail28.bkp:11:18
+          -- Defined at bkpfail28.bkp:12:18
         instance [safe] Read a => Show (K a)
-          -- Defined at bkpfail28.bkp:11:18
+          -- Defined at bkpfail28.bkp:12:18
     • In the expression: show
       In an equation for ‘f’: f = show
 
-bkpfail28.bkp:20:13: error:
+bkpfail28.bkp:21:13: error:
     • Overlapping instances for Show (K a) arising from a use of ‘show’
       Matching instances:
         instance [safe] Show a => Show (K a)
-          -- Defined at bkpfail28.bkp:11:18
+          -- Defined at bkpfail28.bkp:12:18
         instance [safe] Read a => Show (K a)
-          -- Defined at bkpfail28.bkp:11:18
+          -- Defined at bkpfail28.bkp:12:18
     • In the expression: show
       In an equation for ‘g’: g = show
diff --git a/testsuite/tests/backpack/should_fail/bkpfail42.bkp b/testsuite/tests/backpack/should_fail/bkpfail42.bkp
index 8face3f3be..dd305e8344 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail42.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail42.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail42.stderr b/testsuite/tests/backpack/should_fail/bkpfail42.stderr
index aa6857e9a1..0dfef9355f 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail42.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail42.stderr
@@ -3,7 +3,7 @@
 [2 of 2] Processing q
   [1 of 2] Compiling A[sig]           ( q/A.hsig, nothing )
 
-bkpfail42.bkp:9:9: error:
+bkpfail42.bkp:10:9: error:
     • Type constructor ‘F’ has conflicting definitions in the module
       and its hsig file
       Main module: type F :: * -> *
diff --git a/testsuite/tests/backpack/should_fail/bkpfail45.bkp b/testsuite/tests/backpack/should_fail/bkpfail45.bkp
index f60d45fd6a..2222442bb3 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail45.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail45.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RoleAnnotations, FlexibleContexts #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail45.stderr b/testsuite/tests/backpack/should_fail/bkpfail45.stderr
index f28f18316b..e2b4236aab 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail45.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail45.stderr
@@ -10,7 +10,7 @@
     Instantiating p[A=a:A]
     [1 of 2] Compiling A[sig]           ( p/A.hsig, bkpfail45.out/p/p-KvF5Y9pEVY39j64PHPNj9i/A.o )
 
-bkpfail45.bkp:13:9: error:
+bkpfail45.bkp:14:9: error:
     • Type constructor ‘T’ has conflicting definitions in the module
       and its hsig file
       Main module: type role T phantom
diff --git a/testsuite/tests/backpack/should_fail/bkpfail46.bkp b/testsuite/tests/backpack/should_fail/bkpfail46.bkp
index 0fc8b676a8..7c59223d73 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail46.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail46.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ConstraintKinds #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail46.stderr b/testsuite/tests/backpack/should_fail/bkpfail46.stderr
index 908866f67c..5ab1a5fddb 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail46.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail46.stderr
@@ -10,7 +10,7 @@
     Instantiating p[A=q:A]
     [1 of 2] Compiling A[sig]           ( p/A.hsig, bkpfail46.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o )
 
-bkpfail46.bkp:15:9: error:
+bkpfail46.bkp:16:9: error:
     • Type constructor ‘K’ has conflicting definitions in the module
       and its hsig file
       Main module: type K :: * -> Constraint
diff --git a/testsuite/tests/backpack/should_fail/bkpfail47.bkp b/testsuite/tests/backpack/should_fail/bkpfail47.bkp
index b8d4ae66d8..6d531769ab 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail47.bkp
+++ b/testsuite/tests/backpack/should_fail/bkpfail47.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RoleAnnotations #-}
 unit p where
     signature A where
diff --git a/testsuite/tests/backpack/should_fail/bkpfail47.stderr b/testsuite/tests/backpack/should_fail/bkpfail47.stderr
index d7f7c174d6..86453f28ea 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail47.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail47.stderr
@@ -5,7 +5,7 @@
 [3 of 3] Processing r
   [1 of 3] Compiling A[sig]           ( r/A.hsig, nothing )
 
-bkpfail47.bkp:9:9: error:
+bkpfail47.bkp:10:9: error:
     • Type constructor ‘T’ has conflicting definitions in the module
       and its hsig file
       Main module: type role T representational nominal
diff --git a/testsuite/tests/backpack/should_run/bkprun05.bkp b/testsuite/tests/backpack/should_run/bkprun05.bkp
index 6db2daa963..1413574f36 100644
--- a/testsuite/tests/backpack/should_run/bkprun05.bkp
+++ b/testsuite/tests/backpack/should_run/bkprun05.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RoleAnnotations #-}
 unit app where
     signature Map where
diff --git a/testsuite/tests/backpack/should_run/bkprun06.bkp b/testsuite/tests/backpack/should_run/bkprun06.bkp
index 121c59236b..3c2e91ce41 100644
--- a/testsuite/tests/backpack/should_run/bkprun06.bkp
+++ b/testsuite/tests/backpack/should_run/bkprun06.bkp
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RoleAnnotations #-}
 unit sigs where
     signature Map where