[commit: packages/parallel] master: Make `-Wall` clean (e48b0de)
git at git.haskell.org
git at git.haskell.org
Sat Jan 2 08:16:33 UTC 2016
Repository : ssh://git@git.haskell.org/parallel
On branch : master
Link : http://git.haskell.org/packages/parallel.git/commitdiff/e48b0de3fffa3e0db11fe0e2021eb6aec2bdfa2c
>---------------------------------------------------------------
commit e48b0de3fffa3e0db11fe0e2021eb6aec2bdfa2c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sun Dec 28 10:02:59 2014 +0100
Make `-Wall` clean
>---------------------------------------------------------------
e48b0de3fffa3e0db11fe0e2021eb6aec2bdfa2c
Control/Parallel/Strategies.hs | 2 ++
Control/Seq.hs | 6 +++++-
changelog.md | 4 ++++
parallel.cabal | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Control/Parallel/Strategies.hs b/Control/Parallel/Strategies.hs
index addf792..2ab9a8f 100644
--- a/Control/Parallel/Strategies.hs
+++ b/Control/Parallel/Strategies.hs
@@ -139,8 +139,10 @@ module Control.Parallel.Strategies (
NFData
) where
+#if !MIN_VERSION_base(4,8,0)
import Data.Traversable
import Control.Applicative
+#endif
import Control.Parallel
import Control.DeepSeq
import Control.Monad
diff --git a/Control/Seq.hs b/Control/Seq.hs
index 5f696eb..2404501 100644
--- a/Control/Seq.hs
+++ b/Control/Seq.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
-----------------------------------------------------------------------------
-- |
@@ -57,9 +58,12 @@ module Control.Seq
, seqTuple9
) where
-import Prelude
import Control.DeepSeq (NFData, deepseq)
+#if MIN_VERSION_base(4,8,0)
+import Data.Foldable (toList)
+#else
import Data.Foldable (Foldable, toList)
+#endif
import Data.Map (Map)
import qualified Data.Map (toList)
import Data.Ix (Ix)
diff --git a/changelog.md b/changelog.md
index f940ec9..3989273 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
# Changelog for [`parallel` package](http://hackage.haskell.org/package/parallel)
+## 3.2.0.6 *Dec 2014*
+
+ - Make `-Wall` message free for all supported `base` versions
+
## 3.2.0.5 *Dec 2014*
- Support `base-4.8.0.0`/`deepseq-1.4.0.0` (and thus GHC 7.10)
diff --git a/parallel.cabal b/parallel.cabal
index 71fbd37..1128110 100644
--- a/parallel.cabal
+++ b/parallel.cabal
@@ -1,5 +1,5 @@
name: parallel
-version: 3.2.0.5
+version: 3.2.0.6
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
More information about the ghc-commits
mailing list