diff options
| author | HaskellMouse <rinat.stryungis@serokell.io> | 2022-04-27 06:19:45 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-06-06 09:50:00 -0400 |
| commit | 9ce9ea5071af5c7a5b6fcef11ac6e19c14480901 (patch) | |
| tree | 7d6113e6e2eef0cefebf4302dda8ff4bec157b73 | |
| parent | 5a3fdcfd615b502f123bb31f42d22577d44748ac (diff) | |
| download | haskell-9ce9ea5071af5c7a5b6fcef11ac6e19c14480901.tar.gz | |
Deprecate TypeInType extension
This commit fixes #20312
It deprecates "TypeInType" extension
according to the following proposal:
https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0083-no-type-in-type.rst
It has been already implemented.
The migration strategy:
1. Disable TypeInType
2. Enable both DataKinds and PolyKinds extensions
Metric Decrease:
T16875
145 files changed, 240 insertions, 163 deletions
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index af4301cce7..627b2c69b3 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -3179,6 +3179,17 @@ deprecatedForExtension lang turn_on flag | turn_on = lang | otherwise = "No" ++ lang +deprecatedForExtensions :: [String] -> TurnOnFlag -> String +deprecatedForExtensions [] _ = panic "new extension has not been specified" +deprecatedForExtensions [lang] turn_on = deprecatedForExtension lang turn_on +deprecatedForExtensions langExts turn_on + = "use " ++ xExt flags ++ " instead" + where + flags | turn_on = langExts + | otherwise = ("No" ++) <$> langExts + + xExt fls = intercalate " and " $ (\flag -> "-X" ++ flag) <$> fls + useInstead :: String -> String -> TurnOnFlag -> String useInstead prefix flag turn_on = "Use " ++ prefix ++ no ++ flag ++ " instead" @@ -3745,7 +3756,8 @@ xFlagsDeps = [ flagSpec "TransformListComp" LangExt.TransformListComp, flagSpec "TupleSections" LangExt.TupleSections, flagSpec "TypeApplications" LangExt.TypeApplications, - flagSpec "TypeInType" LangExt.TypeInType, + depFlagSpec' "TypeInType" LangExt.TypeInType + (deprecatedForExtensions ["DataKinds", "PolyKinds"]), flagSpec "TypeFamilies" LangExt.TypeFamilies, flagSpec "TypeOperators" LangExt.TypeOperators, flagSpec "TypeSynonymInstances" LangExt.TypeSynonymInstances, diff --git a/docs/users_guide/9.6.1-notes.rst b/docs/users_guide/9.6.1-notes.rst index cd1ed28550..6d7a9b15b5 100644 --- a/docs/users_guide/9.6.1-notes.rst +++ b/docs/users_guide/9.6.1-notes.rst @@ -63,6 +63,8 @@ Language Compiler ~~~~~~~~ +- The :extension:`TypeInType` is now marked as deprecated. Its meaning has been included + in :extension:`PolyKinds` and :extension:`DataKinds`. ``base`` library ~~~~~~~~~~~~~~~~ diff --git a/libraries/base/GHC/Exception.hs b/libraries/base/GHC/Exception.hs index abaa308aec..1a3b039416 100644 --- a/libraries/base/GHC/Exception.hs +++ b/libraries/base/GHC/Exception.hs @@ -5,7 +5,7 @@ , RecordWildCards , PatternSynonyms #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE DataKinds, PolyKinds #-} {-# OPTIONS_HADDOCK not-home #-} ----------------------------------------------------------------------------- diff --git a/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs b/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs index ce07116a1e..5cbf84d330 100644 --- a/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs +++ b/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs @@ -55,7 +55,7 @@ data Extension | BangPatterns | TypeFamilies | TypeFamilyDependencies - | TypeInType + | TypeInType -- Deprecated | OverloadedStrings | OverloadedLists | NumDecimals diff --git a/libraries/ghc-heap/GHC/Exts/Heap.hs b/libraries/ghc-heap/GHC/Exts/Heap.hs index 618419ee1f..74b559d19f 100644 --- a/libraries/ghc-heap/GHC/Exts/Heap.hs +++ b/libraries/ghc-heap/GHC/Exts/Heap.hs @@ -3,7 +3,8 @@ {-# LANGUAGE UnboxedTuples #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE UnliftedFFITypes #-} diff --git a/libraries/ghc-heap/tests/ClosureSizeUtils.hs b/libraries/ghc-heap/tests/ClosureSizeUtils.hs index 3b1578451a..b46050edd7 100644 --- a/libraries/ghc-heap/tests/ClosureSizeUtils.hs +++ b/libraries/ghc-heap/tests/ClosureSizeUtils.hs @@ -2,7 +2,8 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE MagicHash #-} {-# LANGUAGE TypeApplications #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE ScopedTypeVariables #-} -- | Utilities for the @closure_size@ tests diff --git a/libraries/ghc-heap/tests/closure_size.hs b/libraries/ghc-heap/tests/closure_size.hs index 85d860fbf4..cf38c7b0f0 100644 --- a/libraries/ghc-heap/tests/closure_size.hs +++ b/libraries/ghc-heap/tests/closure_size.hs @@ -1,7 +1,8 @@ {-# LANGUAGE MagicHash #-} {-# LANGUAGE KindSignatures #-} {-# LANGUAGE UnboxedTuples #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE ScopedTypeVariables #-} import GHC.Exts diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs index df892fa2bd..4d34d1d6fc 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs @@ -2,7 +2,7 @@ DeriveGeneric, FlexibleInstances, DefaultSignatures, RankNTypes, RoleAnnotations, ScopedTypeVariables, MagicHash, KindSignatures, PolyKinds, TypeApplications, DataKinds, - GADTs, UnboxedTuples, UnboxedSums, TypeInType, TypeOperators, + GADTs, UnboxedTuples, UnboxedSums, TypeOperators, Trustworthy, DeriveFunctor, BangPatterns, RecordWildCards, ImplicitParams #-} {-# OPTIONS_GHC -fno-warn-inline-rule-shadowing #-} diff --git a/testsuite/tests/backpack/should_compile/T13149.bkp b/testsuite/tests/backpack/should_compile/T13149.bkp index cdaf767ab9..88e24edd09 100644 --- a/testsuite/tests/backpack/should_compile/T13149.bkp +++ b/testsuite/tests/backpack/should_compile/T13149.bkp @@ -1,6 +1,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE Rank2Types #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} unit p where signature A where import GHC.Types diff --git a/testsuite/tests/backpack/should_run/T13955.bkp b/testsuite/tests/backpack/should_run/T13955.bkp index f469076dd7..1c27fd7c95 100644 --- a/testsuite/tests/backpack/should_run/T13955.bkp +++ b/testsuite/tests/backpack/should_run/T13955.bkp @@ -1,5 +1,4 @@ {-# LANGUAGE MagicHash #-} -{-# LANGUAGE TypeInType #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE DataKinds #-} diff --git a/testsuite/tests/codeGen/should_compile/T17904.hs b/testsuite/tests/codeGen/should_compile/T17904.hs index ca5526c255..18badc605a 100644 --- a/testsuite/tests/codeGen/should_compile/T17904.hs +++ b/testsuite/tests/codeGen/should_compile/T17904.hs @@ -1,7 +1,8 @@ {-# LANGUAGE MagicHash #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE UnboxedTuples #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# OPTIONS_GHC -fno-full-laziness #-} module T17904 diff --git a/testsuite/tests/dependent/ghci/T14238.script b/testsuite/tests/dependent/ghci/T14238.script index 7c27123e00..972ea36745 100644 --- a/testsuite/tests/dependent/ghci/T14238.script +++ b/testsuite/tests/dependent/ghci/T14238.script @@ -1,4 +1,4 @@ -:set -XTypeInType +:set -XDataKinds :m + Data.Kind data Foo (k :: Type) :: k -> Type :kind Foo diff --git a/testsuite/tests/dependent/should_compile/T14845_compile.hs b/testsuite/tests/dependent/should_compile/T14845_compile.hs index 04f50189b8..c059f1d5e9 100644 --- a/testsuite/tests/dependent/should_compile/T14845_compile.hs +++ b/testsuite/tests/dependent/should_compile/T14845_compile.hs @@ -1,4 +1,4 @@ -{-# Language PolyKinds, DataKinds, KindSignatures, GADTs, TypeInType, ConstraintKinds #-} +{-# Language PolyKinds, DataKinds, KindSignatures, GADTs, ConstraintKinds #-} {-# Language FlexibleContexts #-} {-# Language RankNTypes #-} {-# Language TypeOperators #-} diff --git a/testsuite/tests/dependent/should_compile/T15346.hs b/testsuite/tests/dependent/should_compile/T15346.hs index be70911f7e..51f59da2e7 100644 --- a/testsuite/tests/dependent/should_compile/T15346.hs +++ b/testsuite/tests/dependent/should_compile/T15346.hs @@ -2,7 +2,8 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeApplications #-} module T15346 where diff --git a/testsuite/tests/dependent/should_compile/T15419.hs b/testsuite/tests/dependent/should_compile/T15419.hs index 68f20e5604..1434820c0c 100644 --- a/testsuite/tests/dependent/should_compile/T15419.hs +++ b/testsuite/tests/dependent/should_compile/T15419.hs @@ -1,7 +1,8 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE UndecidableInstances #-} module T15419 where diff --git a/testsuite/tests/dependent/should_compile/T15666.hs b/testsuite/tests/dependent/should_compile/T15666.hs index 022c3a0aee..006c5d1a9b 100644 --- a/testsuite/tests/dependent/should_compile/T15666.hs +++ b/testsuite/tests/dependent/should_compile/T15666.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude, - TypeInType, PolyKinds, DataKinds, + PolyKinds, DataKinds, ScopedTypeVariables, TypeFamilies, UndecidableInstances diff --git a/testsuite/tests/dependent/should_compile/T15725.hs b/testsuite/tests/dependent/should_compile/T15725.hs index a5f259ea9e..39913290ed 100644 --- a/testsuite/tests/dependent/should_compile/T15725.hs +++ b/testsuite/tests/dependent/should_compile/T15725.hs @@ -5,7 +5,8 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module T15725 where diff --git a/testsuite/tests/dependent/should_compile/T16344b.hs b/testsuite/tests/dependent/should_compile/T16344b.hs index 6b48921834..b89304f3b8 100644 --- a/testsuite/tests/dependent/should_compile/T16344b.hs +++ b/testsuite/tests/dependent/should_compile/T16344b.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, GADTs, KindSignatures #-} +{-# LANGUAGE PolyKinds, GADTs, KindSignatures #-} module T16344 where diff --git a/testsuite/tests/dependent/should_compile/T16347.hs b/testsuite/tests/dependent/should_compile/T16347.hs index 8f4afbace0..4c11993b38 100644 --- a/testsuite/tests/dependent/should_compile/T16347.hs +++ b/testsuite/tests/dependent/should_compile/T16347.hs @@ -1,5 +1,5 @@ {-# LANGUAGE GADTs #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} module T16347 where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T13895.hs b/testsuite/tests/dependent/should_fail/T13895.hs index 5897cd8149..691290df8e 100644 --- a/testsuite/tests/dependent/should_fail/T13895.hs +++ b/testsuite/tests/dependent/should_fail/T13895.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T13895 where import Data.Data (Data, Typeable) diff --git a/testsuite/tests/dependent/should_fail/T13895.stderr b/testsuite/tests/dependent/should_fail/T13895.stderr index adfebdd113..5ab651fe0b 100644 --- a/testsuite/tests/dependent/should_fail/T13895.stderr +++ b/testsuite/tests/dependent/should_fail/T13895.stderr @@ -1,5 +1,5 @@ -T13895.hs:10:14: error: +T13895.hs:11:14: error: • Illegal constraint in a kind: forall k. Typeable k => k -> * • In the type signature: dataCast1 :: forall (a :: Type). diff --git a/testsuite/tests/dependent/should_fail/T14845_fail1.hs b/testsuite/tests/dependent/should_fail/T14845_fail1.hs index 46c1351027..f709c763a7 100644 --- a/testsuite/tests/dependent/should_fail/T14845_fail1.hs +++ b/testsuite/tests/dependent/should_fail/T14845_fail1.hs @@ -1,4 +1,4 @@ -{-# Language PolyKinds, DataKinds, KindSignatures, GADTs, TypeInType, ConstraintKinds #-} +{-# Language PolyKinds, DataKinds, KindSignatures, GADTs, ConstraintKinds #-} module T14845_fail1 where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T14845_fail2.hs b/testsuite/tests/dependent/should_fail/T14845_fail2.hs index 4c5dac730f..66d026cbed 100644 --- a/testsuite/tests/dependent/should_fail/T14845_fail2.hs +++ b/testsuite/tests/dependent/should_fail/T14845_fail2.hs @@ -1,7 +1,8 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T14845_fail2 where import Data.Coerce diff --git a/testsuite/tests/dependent/should_fail/T14845_fail2.stderr b/testsuite/tests/dependent/should_fail/T14845_fail2.stderr index 9fe733f374..55519c582a 100644 --- a/testsuite/tests/dependent/should_fail/T14845_fail2.stderr +++ b/testsuite/tests/dependent/should_fail/T14845_fail2.stderr @@ -1,5 +1,5 @@ -T14845_fail2.hs:14:14: error: +T14845_fail2.hs:15:14: error: • Data constructor ‘MkA’ cannot be used here (it has an unpromotable context ‘Coercible a Int’) • In the first argument of ‘SA’, namely ‘MkA’ diff --git a/testsuite/tests/dependent/should_fail/T14880-2.hs b/testsuite/tests/dependent/should_fail/T14880-2.hs index e7057a3f00..d1b4e48445 100644 --- a/testsuite/tests/dependent/should_fail/T14880-2.hs +++ b/testsuite/tests/dependent/should_fail/T14880-2.hs @@ -1,6 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE PartialTypeSignatures #-} module Bug where diff --git a/testsuite/tests/dependent/should_fail/T14880-2.stderr b/testsuite/tests/dependent/should_fail/T14880-2.stderr index 2082ca6c34..56d8ff68ba 100644 --- a/testsuite/tests/dependent/should_fail/T14880-2.stderr +++ b/testsuite/tests/dependent/should_fail/T14880-2.stderr @@ -1,5 +1,5 @@ -T14880-2.hs:12:9: error: +T14880-2.hs:13:9: error: • Cannot generalise type; skolem ‘arg’ would escape its scope if I tried to quantify (a0 :: arg) in this type: forall arg. Proxy @{Proxy @{arg} a0 -> *} (Foo arg @a0) -> () diff --git a/testsuite/tests/dependent/should_fail/T14880.hs b/testsuite/tests/dependent/should_fail/T14880.hs index 91cfb20a4a..e52c6dbaae 100644 --- a/testsuite/tests/dependent/should_fail/T14880.hs +++ b/testsuite/tests/dependent/should_fail/T14880.hs @@ -1,6 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T14880.stderr b/testsuite/tests/dependent/should_fail/T14880.stderr index a5aa1df8d2..90e54427c0 100644 --- a/testsuite/tests/dependent/should_fail/T14880.stderr +++ b/testsuite/tests/dependent/should_fail/T14880.stderr @@ -1,5 +1,5 @@ -T14880.hs:12:5: error: +T14880.hs:13:5: error: • Cannot generalise type; skolem ‘arg’ would escape its scope if I tried to quantify (a0 :: arg) in this type: forall x arg. diff --git a/testsuite/tests/dependent/should_fail/T15076.hs b/testsuite/tests/dependent/should_fail/T15076.hs index 0890cf9eab..dfd944dd39 100644 --- a/testsuite/tests/dependent/should_fail/T15076.hs +++ b/testsuite/tests/dependent/should_fail/T15076.hs @@ -1,6 +1,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE PartialTypeSignatures #-} module Bug where diff --git a/testsuite/tests/dependent/should_fail/T15076.stderr b/testsuite/tests/dependent/should_fail/T15076.stderr index 814d459c3c..71d3c7c156 100644 --- a/testsuite/tests/dependent/should_fail/T15076.stderr +++ b/testsuite/tests/dependent/should_fail/T15076.stderr @@ -1,5 +1,5 @@ -T15076.hs:10:8: error: +T15076.hs:11:8: error: • Cannot generalise type; skolem ‘a’ would escape its scope if I tried to quantify (x0 :: a) in this type: forall a (f :: forall (x :: a). Proxy @{a} x -> *). diff --git a/testsuite/tests/dependent/should_fail/T15076b.hs b/testsuite/tests/dependent/should_fail/T15076b.hs index 15fce826c0..5a69d5cc89 100644 --- a/testsuite/tests/dependent/should_fail/T15076b.hs +++ b/testsuite/tests/dependent/should_fail/T15076b.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE PolyKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T15076b.stderr b/testsuite/tests/dependent/should_fail/T15076b.stderr index 3ee27a82b3..8da932a044 100644 --- a/testsuite/tests/dependent/should_fail/T15076b.stderr +++ b/testsuite/tests/dependent/should_fail/T15076b.stderr @@ -1,5 +1,4 @@ - -T15076b.hs:8:8: error: +T15076b.hs:9:8: error: • Cannot generalise type; skolem ‘a’ would escape its scope if I tried to quantify (x0 :: a) in this type: forall a (f :: forall (x :: a). Proxy @{a} x -> *). @@ -7,5 +6,5 @@ T15076b.hs:8:8: error: (Indeed, I sometimes struggle even printing this correctly, due to its ill-scoped nature.) • In the type signature: - foo :: forall (a :: Type) (f :: forall (x :: a). Proxy x -> Type). - Proxy f -> () + foo :: forall (a :: Type) + (f :: forall (x :: a). Proxy x -> Type). Proxy f -> () diff --git a/testsuite/tests/dependent/should_fail/T15215.hs b/testsuite/tests/dependent/should_fail/T15215.hs index 98b5e841b8..1b9708c33b 100644 --- a/testsuite/tests/dependent/should_fail/T15215.hs +++ b/testsuite/tests/dependent/should_fail/T15215.hs @@ -1,7 +1,8 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15215 where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T15215.stderr b/testsuite/tests/dependent/should_fail/T15215.stderr index e022054fa9..51119c1e7a 100644 --- a/testsuite/tests/dependent/should_fail/T15215.stderr +++ b/testsuite/tests/dependent/should_fail/T15215.stderr @@ -1,11 +1,11 @@ -T15215.hs:10:3: error: +T15215.hs:11:3: error: • Non type-variable argument in the constraint: Show (Maybe a) • In the definition of data constructor ‘MkA’ In the data type declaration for ‘A’ Suggested fix: Perhaps you intended to use FlexibleContexts -T15215.hs:17:14: error: +T15215.hs:18:14: error: • Data constructor ‘MkB’ cannot be used here (it has an unpromotable context ‘Show a’) • In the first argument of ‘SA’, namely ‘MkB’ diff --git a/testsuite/tests/dependent/should_fail/T15308.hs b/testsuite/tests/dependent/should_fail/T15308.hs index b49fe1f75b..e0a41da8e8 100644 --- a/testsuite/tests/dependent/should_fail/T15308.hs +++ b/testsuite/tests/dependent/should_fail/T15308.hs @@ -1,6 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15308 where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T15308.stderr b/testsuite/tests/dependent/should_fail/T15308.stderr index a4bdbd5ab6..fdb019efc1 100644 --- a/testsuite/tests/dependent/should_fail/T15308.stderr +++ b/testsuite/tests/dependent/should_fail/T15308.stderr @@ -1,5 +1,5 @@ -T15308.hs:12:5: error: +T15308.hs:13:5: error: • No instance for (Show (Foo a f)) arising from a use of ‘show’ • In the expression: show In an equation for ‘f’: f = show diff --git a/testsuite/tests/dependent/should_fail/T15343.hs b/testsuite/tests/dependent/should_fail/T15343.hs index 9bb59c807a..91b9b5bd2f 100644 --- a/testsuite/tests/dependent/should_fail/T15343.hs +++ b/testsuite/tests/dependent/should_fail/T15343.hs @@ -1,7 +1,8 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15343 where import Data.Kind diff --git a/testsuite/tests/dependent/should_fail/T15343.stderr b/testsuite/tests/dependent/should_fail/T15343.stderr index 79d81e5772..d3067812d2 100644 --- a/testsuite/tests/dependent/should_fail/T15343.stderr +++ b/testsuite/tests/dependent/should_fail/T15343.stderr @@ -1,5 +1,5 @@ -T15343.hs:14:18: error: +T15343.hs:15:18: error: • Expecting one more argument to ‘WhySym’ Expected kind ‘forall z. z’, but ‘WhySym’ has kind ‘* -> *’ • In the type ‘WhySym’ diff --git a/testsuite/tests/dependent/should_fail/T15380.hs b/testsuite/tests/dependent/should_fail/T15380.hs index a0e8abc819..ac81e5532b 100644 --- a/testsuite/tests/dependent/should_fail/T15380.hs +++ b/testsuite/tests/dependent/should_fail/T15380.hs @@ -1,6 +1,7 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} module T15380 where diff --git a/testsuite/tests/dependent/should_fail/T15380.stderr b/testsuite/tests/dependent/should_fail/T15380.stderr index 405d572c73..bf0355b01b 100644 --- a/testsuite/tests/dependent/should_fail/T15380.stderr +++ b/testsuite/tests/dependent/should_fail/T15380.stderr @@ -1,5 +1,5 @@ -T15380.hs:17:16: error: +T15380.hs:18:16: error: • Expecting one more argument to ‘To (M x)’ Expected a type, but ‘To (M x)’ has kind ‘Rep (M x) -> M x’ • In the type ‘To (M x)’ diff --git a/testsuite/tests/dependent/should_fail/T16344.hs b/testsuite/tests/dependent/should_fail/T16344.hs index 0cf4b98642..dcc1e0b619 100644 --- a/testsuite/tests/dependent/should_fail/T16344.hs +++ b/testsuite/tests/dependent/should_fail/T16344.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, KindSignatures #-} +{-# LANGUAGE PolyKinds, DataKinds, KindSignatures #-} module T16344 where diff --git a/testsuite/tests/dependent/should_fail/T16344a.hs b/testsuite/tests/dependent/should_fail/T16344a.hs index cfc3091a04..989352eb3d 100644 --- a/testsuite/tests/dependent/should_fail/T16344a.hs +++ b/testsuite/tests/dependent/should_fail/T16344a.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, KindSignatures #-} +{-# LANGUAGE DataKinds, PolyKinds, KindSignatures #-} module T16344 where diff --git a/testsuite/tests/dependent/should_fail/T17131.hs b/testsuite/tests/dependent/should_fail/T17131.hs index d4294c0216..b0617f354d 100644 --- a/testsuite/tests/dependent/should_fail/T17131.hs +++ b/testsuite/tests/dependent/should_fail/T17131.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE MagicHash, UnboxedTuples, TypeInType, TypeFamilies, TypeOperators #-} +{-# LANGUAGE MagicHash, UnboxedTuples,PolyKinds, DataKinds, TypeFamilies, TypeOperators #-} module T17131 where diff --git a/testsuite/tests/deriving/should_compile/T14579a.hs b/testsuite/tests/deriving/should_compile/T14579a.hs index ac7ba6cca8..dba0b8c04a 100644 --- a/testsuite/tests/deriving/should_compile/T14579a.hs +++ b/testsuite/tests/deriving/should_compile/T14579a.hs @@ -1,6 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE TypeApplications #-} -{-# LANGUAGE TypeInType #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/testsuite/tests/deriving/should_compile/deriving-via-compile.hs b/testsuite/tests/deriving/should_compile/deriving-via-compile.hs index b679acb8cd..261110c255 100644 --- a/testsuite/tests/deriving/should_compile/deriving-via-compile.hs +++ b/testsuite/tests/deriving/should_compile/deriving-via-compile.hs @@ -5,7 +5,8 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE InstanceSigs #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE ConstraintKinds #-} diff --git a/testsuite/tests/ghci/scripts/T13202.script b/testsuite/tests/ghci/scripts/T13202.script index 5da0a3287b..efcec6a6f2 100644 --- a/testsuite/tests/ghci/scripts/T13202.script +++ b/testsuite/tests/ghci/scripts/T13202.script @@ -1,5 +1,5 @@ import GHC.Exts -:set -XTypeApplications -XMagicHash -XTypeInType +:set -XTypeApplications -XMagicHash -XPolyKinds -XDataKinds data TypeRep (a :: k) = TypeRep let typeRepKind = undefined :: TypeRep (a :: k) -> TypeRep k let typeRep = undefined :: TypeRep (a :: k) diff --git a/testsuite/tests/ghci/scripts/TypeAppData.script b/testsuite/tests/ghci/scripts/TypeAppData.script index f569473d23..9ec1deaf4f 100644 --- a/testsuite/tests/ghci/scripts/TypeAppData.script +++ b/testsuite/tests/ghci/scripts/TypeAppData.script @@ -1,6 +1,6 @@ -- tests detection of specified variables in datatypes and patterns :set -fprint-explicit-foralls -:set -XTypeInType -XExistentialQuantification -XPatternSynonyms +:set -XDataKinds -XPolyKinds -XExistentialQuantification -XPatternSynonyms data P1 a = P1 data P2 (a :: k) = P2 data P3 k (a :: k) = P3 diff --git a/testsuite/tests/indexed-types/should_compile/ExplicitForAllFams1.hs b/testsuite/tests/indexed-types/should_compile/ExplicitForAllFams1.hs index c16e4e0156..bb97ae4978 100644 --- a/testsuite/tests/indexed-types/should_compile/ExplicitForAllFams1.hs +++ b/testsuite/tests/indexed-types/should_compile/ExplicitForAllFams1.hs @@ -2,7 +2,6 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeInType #-} module ExplicitForAllFams where diff --git a/testsuite/tests/indexed-types/should_compile/T13777.hs b/testsuite/tests/indexed-types/should_compile/T13777.hs index 7e8b660c4e..12ac215f7c 100644 --- a/testsuite/tests/indexed-types/should_compile/T13777.hs +++ b/testsuite/tests/indexed-types/should_compile/T13777.hs @@ -1,6 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T13777 where import Data.Kind diff --git a/testsuite/tests/indexed-types/should_compile/T14111.hs b/testsuite/tests/indexed-types/should_compile/T14111.hs index 4e304e5d90..b42bc70dd4 100644 --- a/testsuite/tests/indexed-types/should_compile/T14111.hs +++ b/testsuite/tests/indexed-types/should_compile/T14111.hs @@ -3,7 +3,8 @@ -- {-# LANGUAGE PolyKinds #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE FunctionalDependencies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs ,ExplicitNamespaces#-} {-# LANGUAGE UnboxedTuples #-} diff --git a/testsuite/tests/indexed-types/should_compile/T14164.hs b/testsuite/tests/indexed-types/should_compile/T14164.hs index 1cf6f2d78b..b835ea406b 100644 --- a/testsuite/tests/indexed-types/should_compile/T14164.hs +++ b/testsuite/tests/indexed-types/should_compile/T14164.hs @@ -1,5 +1,6 @@ {-# LANGUAGE TypeFamilyDependencies #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeOperators #-}
module T14164 where
diff --git a/testsuite/tests/indexed-types/should_compile/T15122.hs b/testsuite/tests/indexed-types/should_compile/T15122.hs index 1730f3a826..ac10b530a0 100644 --- a/testsuite/tests/indexed-types/should_compile/T15122.hs +++ b/testsuite/tests/indexed-types/should_compile/T15122.hs @@ -2,7 +2,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15122 where import Data.Kind diff --git a/testsuite/tests/indexed-types/should_compile/T15142.hs b/testsuite/tests/indexed-types/should_compile/T15142.hs index 0109ef543d..93daca2be2 100644 --- a/testsuite/tests/indexed-types/should_compile/T15142.hs +++ b/testsuite/tests/indexed-types/should_compile/T15142.hs @@ -1,6 +1,7 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15142 where diff --git a/testsuite/tests/indexed-types/should_compile/T15352.hs b/testsuite/tests/indexed-types/should_compile/T15352.hs index 0bb4a2bc63..0f8e5614cf 100644 --- a/testsuite/tests/indexed-types/should_compile/T15352.hs +++ b/testsuite/tests/indexed-types/should_compile/T15352.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Haskell2010 #-} -{-# LANGUAGE TypeInType #-} -- or PolyKinds +{-# LANGUAGE PolyKinds #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} diff --git a/testsuite/tests/indexed-types/should_compile/T15664.hs b/testsuite/tests/indexed-types/should_compile/T15664.hs index 9383ea0ed4..60b360e83c 100644 --- a/testsuite/tests/indexed-types/should_compile/T15664.hs +++ b/testsuite/tests/indexed-types/should_compile/T15664.hs @@ -1,4 +1,4 @@ -{-# Language RankNTypes, TypeOperators, DataKinds, PolyKinds, GADTs, TypeInType, TypeFamilies #-}
+{-# Language RankNTypes, TypeOperators, DataKinds, PolyKinds, GADTs, TypeFamilies #-}
module T15664 where
diff --git a/testsuite/tests/indexed-types/should_compile/T15740a.hs b/testsuite/tests/indexed-types/should_compile/T15740a.hs index 2d79a99878..f209e243c6 100644 --- a/testsuite/tests/indexed-types/should_compile/T15740a.hs +++ b/testsuite/tests/indexed-types/should_compile/T15740a.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, RankNTypes, TypeFamilies #-} +{-# LANGUAGE DataKinds, PolyKinds, RankNTypes, TypeFamilies #-} module T15740a where diff --git a/testsuite/tests/indexed-types/should_compile/T17008b.hs b/testsuite/tests/indexed-types/should_compile/T17008b.hs index 7116c1d441..845eb83294 100644 --- a/testsuite/tests/indexed-types/should_compile/T17008b.hs +++ b/testsuite/tests/indexed-types/should_compile/T17008b.hs @@ -1,7 +1,8 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T17008b where import Data.Kind diff --git a/testsuite/tests/indexed-types/should_fail/T14230a.hs b/testsuite/tests/indexed-types/should_fail/T14230a.hs index 84cd6f1bc6..044b3a76a9 100644 --- a/testsuite/tests/indexed-types/should_fail/T14230a.hs +++ b/testsuite/tests/indexed-types/should_fail/T14230a.hs @@ -1,7 +1,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T14230a where import Data.Kind diff --git a/testsuite/tests/indexed-types/should_fail/T14230a.stderr b/testsuite/tests/indexed-types/should_fail/T14230a.stderr index 886ee184d4..55df7607aa 100644 --- a/testsuite/tests/indexed-types/should_fail/T14230a.stderr +++ b/testsuite/tests/indexed-types/should_fail/T14230a.stderr @@ -1,5 +1,5 @@ -T14230a.hs:13:3: error: +T14230a.hs:14:3: error: • Type indexes must match class instance head Expected: CD (*) (Maybe a) Actual: CD k a diff --git a/testsuite/tests/indexed-types/should_fail/T14246.hs b/testsuite/tests/indexed-types/should_fail/T14246.hs index 09840f6d9e..71e59f8c71 100644 --- a/testsuite/tests/indexed-types/should_fail/T14246.hs +++ b/testsuite/tests/indexed-types/should_fail/T14246.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Haskell2010 #-} -{-# LANGUAGE RankNTypes, GADTs, TypeOperators, PolyKinds, DataKinds, TypeFamilies, AllowAmbiguousTypes, UndecidableInstances, TypeInType #-} +{-# LANGUAGE RankNTypes, GADTs, TypeOperators, PolyKinds, DataKinds, TypeFamilies, AllowAmbiguousTypes, UndecidableInstances #-} module T14246 where diff --git a/testsuite/tests/indexed-types/should_fail/T14887.hs b/testsuite/tests/indexed-types/should_fail/T14887.hs index e0ede01500..e119f35c0e 100644 --- a/testsuite/tests/indexed-types/should_fail/T14887.hs +++ b/testsuite/tests/indexed-types/should_fail/T14887.hs @@ -1,6 +1,7 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -fprint-explicit-kinds #-} module T14887 where diff --git a/testsuite/tests/indexed-types/should_fail/T14887.stderr b/testsuite/tests/indexed-types/should_fail/T14887.stderr index 9e55af541f..51863c0ba1 100644 --- a/testsuite/tests/indexed-types/should_fail/T14887.stderr +++ b/testsuite/tests/indexed-types/should_fail/T14887.stderr @@ -1,5 +1,5 @@ -T14887.hs:14:1: error: +T14887.hs:15:1: error: • The kind of ‘Foo2’ is ill-scoped Inferred kind: Foo2 :: forall (a :: k). forall k -> (a :~: a) -> * NB: Specified variables (namely: (a :: k)) always come first diff --git a/testsuite/tests/indexed-types/should_fail/T14904.hs b/testsuite/tests/indexed-types/should_fail/T14904.hs index db7f1f4d0e..d913207b6f 100644 --- a/testsuite/tests/indexed-types/should_fail/T14904.hs +++ b/testsuite/tests/indexed-types/should_fail/T14904.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, TypeFamilies, RankNTypes #-}
+{-# LANGUAGE DataKinds, PolyKinds, TypeFamilies, RankNTypes #-}
module T14904 where
diff --git a/testsuite/tests/indexed-types/should_fail/T15740.hs b/testsuite/tests/indexed-types/should_fail/T15740.hs index e564a87509..8b805d1908 100644 --- a/testsuite/tests/indexed-types/should_fail/T15740.hs +++ b/testsuite/tests/indexed-types/should_fail/T15740.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, TypeFamilies, KindSignatures, RankNTypes #-} +{-# LANGUAGE DataKinds, PolyKinds, TypeFamilies, KindSignatures, RankNTypes #-} module T15740 where diff --git a/testsuite/tests/indexed-types/should_fail/T17008a.hs b/testsuite/tests/indexed-types/should_fail/T17008a.hs index 53d7f7737c..3b403b1ce5 100644 --- a/testsuite/tests/indexed-types/should_fail/T17008a.hs +++ b/testsuite/tests/indexed-types/should_fail/T17008a.hs @@ -1,5 +1,6 @@ {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T17006 where import Data.Kind diff --git a/testsuite/tests/indexed-types/should_fail/T17008a.stderr b/testsuite/tests/indexed-types/should_fail/T17008a.stderr index 86d13d9ba8..485f7d2cca 100644 --- a/testsuite/tests/indexed-types/should_fail/T17008a.stderr +++ b/testsuite/tests/indexed-types/should_fail/T17008a.stderr @@ -1,5 +1,5 @@ -T17008a.hs:11:5: error: +T17008a.hs:12:5: error: • Type variable ‘a2’ is mentioned in the RHS, but not bound on the LHS of the family instance The real LHS (expanding synonyms) is: F @a1 x diff --git a/testsuite/tests/numeric/should_compile/T14170.hs b/testsuite/tests/numeric/should_compile/T14170.hs index b7e854d805..711b8e8442 100644 --- a/testsuite/tests/numeric/should_compile/T14170.hs +++ b/testsuite/tests/numeric/should_compile/T14170.hs @@ -1,5 +1,6 @@ {-# LANGUAGE TypeApplications #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module NatVal where diff --git a/testsuite/tests/numeric/should_compile/T14465.hs b/testsuite/tests/numeric/should_compile/T14465.hs index 93a3b20020..038290389e 100644 --- a/testsuite/tests/numeric/should_compile/T14465.hs +++ b/testsuite/tests/numeric/should_compile/T14465.hs @@ -1,5 +1,6 @@ {-# LANGUAGE TypeApplications #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module M where diff --git a/testsuite/tests/numeric/should_compile/T14465.stderr b/testsuite/tests/numeric/should_compile/T14465.stderr index c21e4a0269..cb26f6f0b7 100644 --- a/testsuite/tests/numeric/should_compile/T14465.stderr +++ b/testsuite/tests/numeric/should_compile/T14465.stderr @@ -1,3 +1,3 @@ -T14465.hs:26:13: warning: [-Woverflowed-literals (in -Wdefault)] +T14465.hs:27:13: warning: [-Woverflowed-literals (in -Wdefault)] Literal -1 is negative but Natural only supports positive numbers diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.hs b/testsuite/tests/parser/should_compile/DumpParsedAst.hs index b6c52be15b..cd7c7c53e9 100644 --- a/testsuite/tests/parser/should_compile/DumpParsedAst.hs +++ b/testsuite/tests/parser/should_compile/DumpParsedAst.hs @@ -1,6 +1,6 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE DataKinds, GADTs, PolyKinds, RankNTypes, TypeOperators, TypeFamilies - , TypeApplications, TypeInType #-} + , TypeApplications #-} module DumpParsedAst where import Data.Kind diff --git a/testsuite/tests/perf/compiler/T15703.hs b/testsuite/tests/perf/compiler/T15703.hs index 98f4388b0f..594e7719a7 100644 --- a/testsuite/tests/perf/compiler/T15703.hs +++ b/testsuite/tests/perf/compiler/T15703.hs @@ -9,7 +9,8 @@ {-# LANGUAGE StandaloneKindSignatures #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module T15703 where diff --git a/testsuite/tests/perf/compiler/T15703_aux.hs b/testsuite/tests/perf/compiler/T15703_aux.hs index 866eb3b9d4..34ff375b58 100644 --- a/testsuite/tests/perf/compiler/T15703_aux.hs +++ b/testsuite/tests/perf/compiler/T15703_aux.hs @@ -8,7 +8,8 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module T15703_aux where diff --git a/testsuite/tests/pmcheck/complete_sigs/T14059a.hs b/testsuite/tests/pmcheck/complete_sigs/T14059a.hs index 6128a8beaa..e901e17da1 100644 --- a/testsuite/tests/pmcheck/complete_sigs/T14059a.hs +++ b/testsuite/tests/pmcheck/complete_sigs/T14059a.hs @@ -1,7 +1,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wincomplete-patterns #-} module T14059a where diff --git a/testsuite/tests/pmcheck/complete_sigs/T14059a.stderr b/testsuite/tests/pmcheck/complete_sigs/T14059a.stderr index 47a92504fb..7004ac3628 100644 --- a/testsuite/tests/pmcheck/complete_sigs/T14059a.stderr +++ b/testsuite/tests/pmcheck/complete_sigs/T14059a.stderr @@ -1,10 +1,10 @@ -T14059a.hs:20:1: warning: [-Wincomplete-patterns (in -Wextra)] +T14059a.hs:21:1: warning: [-Wincomplete-patterns (in -Wextra)] Pattern match(es) are non-exhaustive In an equation for ‘wibble’: Patterns of type ‘SBool z’ not matched: SFalse -T14059a.hs:23:1: warning: [-Wincomplete-patterns (in -Wextra)] +T14059a.hs:24:1: warning: [-Wincomplete-patterns (in -Wextra)] Pattern match(es) are non-exhaustive In an equation for ‘wobble’: Patterns of type ‘SBool z’ not matched: SFalse diff --git a/testsuite/tests/pmcheck/complete_sigs/T14059b.hs b/testsuite/tests/pmcheck/complete_sigs/T14059b.hs index 52f3593ecd..3c2900e69f 100644 --- a/testsuite/tests/pmcheck/complete_sigs/T14059b.hs +++ b/testsuite/tests/pmcheck/complete_sigs/T14059b.hs @@ -2,7 +2,8 @@ {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wincomplete-patterns #-} module Bug where diff --git a/testsuite/tests/pmcheck/complete_sigs/T14059b.stderr b/testsuite/tests/pmcheck/complete_sigs/T14059b.stderr index 20c7b78ddc..faaa442bc5 100644 --- a/testsuite/tests/pmcheck/complete_sigs/T14059b.stderr +++ b/testsuite/tests/pmcheck/complete_sigs/T14059b.stderr @@ -1,10 +1,10 @@ -T14059b.hs:23:1: warning: [-Wincomplete-patterns (in -Wextra)] +T14059b.hs:24:1: warning: [-Wincomplete-patterns (in -Wextra)] Pattern match(es) are non-exhaustive In an equation for ‘wibble’: Patterns of type ‘Sing z’ not matched: SFalse -T14059b.hs:26:1: warning: [-Wincomplete-patterns (in -Wextra)] +T14059b.hs:27:1: warning: [-Wincomplete-patterns (in -Wextra)] Pattern match(es) are non-exhaustive In an equation for ‘wobble’: Patterns of type ‘Sing z’ not matched: SFalse diff --git a/testsuite/tests/pmcheck/should_compile/T14813.hs b/testsuite/tests/pmcheck/should_compile/T14813.hs index 1dcfe756f9..54615023e6 100644 --- a/testsuite/tests/pmcheck/should_compile/T14813.hs +++ b/testsuite/tests/pmcheck/should_compile/T14813.hs @@ -2,7 +2,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# OPTIONS_GHC -Wall #-} module T14813 where diff --git a/testsuite/tests/pmcheck/should_compile/T14899.hs b/testsuite/tests/pmcheck/should_compile/T14899.hs index a788f29ee8..c97b5f8182 100644 --- a/testsuite/tests/pmcheck/should_compile/T14899.hs +++ b/testsuite/tests/pmcheck/should_compile/T14899.hs @@ -2,7 +2,8 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where data family Sing (z :: k) diff --git a/testsuite/tests/pmcheck/should_compile/T19622.hs b/testsuite/tests/pmcheck/should_compile/T19622.hs index 950628580e..4fad6bf488 100644 --- a/testsuite/tests/pmcheck/should_compile/T19622.hs +++ b/testsuite/tests/pmcheck/should_compile/T19622.hs @@ -1,7 +1,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE ViewPatterns #-} diff --git a/testsuite/tests/polykinds/T14847.hs b/testsuite/tests/polykinds/T14847.hs index 3474fe069c..b59544d3d7 100644 --- a/testsuite/tests/polykinds/T14847.hs +++ b/testsuite/tests/polykinds/T14847.hs @@ -1,6 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T14847 where data Proxy k (a :: k) = MkProxy diff --git a/testsuite/tests/polykinds/T14887a.hs b/testsuite/tests/polykinds/T14887a.hs index 4179862cad..62442730e7 100644 --- a/testsuite/tests/polykinds/T14887a.hs +++ b/testsuite/tests/polykinds/T14887a.hs @@ -1,6 +1,7 @@ {-# LANGUAGE PartialTypeSignatures #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# OPTIONS_GHC -Wno-partial-type-signatures #-} module Bug where diff --git a/testsuite/tests/polykinds/T14939.hs b/testsuite/tests/polykinds/T14939.hs index eb3c700f9f..f1387a00ab 100644 --- a/testsuite/tests/polykinds/T14939.hs +++ b/testsuite/tests/polykinds/T14939.hs @@ -1,4 +1,4 @@ -{-# Language RankNTypes, ConstraintKinds, TypeInType, GADTs #-} +{-# Language RankNTypes, ConstraintKinds, DataKinds, PolyKinds, GADTs #-} module T14939 where diff --git a/testsuite/tests/polykinds/T15577.hs b/testsuite/tests/polykinds/T15577.hs index 18ebc42f92..90586c6e94 100644 --- a/testsuite/tests/polykinds/T15577.hs +++ b/testsuite/tests/polykinds/T15577.hs @@ -1,7 +1,8 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} module Bug where diff --git a/testsuite/tests/polykinds/T15577.stderr b/testsuite/tests/polykinds/T15577.stderr index 5478da8b4a..7f875be9fd 100644 --- a/testsuite/tests/polykinds/T15577.stderr +++ b/testsuite/tests/polykinds/T15577.stderr @@ -1,5 +1,5 @@ -T15577.hs:20:18: error: +T15577.hs:21:18: error: • Expecting one more argument to ‘f’ Expected a type, but ‘f’ has kind ‘* -> *’ • In the type ‘f’ diff --git a/testsuite/tests/polykinds/T16221.hs b/testsuite/tests/polykinds/T16221.hs index 56a83748da..c697428bab 100644 --- a/testsuite/tests/polykinds/T16221.hs +++ b/testsuite/tests/polykinds/T16221.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE GADTs, TypeInType, ExistentialQuantification #-} +{-# LANGUAGE GADTs, PolyKinds, DataKinds, ExistentialQuantification #-} module T16221 where diff --git a/testsuite/tests/polykinds/T16221a.hs b/testsuite/tests/polykinds/T16221a.hs index 50128aa826..758faa4643 100644 --- a/testsuite/tests/polykinds/T16221a.hs +++ b/testsuite/tests/polykinds/T16221a.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, ExistentialQuantification #-} +{-# LANGUAGE DataKinds, PolyKinds, ExistentialQuantification #-} module T16221a where diff --git a/testsuite/tests/polykinds/T16245a.hs b/testsuite/tests/polykinds/T16245a.hs index 65d904f609..2defabb36d 100644 --- a/testsuite/tests/polykinds/T16245a.hs +++ b/testsuite/tests/polykinds/T16245a.hs @@ -1,6 +1,7 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/polykinds/T16245a.stderr b/testsuite/tests/polykinds/T16245a.stderr index 00f300fdab..a7df4f2fbc 100644 --- a/testsuite/tests/polykinds/T16245a.stderr +++ b/testsuite/tests/polykinds/T16245a.stderr @@ -1,12 +1,12 @@ -T16245a.hs:11:66: error: +T16245a.hs:12:66: error: • Expected kind ‘k1’, but ‘b’ has kind ‘k2’ ‘k2’ is a rigid type variable bound by the newtype declaration for ‘T’ - at T16245a.hs:11:12 + at T16245a.hs:12:12 ‘k1’ is a rigid type variable bound by the newtype declaration for ‘T’ - at T16245a.hs:11:1-67 + at T16245a.hs:12:1-67 • In the second argument of ‘SameKind’, namely ‘b’ In the type ‘(forall (b :: k). SameKind a b)’ In the definition of data constructor ‘MkT’ diff --git a/testsuite/tests/polykinds/T16247.hs b/testsuite/tests/polykinds/T16247.hs index 617f3c4aca..63db8ea175 100644 --- a/testsuite/tests/polykinds/T16247.hs +++ b/testsuite/tests/polykinds/T16247.hs @@ -1,6 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/polykinds/T16247.stderr b/testsuite/tests/polykinds/T16247.stderr index dc637bee4a..5c78312f29 100644 --- a/testsuite/tests/polykinds/T16247.stderr +++ b/testsuite/tests/polykinds/T16247.stderr @@ -1,5 +1,5 @@ -T16247.hs:9:20: error: +T16247.hs:10:20: error: • These kind and type variables: a k (b :: k) are out of dependency order. Perhaps try this ordering: k (a :: k) (b :: k) diff --git a/testsuite/tests/polykinds/T16247a.hs b/testsuite/tests/polykinds/T16247a.hs index 60a98d6c8f..58215916ed 100644 --- a/testsuite/tests/polykinds/T16247a.hs +++ b/testsuite/tests/polykinds/T16247a.hs @@ -2,7 +2,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} module Bug where diff --git a/testsuite/tests/polykinds/T16247a.stderr b/testsuite/tests/polykinds/T16247a.stderr index 0205a74429..8bcd75ac9b 100644 --- a/testsuite/tests/polykinds/T16247a.stderr +++ b/testsuite/tests/polykinds/T16247a.stderr @@ -1,5 +1,5 @@ -T16247a.hs:21:28: error: +T16247a.hs:22:28: error: • These kind and type variables: p k are out of dependency order. Perhaps try this ordering: k (p :: k) diff --git a/testsuite/tests/polykinds/T16263.hs b/testsuite/tests/polykinds/T16263.hs index 4331c123b4..4620d5b96e 100644 --- a/testsuite/tests/polykinds/T16263.hs +++ b/testsuite/tests/polykinds/T16263.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE GADTs, TypeInType, EmptyDataDecls #-} +{-# LANGUAGE GADTs, DataKinds, PolyKinds, EmptyDataDecls #-} module T16263 where diff --git a/testsuite/tests/polykinds/T16342.hs b/testsuite/tests/polykinds/T16342.hs index 5eafcee9ec..8d21a323e9 100644 --- a/testsuite/tests/polykinds/T16342.hs +++ b/testsuite/tests/polykinds/T16342.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE MultiParamTypeClasses, TypeInType, ConstrainedClassMethods, ScopedTypeVariables #-} +{-# LANGUAGE MultiParamTypeClasses, DataKinds, PolyKinds, ConstrainedClassMethods, ScopedTypeVariables #-} module T16342 where diff --git a/testsuite/tests/polykinds/T18451.hs b/testsuite/tests/polykinds/T18451.hs index da14360ea5..91fe7d7a43 100644 --- a/testsuite/tests/polykinds/T18451.hs +++ b/testsuite/tests/polykinds/T18451.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/polykinds/T18451.stderr b/testsuite/tests/polykinds/T18451.stderr index 0bd3f9893b..0626e69b79 100644 --- a/testsuite/tests/polykinds/T18451.stderr +++ b/testsuite/tests/polykinds/T18451.stderr @@ -1,5 +1,5 @@ -T18451.hs:10:58: error: +T18451.hs:11:58: error: • Expected kind ‘k0’, but ‘b’ has kind ‘k’ Type variable kinds: a :: k0 diff --git a/testsuite/tests/polykinds/T18451a.hs b/testsuite/tests/polykinds/T18451a.hs index 9b5248c30f..5611a7afcb 100644 --- a/testsuite/tests/polykinds/T18451a.hs +++ b/testsuite/tests/polykinds/T18451a.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/polykinds/T18451a.stderr b/testsuite/tests/polykinds/T18451a.stderr index b7ad0ee898..7a53c03d22 100644 --- a/testsuite/tests/polykinds/T18451a.stderr +++ b/testsuite/tests/polykinds/T18451a.stderr @@ -1,5 +1,5 @@ -T18451a.hs:10:15: error: +T18451a.hs:11:15: error: • These kind and type variables: a b (c :: Const Type b) are out of dependency order. Perhaps try this ordering: (b :: k) (a :: Const (*) b) (c :: Const (*) b) diff --git a/testsuite/tests/polykinds/T18451b.hs b/testsuite/tests/polykinds/T18451b.hs index 9b5248c30f..5611a7afcb 100644 --- a/testsuite/tests/polykinds/T18451b.hs +++ b/testsuite/tests/polykinds/T18451b.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/polykinds/T18451b.stderr b/testsuite/tests/polykinds/T18451b.stderr index 458d39105e..f426c73fa0 100644 --- a/testsuite/tests/polykinds/T18451b.stderr +++ b/testsuite/tests/polykinds/T18451b.stderr @@ -1,5 +1,5 @@ -T18451b.hs:10:15: error: +T18451b.hs:11:15: error: • These kind and type variables: a b (c :: Const Type b) are out of dependency order. Perhaps try this ordering: (b :: k) (a :: Const (*) b) (c :: Const (*) b) diff --git a/testsuite/tests/printer/PprDynamic.hs b/testsuite/tests/printer/PprDynamic.hs index 5134d8b067..76ee870056 100644 --- a/testsuite/tests/printer/PprDynamic.hs +++ b/testsuite/tests/printer/PprDynamic.hs @@ -4,7 +4,7 @@ Stephanie Weirich, Richard Eisenberg, and Dimitrios Vytiniotis, 2016. -} {-# LANGUAGE RankNTypes, PolyKinds, TypeOperators, ScopedTypeVariables, GADTs, FlexibleInstances, UndecidableInstances, RebindableSyntax, - DataKinds, MagicHash, AutoDeriveTypeable, TypeInType #-} + DataKinds, MagicHash, AutoDeriveTypeable #-} {-# OPTIONS_GHC -fno-warn-missing-methods -fno-warn-redundant-constraints #-} module Dynamic where diff --git a/testsuite/tests/printer/Test16236.hs b/testsuite/tests/printer/Test16236.hs index e19a0ee0c1..974ebd0db5 100644 --- a/testsuite/tests/printer/Test16236.hs +++ b/testsuite/tests/printer/Test16236.hs @@ -1,5 +1,5 @@ {-# LANGUAGE DataKinds, PolyKinds, TypeOperators, TypeFamilies - , TypeApplications, TypeInType #-} + , TypeApplications #-} module DumpParsedAst where import Data.Kind diff --git a/testsuite/tests/quantified-constraints/T14961.hs b/testsuite/tests/quantified-constraints/T14961.hs index 6f15ceb572..d5ae1f562f 100644 --- a/testsuite/tests/quantified-constraints/T14961.hs +++ b/testsuite/tests/quantified-constraints/T14961.hs @@ -7,7 +7,8 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilyDependencies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE QuantifiedConstraints #-} diff --git a/testsuite/tests/rename/should_compile/ExplicitForAllRules1.hs b/testsuite/tests/rename/should_compile/ExplicitForAllRules1.hs index bf3fab4efb..c1c9af7816 100644 --- a/testsuite/tests/rename/should_compile/ExplicitForAllRules1.hs +++ b/testsuite/tests/rename/should_compile/ExplicitForAllRules1.hs @@ -2,7 +2,6 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeInType #-} {-# LANGUAGE TypeApplications #-} module ExplicitForAllRules1 where diff --git a/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr b/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr index 88c7e7c771..7ac9b08cb2 100644 --- a/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr +++ b/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr @@ -1,11 +1,11 @@ -ExplicitForAllRules1.hs:46:31: warning: [-Wforall-identifier (in -Wdefault)] +ExplicitForAllRules1.hs:45:31: warning: [-Wforall-identifier (in -Wdefault)] The use of ‘forall’ as an identifier will become an error in a future GHC release. Suggested fix: Consider using another name, such as ‘forAll’, ‘for_all’, or ‘forall_’. -ExplicitForAllRules1.hs:49:31: warning: [-Wunused-foralls (in -Wextra)] +ExplicitForAllRules1.hs:48:31: warning: [-Wunused-foralls (in -Wextra)] Unused quantified type variable ‘b’ In the rewrite rule "example7" diff --git a/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.hs b/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.hs index f5fd1092ca..12c322ff9a 100644 --- a/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.hs +++ b/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.hs @@ -2,7 +2,6 @@ {-# LANGUAGE MagicHash #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} {-# LANGUAGE UnliftedNewtypes #-} module Goof where diff --git a/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr b/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr index db08ac81d8..cbb03c1d27 100644 --- a/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr +++ b/testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr @@ -1,5 +1,5 @@ -UnliftedNewtypesCoerceFail.hs:15:8: error: +UnliftedNewtypesCoerceFail.hs:14:8: error: • Unsaturated use of a representation-polymorphic primitive function. The first argument of ‘coerce’ does not have a fixed runtime representation. @@ -10,4 +10,4 @@ UnliftedNewtypesCoerceFail.hs:15:8: error: • In the expression: coerce In an equation for ‘goof’: goof = coerce • Relevant bindings include - goof :: x -> y (bound at UnliftedNewtypesCoerceFail.hs:15:1) + goof :: x -> y (bound at UnliftedNewtypesCoerceFail.hs:14:1) diff --git a/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.hs b/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.hs index f5d134e3b1..5a9d34e8a0 100644 --- a/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.hs +++ b/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.hs @@ -3,7 +3,6 @@ {-# LANGUAGE UnliftedNewtypes #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE PolyKinds #-} -{-# LANGUAGE TypeInType #-} module UnliftedNewtypesLevityBinder where diff --git a/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.stderr b/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.stderr index 41dbd44d3f..bd4b2ba2ca 100644 --- a/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.stderr +++ b/testsuite/tests/rep-poly/UnliftedNewtypesLevityBinder.stderr @@ -1,5 +1,5 @@ -UnliftedNewtypesLevityBinder.hs:16:7: error: +UnliftedNewtypesLevityBinder.hs:15:7: error: • The newtype constructor argument does not have a fixed runtime representation. Its type is: @@ -9,4 +9,4 @@ UnliftedNewtypesLevityBinder.hs:16:7: error: • In the expression: IdentC In an equation for ‘bad’: bad = IdentC • Relevant bindings include - bad :: a -> Ident a (bound at UnliftedNewtypesLevityBinder.hs:16:1) + bad :: a -> Ident a (bound at UnliftedNewtypesLevityBinder.hs:15:1) diff --git a/testsuite/tests/simplCore/should_compile/T15453.hs b/testsuite/tests/simplCore/should_compile/T15453.hs index a452bef0df..aeeb147dbe 100644 --- a/testsuite/tests/simplCore/should_compile/T15453.hs +++ b/testsuite/tests/simplCore/should_compile/T15453.hs @@ -1,7 +1,8 @@ {-# LANGUAGE ImpredicativeTypes #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module T15453 where diff --git a/testsuite/tests/simplCore/should_compile/T21577.hs b/testsuite/tests/simplCore/should_compile/T21577.hs index a0c94fc79a..fe11fcd770 100644 --- a/testsuite/tests/simplCore/should_compile/T21577.hs +++ b/testsuite/tests/simplCore/should_compile/T21577.hs @@ -1,7 +1,8 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE PolyKinds #-} module T21577 (bar) where diff --git a/testsuite/tests/th/T12045TH1.hs b/testsuite/tests/th/T12045TH1.hs index d8b9e00bf3..7d5ad856c3 100644 --- a/testsuite/tests/th/T12045TH1.hs +++ b/testsuite/tests/th/T12045TH1.hs @@ -1,6 +1,6 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TemplateHaskell, DataKinds, PolyKinds - , TypeInType, TypeApplications, TypeFamilies #-} + , TypeApplications, TypeFamilies #-} module T12045TH1 where import Data.Kind diff --git a/testsuite/tests/typecheck/no_skolem_info/T14040.hs b/testsuite/tests/typecheck/no_skolem_info/T14040.hs index 202c4600b2..eb5da8d01e 100644 --- a/testsuite/tests/typecheck/no_skolem_info/T14040.hs +++ b/testsuite/tests/typecheck/no_skolem_info/T14040.hs @@ -3,7 +3,8 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T14040 where import Data.Kind diff --git a/testsuite/tests/typecheck/no_skolem_info/T14040.stderr b/testsuite/tests/typecheck/no_skolem_info/T14040.stderr index fb4cc3f897..73e01979dd 100644 --- a/testsuite/tests/typecheck/no_skolem_info/T14040.stderr +++ b/testsuite/tests/typecheck/no_skolem_info/T14040.stderr @@ -1,5 +1,5 @@ -T14040.hs:26:46: error: +T14040.hs:27:46: error: • Couldn't match kind ‘k1’ with ‘WeirdList z’ Expected kind ‘WeirdList k1’, but ‘xs’ has kind ‘WeirdList (WeirdList z)’ @@ -7,7 +7,7 @@ T14040.hs:26:46: error: This (rigid, skolem) kind variable is bound by an explicit forall (z :: Type) (x :: z) (xs :: WeirdList (WeirdList z)) - at T14040.hs:25:26-77 + at T14040.hs:26:26-77 • In the second argument of ‘p’, namely ‘xs’ In the type ‘Sing wl -> (forall (y :: Type). p _ WeirdNil) @@ -29,7 +29,7 @@ T14040.hs:26:46: error: -> p _ (WeirdCons x xs)) -> p _ wl -T14040.hs:27:27: error: +T14040.hs:28:27: error: • Couldn't match kind ‘k0’ with ‘z’ Expected kind ‘WeirdList k0’, but ‘WeirdCons x xs’ has kind ‘WeirdList z’ @@ -37,7 +37,7 @@ T14040.hs:27:27: error: This (rigid, skolem) kind variable is bound by an explicit forall (z :: Type) (x :: z) (xs :: WeirdList (WeirdList z)) - at T14040.hs:25:26-77 + at T14040.hs:26:26-77 • In the second argument of ‘p’, namely ‘(WeirdCons x xs)’ In the type ‘Sing wl -> (forall (y :: Type). p _ WeirdNil) diff --git a/testsuite/tests/typecheck/no_skolem_info/T14040A.hs b/testsuite/tests/typecheck/no_skolem_info/T14040A.hs index 183a894398..c679fd7cd1 100644 --- a/testsuite/tests/typecheck/no_skolem_info/T14040A.hs +++ b/testsuite/tests/typecheck/no_skolem_info/T14040A.hs @@ -1,6 +1,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Bug where import Data.Kind diff --git a/testsuite/tests/typecheck/no_skolem_info/T14040A.stderr b/testsuite/tests/typecheck/no_skolem_info/T14040A.stderr index fca04623b0..554a4e0a32 100644 --- a/testsuite/tests/typecheck/no_skolem_info/T14040A.stderr +++ b/testsuite/tests/typecheck/no_skolem_info/T14040A.stderr @@ -1,5 +1,5 @@ -T14040A.hs:12:8: error: +T14040A.hs:13:8: error: • Cannot generalise type; skolem ‘a’ would escape its scope if I tried to quantify (x0 :: a) in this type: forall a (f :: forall (x :: a). Proxy @{a} x -> *). diff --git a/testsuite/tests/typecheck/should_compile/T11506.hs b/testsuite/tests/typecheck/should_compile/T11506.hs index a5db195e38..7f23ac8337 100644 --- a/testsuite/tests/typecheck/should_compile/T11506.hs +++ b/testsuite/tests/typecheck/should_compile/T11506.hs @@ -1,5 +1,5 @@ {-# LANGUAGE PolyKinds, ExistentialQuantification, ScopedTypeVariables, - TypeFamilies, TypeInType #-} + TypeFamilies, DataKinds #-} module T11506 where diff --git a/testsuite/tests/typecheck/should_compile/T12045a.hs b/testsuite/tests/typecheck/should_compile/T12045a.hs index 469a3307a7..a5c29c83c7 100644 --- a/testsuite/tests/typecheck/should_compile/T12045a.hs +++ b/testsuite/tests/typecheck/should_compile/T12045a.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds, GADTs, TypeApplications, TypeInType, DataKinds, +{-# LANGUAGE PolyKinds, GADTs, TypeApplications, DataKinds, RankNTypes, ConstraintKinds, TypeFamilies #-} module T12045a where diff --git a/testsuite/tests/typecheck/should_compile/T14366.hs b/testsuite/tests/typecheck/should_compile/T14366.hs index 9405c9b91b..52bc3a4338 100644 --- a/testsuite/tests/typecheck/should_compile/T14366.hs +++ b/testsuite/tests/typecheck/should_compile/T14366.hs @@ -1,6 +1,7 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} module T14366 where diff --git a/testsuite/tests/typecheck/should_compile/T14451.hs b/testsuite/tests/typecheck/should_compile/T14451.hs index 40f03e3ece..1d4493d20d 100644 --- a/testsuite/tests/typecheck/should_compile/T14451.hs +++ b/testsuite/tests/typecheck/should_compile/T14451.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Haskell2010 #-} -{-# Language KindSignatures, TypeOperators, PolyKinds, TypeOperators, ConstraintKinds, TypeFamilies, DataKinds, TypeInType, GADTs, AllowAmbiguousTypes, InstanceSigs, RankNTypes, UndecidableInstances #-} +{-# Language KindSignatures, TypeOperators, PolyKinds, TypeOperators, ConstraintKinds, TypeFamilies, DataKinds, GADTs, AllowAmbiguousTypes, InstanceSigs, RankNTypes, UndecidableInstances #-} module T14451 where import Data.Kind diff --git a/testsuite/tests/typecheck/should_compile/T15412.hs b/testsuite/tests/typecheck/should_compile/T15412.hs index 6458ae0a74..3996b1da48 100644 --- a/testsuite/tests/typecheck/should_compile/T15412.hs +++ b/testsuite/tests/typecheck/should_compile/T15412.hs @@ -1,4 +1,4 @@ -{-# Language DataKinds, TypeInType, TypeFamilies, UndecidableInstances #-} +{-# Language DataKinds, PolyKinds, TypeFamilies, UndecidableInstances #-} module T15412 where diff --git a/testsuite/tests/typecheck/should_compile/T15428.hs b/testsuite/tests/typecheck/should_compile/T15428.hs index a9d1cdd3b3..7ffcd88085 100644 --- a/testsuite/tests/typecheck/should_compile/T15428.hs +++ b/testsuite/tests/typecheck/should_compile/T15428.hs @@ -1,6 +1,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15428 where data Flurmp diff --git a/testsuite/tests/typecheck/should_compile/T15778.hs b/testsuite/tests/typecheck/should_compile/T15778.hs index 4c95d37c7c..37290e9f14 100644 --- a/testsuite/tests/typecheck/should_compile/T15778.hs +++ b/testsuite/tests/typecheck/should_compile/T15778.hs @@ -1,5 +1,6 @@ {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15778 where diff --git a/testsuite/tests/typecheck/should_compile/T16225.hs b/testsuite/tests/typecheck/should_compile/T16225.hs index 85c5441327..bac7d87574 100644 --- a/testsuite/tests/typecheck/should_compile/T16225.hs +++ b/testsuite/tests/typecheck/should_compile/T16225.hs @@ -1,7 +1,8 @@ {-# LANGUAGE AllowAmbiguousTypes #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} module T16225 where diff --git a/testsuite/tests/typecheck/should_compile/T17723a.hs b/testsuite/tests/typecheck/should_compile/T17723a.hs index e808aa77f5..b36ff8c727 100644 --- a/testsuite/tests/typecheck/should_compile/T17723a.hs +++ b/testsuite/tests/typecheck/should_compile/T17723a.hs @@ -3,7 +3,6 @@ {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} module T17723a (C(..)) where diff --git a/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs b/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs index 982d7e596c..df0cb353fa 100644 --- a/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs +++ b/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeInType, TypeOperators, TypeFamilies, +{-# LANGUAGE DataKinds, PolyKinds, TypeOperators, TypeFamilies, UndecidableInstances, ConstraintKinds #-} module TypeInTypeSubstitutions where diff --git a/testsuite/tests/typecheck/should_fail/T12102.hs b/testsuite/tests/typecheck/should_fail/T12102.hs index b17c9937c8..2439c52499 100644 --- a/testsuite/tests/typecheck/should_fail/T12102.hs +++ b/testsuite/tests/typecheck/should_fail/T12102.hs @@ -1,5 +1,6 @@ {-# LANGUAGE GADTs #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} diff --git a/testsuite/tests/typecheck/should_fail/T15330.hs b/testsuite/tests/typecheck/should_fail/T15330.hs index 0041806244..c7d8120927 100644 --- a/testsuite/tests/typecheck/should_fail/T15330.hs +++ b/testsuite/tests/typecheck/should_fail/T15330.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15330 where import Data.Kind diff --git a/testsuite/tests/typecheck/should_fail/T15330.stderr b/testsuite/tests/typecheck/should_fail/T15330.stderr index c2bf2447cc..43e6b473eb 100644 --- a/testsuite/tests/typecheck/should_fail/T15330.stderr +++ b/testsuite/tests/typecheck/should_fail/T15330.stderr @@ -1,5 +1,5 @@ -T15330.hs:11:6: error: +T15330.hs:12:6: error: • Couldn't match type: [Char] with: Proxy (T 'True) Expected: Proxy (T 'True) @@ -7,7 +7,7 @@ T15330.hs:11:6: error: • In the expression: "foo" In an equation for ‘f1’: f1 = "foo" -T15330.hs:15:6: error: +T15330.hs:16:6: error: • Couldn't match type: [Char] with: Proxy (t 'True) Expected: Proxy (t 'True) @@ -15,4 +15,4 @@ T15330.hs:15:6: error: • In the expression: "foo" In an equation for ‘f2’: f2 = "foo" • Relevant bindings include - f2 :: Proxy (t 'True) (bound at T15330.hs:15:1) + f2 :: Proxy (t 'True) (bound at T15330.hs:16:1) diff --git a/testsuite/tests/typecheck/should_fail/T15474.hs b/testsuite/tests/typecheck/should_fail/T15474.hs index 2fb68e8020..b18ce29784 100644 --- a/testsuite/tests/typecheck/should_fail/T15474.hs +++ b/testsuite/tests/typecheck/should_fail/T15474.hs @@ -1,5 +1,6 @@ {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15474 where import Data.Kind (Type) diff --git a/testsuite/tests/typecheck/should_fail/T15474.stderr b/testsuite/tests/typecheck/should_fail/T15474.stderr index 7fd96ebaa1..98f64213d9 100644 --- a/testsuite/tests/typecheck/should_fail/T15474.stderr +++ b/testsuite/tests/typecheck/should_fail/T15474.stderr @@ -1,5 +1,5 @@ -T15474.hs:9:1: error: +T15474.hs:10:1: error: • Uninferrable type variable k0 in the type synonym right-hand side: forall (t :: k0). Proxy @{k0} t • In the type declaration for ‘Forall’ diff --git a/testsuite/tests/typecheck/should_fail/T15515.hs b/testsuite/tests/typecheck/should_fail/T15515.hs index 3630609827..a36191b113 100644 --- a/testsuite/tests/typecheck/should_fail/T15515.hs +++ b/testsuite/tests/typecheck/should_fail/T15515.hs @@ -1,6 +1,7 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module T15515 where import Data.Kind diff --git a/testsuite/tests/typecheck/should_fail/T15515.stderr b/testsuite/tests/typecheck/should_fail/T15515.stderr index ded60fc30f..7e5bf02761 100644 --- a/testsuite/tests/typecheck/should_fail/T15515.stderr +++ b/testsuite/tests/typecheck/should_fail/T15515.stderr @@ -1,5 +1,5 @@ -T15515.hs:16:10: error: +T15515.hs:17:10: error: • Illegal type synonym family application ‘F’ in instance: C @{F -> *} D • In the instance declaration for ‘C (D :: F -> Type)’ diff --git a/testsuite/tests/typecheck/should_fail/T15552.hs b/testsuite/tests/typecheck/should_fail/T15552.hs index f1952cc10b..b45c3912a5 100644 --- a/testsuite/tests/typecheck/should_fail/T15552.hs +++ b/testsuite/tests/typecheck/should_fail/T15552.hs @@ -1,5 +1,5 @@ {-# LANGUAGE DataKinds, ExistentialQuantification, GADTs, PolyKinds, TypeOperators #-} -{-# LANGUAGE TypeInType, TypeFamilies #-} +{-# LANGUAGE TypeFamilies #-} module T15552 where import Data.Kind diff --git a/testsuite/tests/typecheck/should_fail/T15552a.hs b/testsuite/tests/typecheck/should_fail/T15552a.hs index 67fa4dd741..a6cc56f99d 100644 --- a/testsuite/tests/typecheck/should_fail/T15552a.hs +++ b/testsuite/tests/typecheck/should_fail/T15552a.hs @@ -1,6 +1,6 @@ {-# LANGUAGE Haskell2010 #-} {-# LANGUAGE DataKinds, ExistentialQuantification, GADTs, PolyKinds, TypeOperators #-} -{-# LANGUAGE TypeInType, TypeFamilies #-} +{-# LANGUAGE TypeFamilies #-} {- # LANGUAGE UndecidableInstances #-} module T15552 where diff --git a/testsuite/tests/typecheck/should_fail/T15629.hs b/testsuite/tests/typecheck/should_fail/T15629.hs index 6d1d0b8897..9d45e038ea 100644 --- a/testsuite/tests/typecheck/should_fail/T15629.hs +++ b/testsuite/tests/typecheck/should_fail/T15629.hs @@ -1,6 +1,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-} module Bug (f) where diff --git a/testsuite/tests/typecheck/should_fail/T15629.stderr b/testsuite/tests/typecheck/should_fail/T15629.stderr index aabc868844..f8985982a4 100644 --- a/testsuite/tests/typecheck/should_fail/T15629.stderr +++ b/testsuite/tests/typecheck/should_fail/T15629.stderr @@ -1,5 +1,5 @@ -T15629.hs:26:31: error: +T15629.hs:27:31: error: • Couldn't match kind ‘z’ with ‘ab’ Expected kind ‘F x ab ~> F x ab’, but ‘Comp (F1Sym :: x ~> F x z) F2Sym’ has kind ‘TyFun @@ -7,10 +7,10 @@ T15629.hs:26:31: error: -> *’ ‘z’ is a rigid type variable bound by the type signature for ‘g’ - at T15629.hs:26:17 + at T15629.hs:27:17 ‘ab’ is a rigid type variable bound by the type signature for ‘g’ - at T15629.hs:26:19-20 + at T15629.hs:27:19-20 • In the first argument of ‘Proxy’, namely ‘((Comp (F1Sym :: x ~> F x z) F2Sym) :: F x ab ~> F x ab)’ In the type signature: diff --git a/testsuite/tests/typecheck/should_fail/T15962.hs b/testsuite/tests/typecheck/should_fail/T15962.hs index e42fcdea2c..936193367a 100644 --- a/testsuite/tests/typecheck/should_fail/T15962.hs +++ b/testsuite/tests/typecheck/should_fail/T15962.hs @@ -1,5 +1,6 @@ {-# LANGUAGE GADTs #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleContexts #-} diff --git a/testsuite/tests/typecheck/should_fail/T15962.stderr b/testsuite/tests/typecheck/should_fail/T15962.stderr index 49dbb8ce96..c69bdf6cfc 100644 --- a/testsuite/tests/typecheck/should_fail/T15962.stderr +++ b/testsuite/tests/typecheck/should_fail/T15962.stderr @@ -1,18 +1,18 @@ -T15962.hs:27:11: error: +T15962.hs:28:11: error: • Found hole: _ :: Big ks -> Big (Eval (Map Dual ks)) Where: ‘ks’ is a rigid type variable bound by the type signature for: dualBig :: forall (ks :: [OpKind]). Big ks -> Big (Eval (Map Dual ks)) - at T15962.hs:26:1-45 + at T15962.hs:27:1-45 • In an equation for ‘dualBig’: dualBig = _ • Relevant bindings include dualBig :: Big ks -> Big (Eval (Map Dual ks)) - (bound at T15962.hs:27:1) + (bound at T15962.hs:28:1) Valid hole fits include dualBig :: Big ks -> Big (Eval (Map Dual ks)) - (bound at T15962.hs:27:1) + (bound at T15962.hs:28:1) -T15962.hs:33:12: error: +T15962.hs:34:12: error: Variable not in scope: iDontExist :: Big ('Conjunction : ks) diff --git a/testsuite/tests/typecheck/should_fail/T16627.hs b/testsuite/tests/typecheck/should_fail/T16627.hs index 0aec91a0fe..b6cf83fd20 100644 --- a/testsuite/tests/typecheck/should_fail/T16627.hs +++ b/testsuite/tests/typecheck/should_fail/T16627.hs @@ -1,4 +1,4 @@ -{-# language TypeInType, ScopedTypeVariables #-} +{-# language DataKinds, PolyKinds, ScopedTypeVariables #-} module Silly where import Type.Reflection (Typeable, typeRep, TypeRep) import Type.Reflection.Unsafe (mkTrApp) diff --git a/testsuite/tests/typecheck/should_run/UnliftedNewtypesCoerceRun.hs b/testsuite/tests/typecheck/should_run/UnliftedNewtypesCoerceRun.hs index 53905a302a..779e297438 100644 --- a/testsuite/tests/typecheck/should_run/UnliftedNewtypesCoerceRun.hs +++ b/testsuite/tests/typecheck/should_run/UnliftedNewtypesCoerceRun.hs @@ -6,7 +6,7 @@ {-# LANGUAGE PolyKinds #-} {-# LANGUAGE UnboxedTuples #-} {-# LANGUAGE UnboxedSums #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} import GHC.Int (Int(I#)) diff --git a/testsuite/tests/typecheck/should_run/UnliftedNewtypesIdentityRun.hs b/testsuite/tests/typecheck/should_run/UnliftedNewtypesIdentityRun.hs index f81367268b..8d3fdadc80 100644 --- a/testsuite/tests/typecheck/should_run/UnliftedNewtypesIdentityRun.hs +++ b/testsuite/tests/typecheck/should_run/UnliftedNewtypesIdentityRun.hs @@ -6,7 +6,7 @@ {-# LANGUAGE PolyKinds #-} {-# LANGUAGE UnboxedTuples #-} {-# LANGUAGE UnboxedSums #-} -{-# LANGUAGE TypeInType #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} import GHC.Int (Int(I#)) diff --git a/testsuite/tests/warnings/should_compile/T20312.hs b/testsuite/tests/warnings/should_compile/T20312.hs new file mode 100644 index 0000000000..90c93e2878 --- /dev/null +++ b/testsuite/tests/warnings/should_compile/T20312.hs @@ -0,0 +1,6 @@ +{-# LANGUAGE TypeInType #-} + +module T20312 where + +f :: Int +f = 42 diff --git a/testsuite/tests/warnings/should_compile/T20312.stderr b/testsuite/tests/warnings/should_compile/T20312.stderr new file mode 100644 index 0000000000..fb4cf338a6 --- /dev/null +++ b/testsuite/tests/warnings/should_compile/T20312.stderr @@ -0,0 +1,3 @@ + +T20312.hs:1:14: warning: [-Wdeprecated-flags (in -Wdefault)] + -XTypeInType is deprecated: use -XDataKinds and -XPolyKinds instead diff --git a/testsuite/tests/warnings/should_compile/all.T b/testsuite/tests/warnings/should_compile/all.T index 9ec8029fe6..40d1ce12f0 100644 --- a/testsuite/tests/warnings/should_compile/all.T +++ b/testsuite/tests/warnings/should_compile/all.T @@ -52,3 +52,4 @@ test('DodgyExports01', normal, compile, ['-Wdodgy-exports']) test('DerivingTypeable', normal, compile, ['-Wderiving-typeable']) test('T18862a', normal, compile, ['']) test('T18862b', normal, compile, ['']) +test('T20312', normal, compile,['-Wall']) |