Skip to content

Commit 518fe62

Browse files
committed
Clean up import warnings for GHC 9.6
1 parent 056bf4b commit 518fe62

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

Data/Primitive/PrimArray.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ import Data.Primitive.ByteArray (ByteArray(..))
113113
#if !MIN_VERSION_base(4,11,0)
114114
import Data.Monoid ((<>))
115115
#endif
116-
import Control.Applicative
116+
#if !MIN_VERSION_base(4,18,0)
117+
import Control.Applicative (liftA2)
118+
#endif
117119
import Control.DeepSeq
118120
import Control.Monad.Primitive
119121
import Control.Monad.ST

Data/Primitive/Types.hs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
{-# LANGUAGE CPP, UnboxedTuples, MagicHash, DeriveDataTypeable #-}
2-
{-# LANGUAGE GeneralizedNewtypeDeriving, StandaloneDeriving #-}
1+
{-# LANGUAGE CPP #-}
2+
{-# LANGUAGE UnboxedTuples #-}
3+
{-# LANGUAGE MagicHash #-}
4+
{-# LANGUAGE DeriveDataTypeable #-}
5+
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6+
{-# LANGUAGE StandaloneDeriving #-}
37
{-# LANGUAGE ScopedTypeVariables #-}
4-
{-# LANGUAGE TypeInType #-}
58
{-# LANGUAGE DeriveGeneric #-}
9+
{-# LANGUAGE DataKinds #-}
10+
{-# LANGUAGE PolyKinds #-}
11+
12+
#if __GLASGOW_HASKELL__ < 906
13+
{-# LANGUAGE TypeInType #-}
14+
#endif
615

716
#include "HsBaseConfig.h"
817

@@ -49,9 +58,12 @@ import qualified GHC.Exts
4958
import Control.Applicative (Const(..))
5059
import Data.Functor.Identity (Identity(..))
5160
import qualified Data.Monoid as Monoid
52-
import Data.Ord (Down(..))
5361
import qualified Data.Semigroup as Semigroup
5462

63+
#if !MIN_VERSION_base(4,13,0)
64+
import Data.Ord (Down(..))
65+
#endif
66+
5567
-- | Class of types supporting primitive array operations. This includes
5668
-- interfacing with GC-managed memory (functions suffixed with @ByteArray#@)
5769
-- and interfacing with unmanaged memory (functions suffixed with @Addr#@).

0 commit comments

Comments
 (0)