Use the new flag -XDataKinds

testsuite/tests/driver/T4437.hs

@@ -39,6 +39,7 @@ expectedGhcOnlyExtensions = ["ParallelArrays",
                              "AlternativeLayoutRuleTransitional",
                              "MonadComprehensions",
                              "TraditionalRecordSyntax",
+                             "DataKinds",
                              "PolyKinds",
                              "InstanceSigs",
                              "CApiFFI"]

testsuite/tests/polykinds/PolyKinds01.hs

-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds01 where

testsuite/tests/polykinds/PolyKinds02.hs

-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds02 where

testsuite/tests/polykinds/PolyKinds02.stderr

 
-PolyKinds02.hs:12:16:
+PolyKinds02.hs:13:16:
     Kind mis-match
     The second argument of `Vec' should have kind `Nat',
     but `Nat' has kind `*'

testsuite/tests/polykinds/PolyKinds05.hs

@@ -5,5 +5,5 @@ module PolyKinds05 where
 data A f
 data B = B1 (A Maybe)
 
--- Should fail. We have -XPolyKinds on, so `A` gets the polymorphic kind 
+-- Should work. We have -XPolyKinds on, so `A` gets the polymorphic kind 
 --   forall k. k -> *

testsuite/tests/polykinds/PolyKinds06.hs

-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds06 where

testsuite/tests/polykinds/PolyKinds07.hs

-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds07 where

testsuite/tests/polykinds/PolyKinds09.hs

-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE DefaultSignatures          #-}
 {-# LANGUAGE TypeFamilies               #-}
 {-# LANGUAGE GADTs                      #-}

testsuite/tests/polykinds/PolyKinds10.hs

@@ -5,7 +5,7 @@
 {-# LANGUAGE RankNTypes                 #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 
 module Main where
 

testsuite/tests/polykinds/PolyKinds11.hs

-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds11 where

testsuite/tests/polykinds/PolyKinds12.hs

-{-# LANGUAGE PolyKinds, TypeFamilies, GADTs #-}
+{-# LANGUAGE DataKinds, PolyKinds, TypeFamilies, GADTs #-}
 
 module PolyKinds12 where