NFData1,NFData2 instances for Data.Map (haskell#767)

containers/changelog.md

@@ -9,6 +9,10 @@
   `Data.IntSet.splitMember` are now strict in the key. Previously, the key was
   ignored for an empty map or set. (Soumik Sarkar)
 
+### Additions
+
+* `Data.Map`: `NFData1`, `NFData2` instances (David Beacham)
+
 ## 0.7
 
 ### Breaking changes

containers/src/Data/Map/Internal.hs

@@ -384,7 +384,7 @@ import Data.Semigroup (Arg(..), Semigroup(stimes))
 import Data.Semigroup (Semigroup((<>)))
 #endif
 import Control.Applicative (Const (..))
-import Control.DeepSeq (NFData(rnf))
+import Control.DeepSeq (NFData(rnf),NFData1(liftRnf),NFData2(liftRnf2))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
 import Data.Bifoldable
@@ -4363,6 +4363,14 @@ instance (NFData k, NFData a) => NFData (Map k a) where
     rnf Tip = ()
     rnf (Bin _ kx x l r) = rnf kx `seq` rnf x `seq` rnf l `seq` rnf r
 
+instance NFData k => NFData1 (Map k) where
+  liftRnf _ Tip = ()
+  liftRnf rnfx (Bin sz kx x l r) = rnf sz `seq` rnf kx `seq` rnfx x `seq` liftRnf rnfx l `seq` liftRnf rnfx r
+
+instance NFData2 Map where
+  liftRnf2 _ _ Tip = ()
+  liftRnf2 rnfkx rnfx (Bin sz kx x l r) = rnf sz `seq` rnfkx kx `seq` rnfx x `seq` liftRnf2 rnfkx rnfx l `seq` liftRnf2 rnfkx rnfx r
+
 {--------------------------------------------------------------------
   Read
 --------------------------------------------------------------------}