971b668 · streamly · git.iko.soy

git.iko.soy/streamly

Re-export entire submodules from the StreamK

commit971b6680a5d3ff0c0cdb6ecae734a1f7d4ab2c9a authorRanjeet Kumar Ranjan <ranjeetr@composewell.com> dateTue 8 Aug 2023, 11:25 (3 years ago) parentcd523f5

27 files changed+33−112

compare with master

unifiedsplit

benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs−1

@@ -33,7 +33,6 @@ import Prelude hiding

3333import qualified Prelude as P

3434import qualified Data.List as List

3535

36−import qualified Streamly.Internal.Data.Stream.StreamK.Type as S

3736import qualified Streamly.Internal.Data.StreamK as S

3837

3938import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)

benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs−1

@@ -33,7 +33,6 @@ import Prelude hiding

3333import qualified Prelude as P

3434-- import qualified Data.List as List

3535

36−import qualified Streamly.Internal.Data.Stream.StreamK.Type as S

3736import qualified Streamly.Internal.Data.StreamK as S

3837import qualified Streamly.Internal.Data.Stream as D

3938import qualified Streamly.Internal.Data.Fold as Fold

core/src/Streamly/Internal/Data/StreamK.hs+3−78

@@ -17,39 +17,14 @@ module Streamly.Internal.Data.StreamK

1717 -- $setup

1818

1919 -- * The stream type

20− Stream

20+ module Streamly.Internal.Data.Stream.StreamK.Type

21+

2122 , StreamK(..)

23+ , fromList

2224 , fromStream

2325 , toStream

2426

25− , CrossStreamK

26− , unCross

27− , mkCross

28−

29− -- * Construction Primitives

30− , mkStream

31− , nil

32− , nilM

33− , cons

34− , (.:)

35−

36− -- * Elimination Primitives

37− , foldStream

38− , foldStreamShared

39−

40− -- * Transformation Primitives

41− , unShare

42−

43− -- * Deconstruction

44− , uncons

45−

46− -- * Generation

47− -- ** Unfolds

48− , unfoldr

49− , unfoldrM

50−

5127 -- ** Specialized Generation

52− , repeat

5328 , repeatM

5429 , replicate

5530 , replicateM

@@ -58,28 +33,10 @@ module Streamly.Internal.Data.StreamK

5833 , iterate

5934 , iterateM

6035

61− -- ** Conversions

62− , fromPure

63− , fromEffect

64− , fromFoldable

65− , fromList

66−

67− -- * foldr/build

68− , foldrS

69− , foldrSM

70− , buildS

71− , augmentS

72−

7336 -- * Elimination

7437 -- ** General Folds

75− , foldr

7638 , foldr1

77− , foldrM

78−

79− , foldl'

8039 , foldlM'

81− , foldlS

82− , foldlx'

8340 , foldlMx'

8441 , fold

8542 , foldBreak

@@ -91,11 +48,7 @@ module Streamly.Internal.Data.StreamK

9148 , parseChunks

9249

9350 -- ** Specialized Folds

94− , drain

95− , null

9651 , head

97− , tail

98− , init

9952 , elem

10053 , notElem

10154 , all

@@ -131,7 +84,6 @@ module Streamly.Internal.Data.StreamK

13184 , dropWhile

13285

13386 -- ** Mapping

134− , map

13587 , mapM

13688 , sequence

13789

@@ -144,7 +96,6 @@ module Streamly.Internal.Data.StreamK

14496 , deleteBy

14597

14698 -- ** Reordering

147− , reverse

14899 , sortBy

149100

150101 -- ** Map and Filter

@@ -158,40 +109,14 @@ module Streamly.Internal.Data.StreamK

158109 , mergeBy

159110 , mergeByM

160111

161− -- ** Nesting

162− , crossApplyWith

163− , crossApply

164− , crossApplySnd

165− , crossApplyFst

166− , crossWith

167−

168− , concatMapWith

169− , concatMap

170− , concatEffect

171− , bindWith

172− , concatIterateWith

173− , concatIterateLeftsWith

174− , concatIterateScanWith

175−

176− , mergeMapWith

177− , mergeIterateWith

178−

179112 -- ** Transformation comprehensions

180113 , the

181114

182− -- * Semigroup Style Composition

183− , append

184− , interleave

185−

186115 -- * Exceptions

187116 , handle

188117

189118 -- * Resource Management

190119 , bracketIO

191−

192− -- * Utilities

193− , consM

194− , mfix

195120 )

196121where

197122

core/streamly-core.cabal+2−1

@@ -290,7 +290,6 @@ library

290290

291291 -- streamly-core-stream-types

292292 , Streamly.Internal.Data.SVar.Type

293− , Streamly.Internal.Data.Stream.StreamK.Type

294293 , Streamly.Internal.Data.Refold.Type

295294 , Streamly.Internal.Data.Producer.Type

296295 , Streamly.Internal.Data.Producer

@@ -426,6 +425,8 @@ library

426425 , Streamly.Internal.Data.Stream.StreamD.Transformer

427426 , Streamly.Internal.Data.Stream.StreamD.Type

428427

428+ , Streamly.Internal.Data.Stream.StreamK.Type

429+

429430 , Streamly.Internal.Data.Unfold.Type

430431 , Streamly.Internal.Data.Unfold.Enumeration

431432

src/Streamly/Internal/Data/Stream/Ahead.hs+2−2

@@ -54,9 +54,9 @@ import qualified Data.Heap as H

5454

5555import Streamly.Internal.Control.Concurrent

5656 (MonadRunInIO, MonadAsync, askRunInIO, restoreM)

57−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

57+import Streamly.Internal.Data.StreamK (Stream)

5858

59−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

59+import qualified Streamly.Internal.Data.StreamK as K

6060 (foldStreamShared, cons, mkStream, foldStream, fromEffect

6161 , nil, concatMapWith, fromPure, bindWith)

6262import qualified Streamly.Internal.Data.Stream as D

src/Streamly/Internal/Data/Stream/Async.hs+2−2

@@ -64,10 +64,10 @@ import Streamly.Internal.Control.Concurrent

6464 (MonadRunInIO, MonadAsync, askRunInIO, restoreM)

6565import Streamly.Internal.Data.Atomics

6666 (atomicModifyIORefCAS, atomicModifyIORefCAS_)

67−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

67+import Streamly.Internal.Data.StreamK (Stream)

6868import Streamly.Internal.Data.Stream.SVar.Generate (fromSVar, fromSVarD)

6969

70−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

70+import qualified Streamly.Internal.Data.StreamK as K

7171 (foldStreamShared, mkStream, foldStream, fromEffect

7272 , nil, concatMapWith, fromPure, bindWith)

7373import qualified Streamly.Internal.Data.Stream as D

src/Streamly/Internal/Data/Stream/Channel/Types.hs+1−1

@@ -133,7 +133,7 @@ import Streamly.Internal.Data.Time.Units (AbsTime, NanoSecond64(..))

133133import System.IO (hPutStrLn, stderr)

134134

135135import qualified Data.Set as Set

136−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

136+import qualified Streamly.Internal.Data.StreamK as K

137137

138138------------------------------------------------------------------------------

139139-- Common types

src/Streamly/Internal/Data/Stream/Concurrent.hs+1−3

@@ -110,14 +110,12 @@ import Streamly.Internal.Data.Stream.Channel.Types

110110 , concatMapDivK

111111 )

112112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)

113−import Streamly.Internal.Data.Stream (Stream)

114−import Streamly.Internal.Data.Stream (Step(..))

113+import Streamly.Internal.Data.Stream (Stream, Step(..))

115114

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

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

118117import qualified Streamly.Internal.Data.Stream as D

119118import qualified Streamly.Internal.Data.StreamK as K

120−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

121119

122120import Prelude hiding (mapM, sequence, concat, concatMap, zipWith)

123121import Streamly.Internal.Data.Stream.Concurrent.Channel

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Append.hs+1−1

@@ -36,7 +36,7 @@ import Streamly.Internal.Data.Stream.Channel.Dispatcher (modifyThread)

3636

3737import qualified Data.Heap as H

3838import qualified Data.Set as Set

39−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

39+import qualified Streamly.Internal.Data.StreamK as K

4040

4141import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

4242import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Interleave.hs+1−1

@@ -24,7 +24,7 @@ import Streamly.Internal.Control.Concurrent

2424import Streamly.Internal.Data.Stream.Channel.Dispatcher (delThread)

2525

2626import qualified Data.Set as Set

27−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

27+import qualified Streamly.Internal.Data.StreamK as K

2828

2929import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

3030import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Operations.hs+1−1

@@ -40,7 +40,7 @@ import System.Mem (performMajorGC)

4040

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

4242import qualified Streamly.Internal.Data.Stream as D

43−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

43+import qualified Streamly.Internal.Data.StreamK as K

4444

4545import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

4646import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Type.hs+1−1

@@ -28,7 +28,7 @@ import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS_)

2828import Streamly.Internal.Data.Stream.Channel.Dispatcher (dumpSVarStats)

2929import Streamly.Internal.Data.Stream.Channel.Worker

3030 (sendYield, sendStop, sendWithDoorBell)

31−import Streamly.Internal.Data.Stream.StreamK.Type (StreamK)

31+import Streamly.Internal.Data.StreamK (StreamK)

3232

3333import Streamly.Internal.Data.Stream.Channel.Types

3434

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

@@ -31,7 +31,7 @@ import Data.Int (Int64)

3131import Streamly.Internal.Data.Stream.IsStream.Type

3232 (IsStream, mkStream, foldStreamShared)

3333import Streamly.Internal.Data.Stream.Serial (SerialT)

34−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

34+import Streamly.Internal.Data.StreamK (Stream)

3535

3636import Streamly.Internal.Data.SVar

3737

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

@@ -85,7 +85,7 @@ import qualified Streamly.Internal.Data.Array.Type as A

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

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

8787import qualified Streamly.Internal.Data.Stream.Parallel as Par

88−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

88+import qualified Streamly.Internal.Data.StreamK as K

8989 (fromPure, fromEffect, repeatMWith, reverse)

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

9191 (repeatM, timesWith, foldAddLazy, map, scanlMAfter', postscanlMAfter'

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

@@ -177,7 +177,7 @@ import qualified Streamly.Internal.Data.Stream as D

177177 , notElem, all, any, minimum, minimumBy, maximum, maximumBy, the, lookup

178178 , find, findM, toListRev, isPrefixOf, isSubsequenceOf, stripPrefix, (!!)

179179 , fromStreamK, foldrM, parseD)

180−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

180+import qualified Streamly.Internal.Data.StreamK as K

181181 (uncons, foldlS, tail, init)

182182import qualified System.IO as IO

183183

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

@@ -183,9 +183,8 @@ import qualified Streamly.Internal.Data.Stream as D

183183 , roundRobin, mergeByM, unfoldMany, unfoldInterleave, intersperse

184184 , unfoldRoundRobin, interpose, interposeSuffix, gintercalate

185185 , gintercalateSuffix, intersperseMSuffix)

186−import qualified Streamly.Internal.Data.StreamK as K (mergeBy, mergeByM)

187−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

188− (interleave, append, mergeMapWith)

186+import qualified Streamly.Internal.Data.StreamK as K

187+ (interleave, append, mergeMapWith, mergeBy, mergeByM)

189188import qualified Streamly.Internal.Data.Stream.ZipAsync as ZipAsync

190189

191190import Prelude hiding (concat, concatMap, zipWith)

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

@@ -114,7 +114,7 @@ import qualified Streamly.Internal.Data.Stream as D

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

115115 , fromIndices, fromIndicesM, iterate, iterateM, toStreamK, fromListM

116116 , fromListM)

117−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

117+import qualified Streamly.Internal.Data.StreamK as K

118118 (unfoldr, unfoldrMWith, replicateMWith, fromIndicesMWith, iterateMWith

119119 , mfix, fromFoldable, fromFoldableM)

120120import qualified Streamly.Internal.Data.Stream.Serial as Stream (fromStreamK)

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

@@ -264,7 +264,7 @@ import qualified Streamly.Internal.Data.Stream as D

264264 , intersperseM_, intersperseMSuffix, intersperseMSuffix_

265265 , intersperseMSuffixWith, indexed, indexedR, rollingMap, rollingMapM

266266 , rollingMap2, mapMaybe, mapMaybeM)

267−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

267+import qualified Streamly.Internal.Data.StreamK as K

268268 (foldrS, foldrSShared, mapMWith)

269269import qualified Prelude

270270

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

@@ -123,7 +123,7 @@ import qualified Streamly.Internal.Data.Stream as D

123123 (Stream(..), toStreamK, fromStreamK

124124 , drain, eqBy, cmpBy, fromList, toList, foldrMx, foldlMx'

125125 , foldlx', foldl', fold)

126−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

126+import qualified Streamly.Internal.Data.StreamK as K

127127 (StreamK(..), cons, fromEffect

128128 , nil, fromPure, bindWith, drain

129129 , fromFoldable, nilM, repeat)

src/Streamly/Internal/Data/Stream/Parallel.hs+1−1

@@ -69,7 +69,7 @@ import Streamly.Internal.Control.Concurrent (MonadAsync)

6969import Streamly.Internal.Data.Stream (Step(..))

7070

7171import qualified Data.Set as Set

72−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

72+import qualified Streamly.Internal.Data.StreamK as K

7373 (StreamK, foldStreamShared, mkStream, foldStream, fromEffect

7474 , nil, concatMapWith, fromPure, bindWith)

7575import qualified Streamly.Internal.Data.Stream as D

src/Streamly/Internal/Data/Stream/SVar/Eliminate.hs+1−1

@@ -42,7 +42,7 @@ import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

4242

4343import qualified Streamly.Internal.Data.Stream as D

4444 (Stream(..), Step(..), fold)

45−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

45+import qualified Streamly.Internal.Data.StreamK as K

4646 (Stream, mkStream, foldStream, foldStreamShared, nilM)

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

4848 (fromStreamK, toStreamK)

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

@@ -45,7 +45,7 @@ import System.Mem (performMajorGC)

4545

4646import qualified Streamly.Internal.Data.Stream as D

4747 (Stream(..), Step(..))

48−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

48+import qualified Streamly.Internal.Data.StreamK as K

4949 (Stream, foldStreamShared, mkStream, foldStream)

5050import qualified Streamly.Internal.Data.Stream.Serial as Stream (fromStreamK)

5151

src/Streamly/Internal/Data/Stream/Serial.hs+2−2

@@ -70,11 +70,11 @@ import Text.Read

7070 , readListPrecDefault)

7171import Streamly.Internal.BaseCompat ((#.))

7272import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)

73−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

73+import Streamly.Internal.Data.StreamK (Stream)

7474

7575import qualified Streamly.Internal.Data.Stream.Common as P

7676import qualified Streamly.Internal.Data.Stream as D

77−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

77+import qualified Streamly.Internal.Data.StreamK as K

7878

7979import Prelude hiding (map, mapM, repeat, filter)

8080

src/Streamly/Internal/Data/Stream/Zip.hs+2−2

@@ -46,10 +46,10 @@ import Text.Read

4646import Streamly.Internal.BaseCompat ((#.))

4747import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)

4848import Streamly.Internal.Data.Stream.Serial (SerialT(..))

49−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

49+import Streamly.Internal.Data.StreamK (Stream)

5050

5151import qualified Streamly.Internal.Data.Stream.Common as P

52−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

52+import qualified Streamly.Internal.Data.StreamK as K

5353import qualified Streamly.Internal.Data.Stream as D

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

5555

src/Streamly/Internal/Data/Stream/ZipAsync.hs+1−1

@@ -23,7 +23,7 @@ module Streamly.Internal.Data.Stream.ZipAsync {-# DEPRECATED "Please use \"Strea

2323where

2424

2525import Streamly.Internal.Control.Concurrent (MonadAsync)

26−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

26+import Streamly.Internal.Data.StreamK (Stream)

2727

2828import qualified Streamly.Internal.Data.StreamK as K

2929 (mkStream, foldStream, zipWithM, consM)

src/Streamly/Internal/FileSystem/FD.hs+1−1

@@ -151,7 +151,7 @@ import qualified Streamly.Internal.Data.Stream.Chunked as AS

151151import qualified Streamly.Internal.Data.Stream as S

152152import qualified Streamly.Internal.Data.Stream as D

153153 (Stream(..), Step(..))

154−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)

154+import qualified Streamly.Internal.Data.StreamK as K (mkStream)

155155

156156

157157-------------------------------------------------------------------------------

src/Streamly/Internal/Network/Socket.hs+1−1

@@ -105,7 +105,7 @@ import qualified Streamly.Internal.Data.Stream as D

105105 (Stream(..), Step(..))

106106import qualified Streamly.Data.Unfold as UF

107107import qualified Streamly.Internal.Data.Unfold as UF (first, map)

108−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)

108+import qualified Streamly.Internal.Data.StreamK as K (mkStream)

109109

110110-- $setup

111111-- >>> :m