[commit: packages/deepseq] master, wip/remove_ghc70_72_cpp: Update CHANGELOG for #30 (a201067)
git at git.haskell.org
git at git.haskell.org
Wed Jul 19 21:59:29 UTC 2017
Repository : ssh://git@git.haskell.org/deepseq
On branches: master,wip/remove_ghc70_72_cpp
Link : http://git.haskell.org/packages/deepseq.git/commitdiff/a2010677bd7019001acccbc52739320050fa2dda
>---------------------------------------------------------------
commit a2010677bd7019001acccbc52739320050fa2dda
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date: Sat Apr 8 13:17:42 2017 -0400
Update CHANGELOG for #30
Plus some minor code cleanup
>---------------------------------------------------------------
a2010677bd7019001acccbc52739320050fa2dda
Control/DeepSeq.hs | 17 ++++++++++-------
changelog.md | 3 ++-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Control/DeepSeq.hs b/Control/DeepSeq.hs
index 344991d..4c5505e 100644
--- a/Control/DeepSeq.hs
+++ b/Control/DeepSeq.hs
@@ -430,28 +430,31 @@ instance NFData1 Ratio where
liftRnf r x = r (numerator x) `seq` r (denominator x)
-- | @since 1.4.3.0
-instance (NFData1 f, NFData1 g) => NFData1(Compose f g) where liftRnf r = liftRnf (liftRnf r) . getCompose
+instance (NFData1 f, NFData1 g) => NFData1 (Compose f g) where
+ liftRnf r = liftRnf (liftRnf r) . getCompose
-- | @since 1.4.3.0
-instance (NFData1 f, NFData1 g, NFData a) => NFData (Compose f g a) where rnf = rnf1
+instance (NFData1 f, NFData1 g, NFData a) => NFData (Compose f g a) where
+ rnf = rnf1
-- | @since 1.4.3.0
-instance (NFData1 f, NFData1 g) => NFData1(Functor.Sum f g) where
+instance (NFData1 f, NFData1 g) => NFData1 (Functor.Sum f g) where
liftRnf rnf0 (Functor.InL l) = liftRnf rnf0 l
liftRnf rnf0 (Functor.InR r) = liftRnf rnf0 r
-- | @since 1.4.3.0
-instance (NFData1 f, NFData1 g, NFData a) => NFData(Functor.Sum f g a) where rnf = rnf1
+instance (NFData1 f, NFData1 g, NFData a) => NFData (Functor.Sum f g a) where
+ rnf = rnf1
-- | @since 1.4.3.0
-instance (NFData1 f, NFData1 g) => NFData1(Functor.Product f g) where
+instance (NFData1 f, NFData1 g) => NFData1 (Functor.Product f g) where
liftRnf rnf0 (Functor.Pair f g) = liftRnf rnf0 f `seq` liftRnf rnf0 g
-- | @since 1.4.3.0
-instance (NFData1 f, NFData1 g, NFData a) => NFData(Functor.Product f g a) where rnf = rnf1
+instance (NFData1 f, NFData1 g, NFData a) => NFData (Functor.Product f g a) where
+ rnf = rnf1
instance NFData a => NFData (Ratio a) where
-
#else
instance (Integral a, NFData a) => NFData (Ratio a) where
#endif
diff --git a/changelog.md b/changelog.md
index 0a9380d..8f95f22 100644
--- a/changelog.md
+++ b/changelog.md
@@ -13,7 +13,8 @@
([#13](https://github.com/haskell/deepseq/issues/13))
* Add `NFData Ordering` ([#25](https://github.com/haskell/deepseq/pull/25))
* Add `NFData1` and `NFData2` type classes ([#8](https://github.com/haskell/deepseq/issues/8))
- * Add `NFData1` and `NFData` instances for Compose
+ * Add `NFData1` and `NFData` instances for `Data.Functor.{Compose,Sum,Product}`
+ ([#30](https://github.com/haskell/deepseq/pull/30))
## 1.4.2.0 *Apr 2016*
More information about the ghc-commits
mailing list