Clean up import warnings for GHC 9.6

haskell · Feb 20, 2023 · 518fe62 · 518fe62
1 parent 056bf4b
commit 518fe62
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/Data/Primitive/PrimArray.hs b/Data/Primitive/PrimArray.hs
@@ -113,7 +113,9 @@ import Data.Primitive.ByteArray (ByteArray(..))
 #if !MIN_VERSION_base(4,11,0)
 import Data.Monoid ((<>))
 #endif
-import Control.Applicative
+#if !MIN_VERSION_base(4,18,0)
+import Control.Applicative (liftA2)
+#endif
 import Control.DeepSeq
 import Control.Monad.Primitive
 import Control.Monad.ST

diff --git a/Data/Primitive/Types.hs b/Data/Primitive/Types.hs
@@ -1,8 +1,17 @@
-{-# LANGUAGE CPP, UnboxedTuples, MagicHash, DeriveDataTypeable #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving, StandaloneDeriving #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE PolyKinds #-}
+
+#if __GLASGOW_HASKELL__ < 906
+{-# LANGUAGE TypeInType #-}
+#endif
 
 #include "HsBaseConfig.h"
 
@@ -49,9 +58,12 @@ import qualified GHC.Exts
 import Control.Applicative (Const(..))
 import Data.Functor.Identity (Identity(..))
 import qualified Data.Monoid as Monoid
-import Data.Ord (Down(..))
 import qualified Data.Semigroup as Semigroup
 
+#if !MIN_VERSION_base(4,13,0)
+import Data.Ord (Down(..))
+#endif
+
 -- | Class of types supporting primitive array operations. This includes
 -- interfacing with GC-managed memory (functions suffixed with @ByteArray#@)
 -- and interfacing with unmanaged memory (functions suffixed with @Addr#@).