Add NFData CPP

Author: phadej

Data/HashMap/Internal.hs

@@ -146,7 +146,7 @@ import Data.Word (Word)
 #if __GLASGOW_HASKELL__ >= 711
 import Data.Semigroup (Semigroup((<>)))
 #endif
-import Control.DeepSeq (NFData(rnf), NFData2(liftRnf2), NFData1(liftRnf))
+import Control.DeepSeq (NFData(rnf))
 import Control.Monad.ST (ST)
 import Data.Bits ((.&.), (.|.), complement, popCount, unsafeShiftL, unsafeShiftR)
 import Data.Data hiding (Typeable)
@@ -178,6 +178,10 @@ import GHC.Stack
 import qualified Data.Hashable.Lifted as H
 #endif
 
+#if MIN_VERSION_deepseq(1,4,3)
+import qualified Control.DeepSeq as NF
+#endif
+
 #if __GLASGOW_HASKELL__ >= 802
 import GHC.Exts (TYPE, Int (..), Int#)
 #endif
@@ -201,11 +205,13 @@ data Leaf k v = L !k v
 instance (NFData k, NFData v) => NFData (Leaf k v) where
     rnf (L k v) = rnf k `seq` rnf v
 
-instance NFData k => NFData1 (Leaf k) where
-    liftRnf rnf2 = liftRnf2 rnf rnf2
+#if MIN_VERSION_deepseq(1,4,3)
+instance NFData k => NF.NFData1 (Leaf k) where
+    liftRnf rnf2 = NF.liftRnf2 rnf rnf2
 
-instance NFData2 Leaf where
+instance NF.NFData2 Leaf where
     liftRnf2 rnf1 rnf2 (L k v) = rnf1 k `seq` rnf2 v
+#endif
 
 -- Invariant: The length of the 1st argument to 'Full' is
 -- 2^bitsPerSubkey
@@ -229,15 +235,17 @@ instance (NFData k, NFData v) => NFData (HashMap k v) where
     rnf (Full ary)            = rnf ary
     rnf (Collision _ ary)     = rnf ary
 
-instance NFData k => NFData1 (HashMap k) where
-    liftRnf rnf2 = liftRnf2 rnf rnf2
+#if MIN_VERSION_deepseq(1,4,3)
+instance NFData k => NF.NFData1 (HashMap k) where
+    liftRnf rnf2 = NF.liftRnf2 rnf rnf2
 
-instance NFData2 HashMap where
+instance NF.NFData2 HashMap where
     liftRnf2 _ _ Empty                       = ()
-    liftRnf2 rnf1 rnf2 (BitmapIndexed _ ary) = liftRnf (liftRnf2 rnf1 rnf2) ary
-    liftRnf2 rnf1 rnf2 (Leaf _ l)            = liftRnf2 rnf1 rnf2 l
-    liftRnf2 rnf1 rnf2 (Full ary)            = liftRnf (liftRnf2 rnf1 rnf2) ary
-    liftRnf2 rnf1 rnf2 (Collision _ ary)     = liftRnf (liftRnf2 rnf1 rnf2) ary
+    liftRnf2 rnf1 rnf2 (BitmapIndexed _ ary) = NF.liftRnf (NF.liftRnf2 rnf1 rnf2) ary
+    liftRnf2 rnf1 rnf2 (Leaf _ l)            = NF.liftRnf2 rnf1 rnf2 l
+    liftRnf2 rnf1 rnf2 (Full ary)            = NF.liftRnf (NF.liftRnf2 rnf1 rnf2) ary
+    liftRnf2 rnf1 rnf2 (Collision _ ary)     = NF.liftRnf (NF.liftRnf2 rnf1 rnf2) ary
+#endif
 
 instance Functor (HashMap k) where
     fmap = map

Data/HashMap/Internal/Array.hs

@@ -75,7 +75,7 @@ module Data.HashMap.Internal.Array
 import Control.Applicative (Applicative (..), (<$>))
 #endif
 import Control.Applicative (liftA2)
-import Control.DeepSeq
+import Control.DeepSeq (NFData (..))
 import GHC.Exts(Int(..), Int#, reallyUnsafePtrEquality#, tagToEnum#, unsafeCoerce#, State#)
 import GHC.ST (ST(..))
 import Control.Monad.ST (stToIO)
@@ -104,6 +104,10 @@ import Data.Monoid (Monoid (..))
 import qualified Prelude
 #endif
 
+#if MIN_VERSION_deepseq(1,4,3)
+import qualified Control.DeepSeq as NF
+#endif
+
 import Data.HashMap.Internal.Unsafe (runST)
 import Control.Monad ((>=>))
 
@@ -250,7 +254,8 @@ rnfArray ary0 = go ary0 n0 0
 -- relevant rnf is strict, or in case it actually isn't.
 {-# INLINE rnfArray #-}
 
-instance NFData1 Array where
+#if MIN_VERSION_deepseq(1,4,3)
+instance NF.NFData1 Array where
     liftRnf = liftRnfArray
 
 liftRnfArray :: (a -> ()) -> Array a -> ()
@@ -262,6 +267,7 @@ liftRnfArray rnf0 ary0 = go ary0 n0 0
         | (# x #) <- index# ary i
         = rnf0 x `seq` go ary n (i+1)
 {-# INLINE liftRnfArray #-}
+#endif
 
 -- | Create a new mutable array of specified size, in the specified
 -- state thread, with each element containing the specified initial

Data/HashSet/Internal.hs

@@ -92,7 +92,7 @@ module Data.HashSet.Internal
     , keysSet
     ) where
 
-import Control.DeepSeq (NFData(..), NFData1(..), NFData2 (liftRnf2))
+import Control.DeepSeq (NFData(..))
 import Data.Data hiding (Typeable)
 import Data.HashMap.Internal
   ( HashMap, foldMapWithKey, foldlWithKey, foldrWithKey
@@ -123,6 +123,10 @@ import Data.Functor.Classes
 import qualified Data.Hashable.Lifted as H
 #endif
 
+#if MIN_VERSION_deepseq(1,4,3)
+import qualified Control.DeepSeq as NF
+#endif
+
 import Data.Functor ((<$))
 
 -- | A set of values.  A set cannot contain duplicate values.
@@ -138,8 +142,10 @@ instance (NFData a) => NFData (HashSet a) where
     rnf = rnf . asMap
     {-# INLINE rnf #-}
 
-instance NFData1 HashSet where
-    liftRnf rnf1 = liftRnf2 rnf1 rnf . asMap
+#if MIN_VERSION_deepseq(1,4,3)
+instance NF.NFData1 HashSet where
+    liftRnf rnf1 = NF.liftRnf2 rnf1 rnf . asMap
+#endif
 
 -- | Note that, in the presence of hash collisions, equal @HashSet@s may
 -- behave differently, i.e. substitutivity may be violated: