e718389 · streamly · git.iko.soy

git.iko.soy/streamly

Move the Parallel module under IsStream

commite718389b2c75044f0fdafb9377e825aecbbd0246 authorHarendra Kumar <harendra@composewell.com> dateWed 21 Sep 2022, 23:05 (4 years ago) parent05ff41e

8 files changed+12−11

compare with master

unifiedsplit

benchmark/Streamly/Benchmark/Data/Stream/Transform.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream/Common.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+1−1 src/Streamly/Internal/Data/Stream/Parallel.hs → src/Streamly/Internal/Data/Stream/IsStream/Parallel.hs+3−3 src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream/Type.hs+3−2 streamly.cabal+1−1

benchmark/Streamly/Benchmark/Data/Stream/Transform.hs+1−1

@@ -35,7 +35,7 @@ import qualified Streamly.Internal.Data.Unfold as Unfold

3535import qualified Streamly.Internal.Data.Stream.IsStream as Stream

3636import Streamly.Internal.Data.Time.Units

3737#else

38−import qualified Streamly.Internal.Data.Stream.Parallel as Stream

38+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Stream

3939import qualified Streamly.Internal.Data.Stream as Stream

4040#endif

4141

src/Streamly/Internal/Data/Stream/IsStream/Common.hs+1−1

@@ -84,7 +84,7 @@ import qualified Streamly.Data.Stream as Stream (fold, foldBreak)

8484import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

8585import qualified Streamly.Internal.Data.Stream.IsStream.Async as Async

8686import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

87−import qualified Streamly.Internal.Data.Stream.Parallel as Par

87+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par

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

8989 (fromPure, fromEffect, repeatMWith, reverse)

9090import qualified Streamly.Internal.Data.Stream.StreamD as D

src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+1−1

@@ -174,7 +174,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type

174174import Streamly.Data.Unfold (Unfold)

175175

176176import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

177−import qualified Streamly.Internal.Data.Stream.Parallel as Par

177+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par

178178import qualified Streamly.Internal.Data.Stream.WSerial as WSerial

179179import qualified Streamly.Internal.Data.Stream.StreamD as D

180180 (append, interleave, interleaveSuffix, interleaveInfix, interleaveMin

src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+1−1

@@ -109,7 +109,7 @@ import Streamly.Internal.Data.Unboxed (Unboxed)

109109import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

110110 (toStreamD, IORef)

111111import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

112−import qualified Streamly.Internal.Data.Stream.Parallel as Par

112+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par

113113import qualified Streamly.Internal.Data.Stream.Serial as Serial

114114import qualified Streamly.Internal.Data.Stream.StreamD as D

115115 (unfold, unfoldr, toStreamK, unfoldr, repeat, replicate, replicateM

src/Streamly/Internal/Data/Stream/Parallel.hs → src/Streamly/Internal/Data/Stream/IsStream/Parallel.hsrenamed+3−3

@@ -1,7 +1,7 @@

11{-# LANGUAGE UndecidableInstances #-}

33-- |

4−-- Module : Streamly.Internal.Data.Stream.Parallel

4+-- Module : Streamly.Internal.Data.Stream.IsStream.Parallel

66--

77-- License : BSD3

@@ -20,7 +20,7 @@

2020-- return n -- IO Int

2121-- :}

2222--

23−module Streamly.Internal.Data.Stream.Parallel

23+module Streamly.Internal.Data.Stream.IsStream.Parallel

2424 (

2525 -- * Parallel Stream Type

2626 ParallelT(..)

@@ -545,7 +545,7 @@ parallelFst m1 m2 =

545545-- seconds.

546546--

547547-- >>> import qualified Streamly.Data.Fold as Fold

548−-- >>> import qualified Streamly.Internal.Data.Stream.Parallel as Parallel

548+-- >>> import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Parallel

549549-- >>> Stream.fold Fold.drain $ Parallel.interjectSuffix 1.05 (putChar ',') $ Stream.mapM (\x -> threadDelay 1000000 >> putChar x) $ Stream.fromList "hello"

550550-- h,e,l,l,o

551551--

src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+1−1

@@ -251,7 +251,7 @@ import Streamly.Internal.Data.SVar (Rate(..))

251251import Streamly.Internal.Data.Time.Units (AbsTime, RelTime64)

252252

253253import qualified Streamly.Data.Fold as FL

254−import qualified Streamly.Internal.Data.Stream.Parallel as Par

254+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par

255255import qualified Streamly.Internal.Data.Stream.Serial as Serial

256256import qualified Streamly.Internal.Data.Stream.StreamD as D

257257 (transform, foldrT, tap, tapOffsetEvery, pollCounts, mapM, scanOnce

src/Streamly/Internal/Data/Stream/IsStream/Type.hs+3−2

@@ -106,7 +106,8 @@ import Streamly.Internal.Data.Stream.WSerial (WSerialT(..), WSerial)

106106import Streamly.Internal.Data.Stream.IsStream.Async

107107 (AsyncT(..), Async, WAsyncT(..), WAsync)

108108import Streamly.Internal.Data.Stream.Ahead (AheadT(..), Ahead)

109−import Streamly.Internal.Data.Stream.Parallel (ParallelT(..), Parallel)

109+import Streamly.Internal.Data.Stream.IsStream.Parallel

110+ (ParallelT(..), Parallel)

110111import Streamly.Internal.Data.Stream.Zip (ZipSerialM, ZipSerial)

111112import Streamly.Internal.Data.Stream.ZipAsync (ZipAsyncM(..), ZipAsync)

112113import Streamly.Internal.Data.SVar.Type (State, adaptState)

@@ -114,7 +115,7 @@ import Streamly.Internal.Data.SVar.Type (State, adaptState)

114115import qualified Prelude

115116import qualified Streamly.Internal.Data.Stream.Ahead as Ahead

116117import qualified Streamly.Internal.Data.Stream.IsStream.Async as Async

117−import qualified Streamly.Internal.Data.Stream.Parallel as Parallel

118+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Parallel

118119import qualified Streamly.Internal.Data.Stream.Serial as Serial

119120import qualified Streamly.Internal.Data.Stream.WSerial as WSerial

120121import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

streamly.cabal+1−1

@@ -464,7 +464,6 @@ library

464464 , Streamly.Internal.Data.Stream.Async.Channel.Operations

465465 , Streamly.Internal.Data.Stream.Async.Channel

466466 , Streamly.Internal.Data.Stream.Async

467− , Streamly.Internal.Data.Stream.Parallel

468467 , Streamly.Internal.Data.Stream.Ahead

469468 , Streamly.Internal.Data.Stream.ZipAsync

470469

@@ -481,6 +480,7 @@ library

481480 , Streamly.Internal.Data.Stream.IsStream.Lift

482481 , Streamly.Internal.Data.Stream.IsStream.Top

483482 , Streamly.Internal.Data.Stream.IsStream.Async

483+ , Streamly.Internal.Data.Stream.IsStream.Parallel

484484 , Streamly.Internal.Data.Stream.IsStream

485485

486486 -- streamly-serde