[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394: Make `-Wall` clean (5f232df)

[git at git.haskell.org]

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

On branches: changelog-foldtree,cleaned_bugfix394,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-184-generic,revert-408-bugfix_394
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f232df9781bc66dfd6e8aecc59c63e937df660d

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

commit 5f232df9781bc66dfd6e8aecc59c63e937df660d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:37:20 2015 +0100

    Make `-Wall` clean
    
    Get rid of left-over redundant-import warnings from the last minute
    AMP-changes that occured in GHC 7.10


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

5f232df9781bc66dfd6e8aecc59c63e937df660d
 Data/IntMap/Base.hs | 4 +---
 Data/Map/Base.hs    | 4 +---
 Data/Sequence.hs    | 2 +-
 Data/Tree.hs        | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index e15ed76..0a840f5 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -216,9 +216,7 @@ module Data.IntMap.Base (
     , highestBitMask
     ) where
 
-#if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#else
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 41c3611..569b602 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -270,9 +270,7 @@ module Data.Map.Base (
     , filterLt
     ) where
 
-#if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#else
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative (Applicative(..), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 8fc2baf..bb86c95 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -158,7 +158,7 @@ module Data.Sequence (
 import Prelude hiding (
     Functor(..),
 #if MIN_VERSION_base(4,8,0)
-    Applicative, foldMap, Monoid,
+    Applicative, (<$>), foldMap, Monoid,
 #endif
     null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
diff --git a/Data/Tree.hs b/Data/Tree.hs
index c1b9d34..a6f64f9 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -35,7 +35,6 @@ module Data.Tree(
     ) where
 
 #if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
 import Data.Foldable (toList)
 #else
 import Control.Applicative (Applicative(..), (<$>))