Future-proof against potential Prelude.foldl' (#948)

Author: Bodigrim

containers/src/Data/IntMap/Internal.hs

@@ -311,7 +311,7 @@ import Data.Bits
 import qualified Data.Foldable as Foldable
 import Data.Maybe (fromMaybe)
 import Utils.Containers.Internal.Prelude hiding
-  (lookup, map, filter, foldr, foldl, null)
+  (lookup, map, filter, foldr, foldl, foldl', null)
 import Prelude ()
 
 import Data.IntSet.Internal (Key)

containers/src/Data/IntMap/Lazy.hs

@@ -172,8 +172,8 @@ module Data.IntMap.Lazy (
     , foldMapWithKey
 
     -- ** Strict folds
-    , foldr'
-    , foldl'
+    , IM.foldr'
+    , IM.foldl'
     , foldrWithKey'
     , foldlWithKey'
 

containers/src/Data/IntMap/Strict/Internal.hs

@@ -260,7 +260,7 @@ module Data.IntMap.Strict.Internal (
     ) where
 
 import Utils.Containers.Internal.Prelude hiding
-  (lookup,map,filter,foldr,foldl,null)
+  (lookup,map,filter,foldr,foldl,foldl',null)
 import Prelude ()
 
 import Data.Bits

containers/src/Data/IntSet.hs

@@ -128,8 +128,8 @@ module Data.IntSet (
             , IS.foldr
             , IS.foldl
             -- ** Strict folds
-            , foldr'
-            , foldl'
+            , IS.foldr'
+            , IS.foldl'
             -- ** Legacy folds
             , fold
 

containers/src/Data/IntSet/Internal.hs

@@ -204,7 +204,7 @@ import Data.Semigroup (Semigroup((<>)))
 #endif
 import Data.Semigroup (stimesIdempotentMonoid)
 import Utils.Containers.Internal.Prelude hiding
-  (filter, foldr, foldl, null, map)
+  (filter, foldr, foldl, foldl', null, map)
 import Prelude ()
 
 import Utils.Containers.Internal.BitUtil

containers/src/Data/Map/Internal.hs

@@ -384,7 +384,7 @@ import qualified Data.Foldable as Foldable
 import Data.Bifoldable
 #endif
 import Utils.Containers.Internal.Prelude hiding
-  (lookup, map, filter, foldr, foldl, null, splitAt, take, drop)
+  (lookup, map, filter, foldr, foldl, foldl', null, splitAt, take, drop)
 import Prelude ()
 
 import qualified Data.Set.Internal as Set

containers/src/Data/Map/Strict/Internal.hs

@@ -308,7 +308,9 @@ module Data.Map.Strict.Internal
     , valid
     ) where
 
-import Prelude hiding (lookup,map,filter,foldr,foldl,null,take,drop,splitAt)
+import Utils.Containers.Internal.Prelude hiding
+  (lookup,map,filter,foldr,foldl,foldl',null,take,drop,splitAt)
+import Prelude ()
 
 import Data.Map.Internal
   ( Map (..)

containers/src/Data/Sequence/Internal.hs

@@ -199,8 +199,8 @@ import Utils.Containers.Internal.Prelude hiding (
 #if MIN_VERSION_base(4,11,0)
     (<>),
 #endif
-    (<$>), foldMap, Monoid,
-    null, length, lookup, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
+    (<$>), Monoid,
+    null, length, lookup, take, drop, splitAt,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
     unzip, takeWhile, dropWhile, iterate, reverse, filter, mapM, sum, all)
 import Prelude ()
@@ -212,7 +212,7 @@ import Control.Monad (MonadPlus(..))
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
 import Utils.Containers.Internal.State (State(..), execState)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr'), toList)
+import Data.Foldable (foldr', toList)
 import qualified Data.Foldable as F
 
 import qualified Data.Semigroup as Semigroup

containers/src/Data/Set.hs

@@ -141,8 +141,8 @@ module Data.Set (
             , S.foldr
             , S.foldl
             -- ** Strict folds
-            , foldr'
-            , foldl'
+            , S.foldr'
+            , S.foldl'
             -- ** Legacy folds
             , fold
 

containers/src/Data/Set/Internal.hs

@@ -233,7 +233,7 @@ module Data.Set.Internal (
             ) where
 
 import Utils.Containers.Internal.Prelude hiding
-  (filter,foldl,foldr,null,map,take,drop,splitAt)
+  (filter,foldl,foldl',foldr,null,map,take,drop,splitAt)
 import Prelude ()
 import Control.Applicative (Const(..))
 import qualified Data.List as List