f2d9ba8 · streamly · git.iko.soy

git.iko.soy/streamly

Future-proof against potential Prelude.foldl'

commitf2d9ba8558e1ce8211a483f4fc94f08736b1bc29 authorBodigrim <andrew.lelechenko@gmail.com> dateSun 4 Jun 2023, 18:36 (3 years ago) parent68b2d87

11 files changed+24−23

compare with master

unifiedsplit

core/src/Streamly/Data/Fold.hs+5−5

@@ -247,11 +247,11 @@ module Streamly.Data.Fold

247247where

248248

249249import 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

257257import Streamly.Internal.Data.Fold

core/src/Streamly/Internal/Data/Array/Generic.hs+1−1

@@ -65,7 +65,7 @@ import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

6565import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

6666import 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+1−1

@@ -267,7 +267,7 @@ import qualified Streamly.Internal.Data.Unboxed as Unboxed

267267import qualified Prelude

268268

269269import 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+1−1

@@ -96,7 +96,7 @@ import Streamly.Internal.Data.Unboxed (Unbox, peekWith, sizeOf)

9696import Streamly.Internal.Data.Unfold.Type (Unfold(..))

9797import Text.Read (readPrec)

9898

99−import Prelude hiding (length, foldr, read, unlines, splitAt)

99+import Prelude hiding (Foldable(..), read, unlines, splitAt)

100100

101101import qualified GHC.Exts as Exts

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

core/src/Streamly/Internal/Data/Fold.hs+4−4

@@ -340,11 +340,11 @@ import qualified Streamly.Internal.Data.Ring.Unboxed as Ring

340340import qualified Streamly.Internal.Data.Stream.StreamD.Type as StreamD

341341

342342import 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)

349349import Streamly.Internal.Data.Fold.Type

350350import Streamly.Internal.Data.Fold.Tee

core/src/Streamly/Internal/Data/Fold/Container.hs+1−1

@@ -102,7 +102,7 @@ import qualified Data.IntSet as IntSet

102102import qualified Data.Set as Set

103103import qualified Streamly.Internal.Data.IsMap as IsMap

104104

105−import Prelude hiding (length)

105+import Prelude hiding (Foldable(..))

106106import Streamly.Internal.Data.Fold

107107

108108-- $setup

core/src/Streamly/Internal/Data/Fold/Type.hs+1−1

@@ -457,7 +457,7 @@ import Streamly.Internal.Data.Refold.Type (Refold(..))

457457

458458import 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+1−1

@@ -47,7 +47,7 @@ import Control.Monad ((>=>))

4747import Fusion.Plugin.Types (Fuse(..))

4848import 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+1−1

@@ -35,7 +35,7 @@ import Streamly.Internal.Data.Fold.Type (Fold (..))

3535import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

3636import 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+3−2

@@ -104,8 +104,9 @@ import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Nesting

104104import qualified Streamly.Internal.Data.Stream.StreamD.Transform as StreamD

105105

106106import 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)

109110import Streamly.Internal.Data.Stream.StreamD.Type

110111

111112#include "DocTestDataStream.hs"

core/src/Streamly/Internal/Data/Stream/StreamK.hs+5−5

@@ -212,11 +212,11 @@ import qualified Streamly.Internal.Data.Stream.StreamD as Stream

212212import qualified Prelude

213213

214214import Prelude

215− hiding (foldl, foldr, last, map, mapM, mapM_, repeat, sequence,

216− take, filter, all, any, takeWhile, drop, dropWhile, minimum,

217− maximum, elem, notElem, null, head, tail, init, zipWith, lookup,

218− foldr1, (!!), replicate, reverse, concatMap, iterate, splitAt)

219−

215+ hiding (Foldable(..), last, map, mapM, mapM_, repeat, sequence,

216+ take, filter, all, any, takeWhile, drop, dropWhile,

217+ notElem, head, tail, init, zipWith, lookup,

218+ (!!), replicate, reverse, concatMap, iterate, splitAt)

219+import Data.Foldable (sum, length)

220220import Streamly.Internal.Data.Stream.StreamK.Type

221221import Streamly.Internal.Data.Parser.ParserD (ParseError(..))

222222