Use the new flag -XDataKinds

11 files changed, 13 insertions, 10 deletions

diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 31454ff705..008c664786 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -39,6 +39,7 @@ expectedGhcOnlyExtensions = ["ParallelArrays",
                              "AlternativeLayoutRuleTransitional",
                              "MonadComprehensions",
                              "TraditionalRecordSyntax",
+                             "DataKinds",
                              "PolyKinds",
                              "InstanceSigs",
                              "CApiFFI"]
diff --git a/testsuite/tests/polykinds/PolyKinds01.hs b/testsuite/tests/polykinds/PolyKinds01.hs
index 2f5f1e8521..918e5a9a44 100644
--- a/testsuite/tests/polykinds/PolyKinds01.hs
+++ b/testsuite/tests/polykinds/PolyKinds01.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds01 where
diff --git a/testsuite/tests/polykinds/PolyKinds02.hs b/testsuite/tests/polykinds/PolyKinds02.hs
index 259b53e21d..6a5559ccae 100644
--- a/testsuite/tests/polykinds/PolyKinds02.hs
+++ b/testsuite/tests/polykinds/PolyKinds02.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds02 where
diff --git a/testsuite/tests/polykinds/PolyKinds02.stderr b/testsuite/tests/polykinds/PolyKinds02.stderr
index 7c732220b7..3c61552662 100644
--- a/testsuite/tests/polykinds/PolyKinds02.stderr
+++ b/testsuite/tests/polykinds/PolyKinds02.stderr
@@ -1,5 +1,5 @@
 
-PolyKinds02.hs:12:16:
+PolyKinds02.hs:13:16:
     Kind mis-match
     The second argument of `Vec' should have kind `Nat',
     but `Nat' has kind `*'
diff --git a/testsuite/tests/polykinds/PolyKinds05.hs b/testsuite/tests/polykinds/PolyKinds05.hs
index f86433c90f..50bea433a8 100644
--- a/testsuite/tests/polykinds/PolyKinds05.hs
+++ b/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 -> *
diff --git a/testsuite/tests/polykinds/PolyKinds06.hs b/testsuite/tests/polykinds/PolyKinds06.hs
index b89d3fb9f8..9691d45ebb 100644
--- a/testsuite/tests/polykinds/PolyKinds06.hs
+++ b/testsuite/tests/polykinds/PolyKinds06.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds06 where
diff --git a/testsuite/tests/polykinds/PolyKinds07.hs b/testsuite/tests/polykinds/PolyKinds07.hs
index b132b0931e..27d0acecb1 100644
--- a/testsuite/tests/polykinds/PolyKinds07.hs
+++ b/testsuite/tests/polykinds/PolyKinds07.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds07 where
diff --git a/testsuite/tests/polykinds/PolyKinds09.hs b/testsuite/tests/polykinds/PolyKinds09.hs
index 4b6f412f96..b874d5ca16 100644
--- a/testsuite/tests/polykinds/PolyKinds09.hs
+++ b/testsuite/tests/polykinds/PolyKinds09.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE DefaultSignatures          #-}
 {-# LANGUAGE TypeFamilies               #-}
 {-# LANGUAGE GADTs                      #-}
diff --git a/testsuite/tests/polykinds/PolyKinds10.hs b/testsuite/tests/polykinds/PolyKinds10.hs
index b5735326fe..b023fd092f 100644
--- a/testsuite/tests/polykinds/PolyKinds10.hs
+++ b/testsuite/tests/polykinds/PolyKinds10.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE RankNTypes                 #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 
 module Main where
 
diff --git a/testsuite/tests/polykinds/PolyKinds11.hs b/testsuite/tests/polykinds/PolyKinds11.hs
index c7eea5b271..f80fa3fa7e 100644
--- a/testsuite/tests/polykinds/PolyKinds11.hs
+++ b/testsuite/tests/polykinds/PolyKinds11.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds                  #-}
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds11 where
diff --git a/testsuite/tests/polykinds/PolyKinds12.hs b/testsuite/tests/polykinds/PolyKinds12.hs
index 736f58450a..4d18551cb9 100644
--- a/testsuite/tests/polykinds/PolyKinds12.hs
+++ b/testsuite/tests/polykinds/PolyKinds12.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds, TypeFamilies, GADTs #-}
+{-# LANGUAGE DataKinds, PolyKinds, TypeFamilies, GADTs #-}
 
 module PolyKinds12 where