[commit: packages/containers] master: Make `-Wall`-clean for base-4.8.0.0 (71f53cb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f

>---------------------------------------------------------------

commit 71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 28 09:36:44 2014 +0100

    Make `-Wall`-clean for base-4.8.0.0


>---------------------------------------------------------------

71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f
 Data/Graph.hs       |  2 ++
 Data/IntMap/Base.hs | 11 ++++++++---
 Data/IntSet/Base.hs |  4 +++-
 Data/Map/Base.hs    |  9 +++++++--
 Data/Sequence.hs    |  3 +++
 Data/Set/Base.hs    |  2 ++
 Data/Tree.hs        | 13 +++++++++----
 7 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index 5f2bc15..c02b3e3 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -75,7 +75,9 @@ import qualified Data.IntSet as Set
 import Data.Tree (Tree(Node), Forest)
 
 -- std interfaces
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+#endif
 import Control.DeepSeq (NFData(rnf))
 import Data.Maybe
 import Data.Array
diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index d25cb9e..e15ed76 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -216,16 +216,21 @@ module Data.IntMap.Base (
     , highestBitMask
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#else
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
+import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+import Data.Word (Word)
+#endif
+
 import Control.DeepSeq (NFData(rnf))
 import Control.Monad (liftM)
 import Data.Bits
 import qualified Data.Foldable as Foldable
 import Data.Maybe (fromMaybe)
-import Data.Monoid (Monoid(..))
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
-import Data.Word (Word)
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import Data.IntSet.Base (Key)
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 6ddd0fb..c89bd18 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -169,9 +169,11 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Bits
 import qualified Data.List as List
 import Data.Maybe (fromMaybe)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
-import Data.Typeable
 import Data.Word (Word)
+#endif
+import Data.Typeable
 import Prelude hiding (filter, foldr, foldl, null, map)
 
 import Data.Utils.BitUtil
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 815e54b..965a258 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -270,12 +270,17 @@ module Data.Map.Base (
     , filterLt
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#else
 import Control.Applicative (Applicative(..), (<$>))
+import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+#endif
+
 import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
-import Data.Monoid (Monoid(..))
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..6b11266 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -147,6 +147,9 @@ module Data.Sequence (
 
 import Prelude hiding (
     Functor(..),
+#if MIN_VERSION_base(4,8,0)
+    Applicative, foldMap, Monoid,
+#endif
     null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
     takeWhile, dropWhile, iterate, reverse, filter, mapM, sum, all)
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 0dbc569..e1ebad3 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -192,7 +192,9 @@ module Data.Set.Base (
 import Prelude hiding (filter,foldl,foldr,null,map)
 import qualified Data.List as List
 import Data.Bits (shiftL, shiftR)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
+#endif
 import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
diff --git a/Data/Tree.hs b/Data/Tree.hs
index 4ee935b..abc9902 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -34,13 +34,19 @@ module Data.Tree(
     unfoldTreeM_BF, unfoldForestM_BF,
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+import Data.Foldable (toList)
+#else
 import Control.Applicative (Applicative(..), (<$>))
-import Control.Monad (liftM)
+import Data.Foldable (Foldable(foldMap), toList)
 import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+#endif
+
+import Control.Monad (liftM)
 import Data.Sequence (Seq, empty, singleton, (<|), (|>), fromList,
             ViewL(..), ViewR(..), viewl, viewr)
-import Data.Foldable (Foldable(foldMap), toList)
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
@@ -52,7 +58,6 @@ import Data.Data (Data)
 import Data.Coerce
 #endif
 
-
 -- | Multi-way trees, also known as /rose trees/.
 data Tree a = Node {
         rootLabel :: a,         -- ^ label value