Skip to content

Commit f2d9ba8

Browse files
Bodigrimharendra-kumar
authored andcommitted
Future-proof against potential Prelude.foldl'
1 parent 68b2d87 commit f2d9ba8

File tree

11 files changed

+24
-23
lines changed

11 files changed

+24
-23
lines changed

core/src/Streamly/Data/Fold.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,11 @@ module Streamly.Data.Fold
247247
where
248248

249249
import Prelude
250-
hiding (filter, drop, dropWhile, take, takeWhile, zipWith, foldr,
251-
foldl, map, mapM_, sequence, all, any, sum, product, elem,
252-
notElem, maximum, minimum, head, last, tail, length, null,
253-
reverse, iterate, init, and, or, lookup, foldr1, (!!),
254-
scanl, scanl1, replicate, concatMap, mconcat, foldMap, unzip,
250+
hiding (Foldable(..), filter, drop, dropWhile, take, takeWhile, zipWith,
251+
map, mapM_, sequence, all, any,
252+
notElem, head, last, tail,
253+
reverse, iterate, init, and, or, lookup, (!!),
254+
scanl, scanl1, replicate, concatMap, mconcat, unzip,
255255
span, splitAt, break, mapM, maybe)
256256

257257
import Streamly.Internal.Data.Fold

core/src/Streamly/Internal/Data/Array/Generic.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
6565
import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
6666
import qualified Text.ParserCombinators.ReadPrec as ReadPrec
6767

68-
import Prelude hiding (foldr, length, read)
68+
import Prelude hiding (Foldable(..), read)
6969

7070
-------------------------------------------------------------------------------
7171
-- Array Data Type

core/src/Streamly/Internal/Data/Array/Mut/Type.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ import qualified Streamly.Internal.Data.Unboxed as Unboxed
267267
import qualified Prelude
268268

269269
import Prelude hiding
270-
(length, foldr, read, unlines, splitAt, reverse, truncate)
270+
(Foldable(..), read, unlines, splitAt, reverse, truncate)
271271

272272
#include "DocTestDataMutArray.hs"
273273

core/src/Streamly/Internal/Data/Array/Type.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ import Streamly.Internal.Data.Unboxed (Unbox, peekWith, sizeOf)
9696
import Streamly.Internal.Data.Unfold.Type (Unfold(..))
9797
import Text.Read (readPrec)
9898

99-
import Prelude hiding (length, foldr, read, unlines, splitAt)
99+
import Prelude hiding (Foldable(..), read, unlines, splitAt)
100100

101101
import qualified GHC.Exts as Exts
102102
import qualified Streamly.Internal.Data.Array.Mut.Type as MA

core/src/Streamly/Internal/Data/Fold.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,11 @@ import qualified Streamly.Internal.Data.Ring.Unboxed as Ring
340340
import qualified Streamly.Internal.Data.Stream.StreamD.Type as StreamD
341341

342342
import Prelude hiding
343-
( filter, foldl1, drop, dropWhile, take, takeWhile, zipWith
344-
, foldl, foldr, map, mapM_, sequence, all, any, sum, product, elem
345-
, notElem, maximum, minimum, head, last, tail, length, null
343+
( Foldable(..), filter, drop, dropWhile, take, takeWhile, zipWith
344+
, map, mapM_, sequence, all, any
345+
, notElem, head, last, tail
346346
, reverse, iterate, init, and, or, lookup, (!!)
347-
, scanl, scanl1, replicate, concatMap, mconcat, foldMap, unzip
347+
, scanl, scanl1, replicate, concatMap, mconcat, unzip
348348
, span, splitAt, break, mapM, zip, maybe)
349349
import Streamly.Internal.Data.Fold.Type
350350
import Streamly.Internal.Data.Fold.Tee

core/src/Streamly/Internal/Data/Fold/Container.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ import qualified Data.IntSet as IntSet
102102
import qualified Data.Set as Set
103103
import qualified Streamly.Internal.Data.IsMap as IsMap
104104

105-
import Prelude hiding (length)
105+
import Prelude hiding (Foldable(..))
106106
import Streamly.Internal.Data.Fold
107107

108108
-- $setup

core/src/Streamly/Internal/Data/Fold/Type.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ import Streamly.Internal.Data.Refold.Type (Refold(..))
457457

458458
import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
459459

460-
import Prelude hiding (concatMap, filter, foldr, map, take)
460+
import Prelude hiding (Foldable(..), concatMap, filter, map, take)
461461

462462
#include "DocTestDataFold.hs"
463463

core/src/Streamly/Internal/Data/Refold/Type.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import Control.Monad ((>=>))
4747
import Fusion.Plugin.Types (Fuse(..))
4848
import Streamly.Internal.Data.Fold.Step (Step(..), mapMStep)
4949

50-
import Prelude hiding (take, iterate)
50+
import Prelude hiding (Foldable(..), take, iterate)
5151

5252
-- $setup
5353
-- >>> :m

core/src/Streamly/Internal/Data/Stream/Common.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import Streamly.Internal.Data.Fold.Type (Fold (..))
3535
import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
3636
import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
3737

38-
import Prelude hiding (foldr, repeat)
38+
import Prelude hiding (Foldable(..), repeat)
3939

4040
------------------------------------------------------------------------------
4141
-- Conversions

core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@ import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Nesting
104104
import qualified Streamly.Internal.Data.Stream.StreamD.Transform as StreamD
105105

106106
import Prelude hiding
107-
( all, any, elem, foldr, foldr1, head, last, lookup, mapM, mapM_
108-
, maximum, minimum, notElem, null, splitAt, tail, (!!))
107+
( Foldable(..), all, any, head, last, lookup, mapM, mapM_
108+
, notElem, splitAt, tail, (!!))
109+
import Data.Foldable (length)
109110
import Streamly.Internal.Data.Stream.StreamD.Type
110111

111112
#include "DocTestDataStream.hs"

0 commit comments

Comments
 (0)