From 115cd3c85a8c38f1fe2a10d4ee515f92c96dd5a2 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Wed, 10 Mar 2021 15:28:48 -0500 Subject: Use GHC2021 as default language --- testsuite/tests/roles/should_compile/Roles3.hs | 1 + testsuite/tests/roles/should_compile/T8958.hs | 1 + testsuite/tests/roles/should_compile/T8958.stderr | 8 ++++---- testsuite/tests/roles/should_fail/Roles12.hs | 1 + testsuite/tests/roles/should_fail/Roles12.hs-boot | 3 ++- testsuite/tests/roles/should_fail/Roles12.stderr | 2 +- testsuite/tests/roles/should_fail/Roles12a.hs | 1 + testsuite/tests/roles/should_fail/T9204.hs | 1 + testsuite/tests/roles/should_fail/T9204.hs-boot | 1 + testsuite/tests/roles/should_fail/T9204.stderr | 2 +- testsuite/tests/roles/should_fail/T9204a.hs | 1 + 11 files changed, 15 insertions(+), 7 deletions(-) (limited to 'testsuite/tests/roles') diff --git a/testsuite/tests/roles/should_compile/Roles3.hs b/testsuite/tests/roles/should_compile/Roles3.hs index 3df74ec8e2..b71d9cf2ec 100644 --- a/testsuite/tests/roles/should_compile/Roles3.hs +++ b/testsuite/tests/roles/should_compile/Roles3.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TypeFamilies, MultiParamTypeClasses #-} {-# LANGUAGE AllowAmbiguousTypes #-} -- meth3, meth4 are ambiguous diff --git a/testsuite/tests/roles/should_compile/T8958.hs b/testsuite/tests/roles/should_compile/T8958.hs index b3c2910e2e..e4bf28f1aa 100644 --- a/testsuite/tests/roles/should_compile/T8958.hs +++ b/testsuite/tests/roles/should_compile/T8958.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE RoleAnnotations, DatatypeContexts, IncoherentInstances, FlexibleInstances #-} diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr index 203f978daa..6cf07483d0 100644 --- a/testsuite/tests/roles/should_compile/T8958.stderr +++ b/testsuite/tests/roles/should_compile/T8958.stderr @@ -1,5 +1,5 @@ -T8958.hs:1:31: warning: +T8958.hs:2:31: warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language. TYPE CONSTRUCTORS newtype Map{2} :: * -> * -> * @@ -13,10 +13,10 @@ DATA CONSTRUCTORS MkMap :: forall k v. [(k, v)] -> Map k v CLASS INSTANCES instance [incoherent] Representational a - -- Defined at T8958.hs:10:10 - instance [incoherent] Nominal a -- Defined at T8958.hs:7:10 + -- Defined at T8958.hs:11:10 + instance [incoherent] Nominal a -- Defined at T8958.hs:8:10 Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0] +Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.8.0] ==================== Typechecker ==================== T8958.$tcMap diff --git a/testsuite/tests/roles/should_fail/Roles12.hs b/testsuite/tests/roles/should_fail/Roles12.hs index 0942a0be41..a31bf6534c 100644 --- a/testsuite/tests/roles/should_fail/Roles12.hs +++ b/testsuite/tests/roles/should_fail/Roles12.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Roles12 where import Roles12a diff --git a/testsuite/tests/roles/should_fail/Roles12.hs-boot b/testsuite/tests/roles/should_fail/Roles12.hs-boot index 6a708d984a..a78daefb53 100644 --- a/testsuite/tests/roles/should_fail/Roles12.hs-boot +++ b/testsuite/tests/roles/should_fail/Roles12.hs-boot @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Roles12 where -data T a \ No newline at end of file +data T a diff --git a/testsuite/tests/roles/should_fail/Roles12.stderr b/testsuite/tests/roles/should_fail/Roles12.stderr index ec3bff4182..b4d7499fe9 100644 --- a/testsuite/tests/roles/should_fail/Roles12.stderr +++ b/testsuite/tests/roles/should_fail/Roles12.stderr @@ -1,5 +1,5 @@ -Roles12.hs:5:1: error: +Roles12.hs:6:1: error: Type constructor ‘T’ has conflicting definitions in the module and its hs-boot file Main module: type role T phantom diff --git a/testsuite/tests/roles/should_fail/Roles12a.hs b/testsuite/tests/roles/should_fail/Roles12a.hs index a7c02c5fcd..3a00c4f635 100644 --- a/testsuite/tests/roles/should_fail/Roles12a.hs +++ b/testsuite/tests/roles/should_fail/Roles12a.hs @@ -1,2 +1,3 @@ +{-# LANGUAGE Haskell2010 #-} module Roles12a where import {-# SOURCE #-} Roles12 diff --git a/testsuite/tests/roles/should_fail/T9204.hs b/testsuite/tests/roles/should_fail/T9204.hs index 52befcac20..fe2c81121e 100644 --- a/testsuite/tests/roles/should_fail/T9204.hs +++ b/testsuite/tests/roles/should_fail/T9204.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module T9204 where diff --git a/testsuite/tests/roles/should_fail/T9204.hs-boot b/testsuite/tests/roles/should_fail/T9204.hs-boot index 7ee0f1db3e..3606c82d7e 100644 --- a/testsuite/tests/roles/should_fail/T9204.hs-boot +++ b/testsuite/tests/roles/should_fail/T9204.hs-boot @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module T9204 where diff --git a/testsuite/tests/roles/should_fail/T9204.stderr b/testsuite/tests/roles/should_fail/T9204.stderr index 0e8cbf4524..c54df4870c 100644 --- a/testsuite/tests/roles/should_fail/T9204.stderr +++ b/testsuite/tests/roles/should_fail/T9204.stderr @@ -1,5 +1,5 @@ -T9204.hs:6:1: error: +T9204.hs:7:1: error: Type constructor ‘D’ has conflicting definitions in the module and its hs-boot file Main module: type role D phantom diff --git a/testsuite/tests/roles/should_fail/T9204a.hs b/testsuite/tests/roles/should_fail/T9204a.hs index a57e2b28a2..a290f1a1bf 100644 --- a/testsuite/tests/roles/should_fail/T9204a.hs +++ b/testsuite/tests/roles/should_fail/T9204a.hs @@ -1,2 +1,3 @@ +{-# LANGUAGE Haskell2010 #-} module T9204a where import {-# SOURCE #-} T9204 -- cgit v1.2.1