d304fb8 · streamly · git.iko.soy

git.iko.soy/streamly

Hide Internal StreamD submodules

commitd304fb842a187fcb4e0a67467b2da64c9b343154 authorRanjeet Kumar Ranjan <ranjeetr@composewell.com> dateThu 3 Aug 2023, 09:28 (3 years ago) parent82054c8

26 files changed+59−57

compare with master

unifiedsplit

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

@@ -54,7 +54,7 @@ import Control.Monad.IO.Class (MonadIO)

5454

5555#ifdef INSPECTION

5656import Streamly.Internal.Data.Unbox (Unbox)

57−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

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

5858import Test.Inspection

5959#endif

6060

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

@@ -41,7 +41,7 @@ import Streamly.Benchmark.Common

4141import Streamly.Benchmark.Common.Handle

4242

4343#ifdef INSPECTION

44−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

44+import Streamly.Internal.Data.Stream (Step(..))

4545

4646import qualified Streamly.Internal.Data.MutArray.Type as MA

4747import qualified Streamly.Internal.Data.Unfold as IUF

benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1

@@ -46,7 +46,7 @@ import Prelude hiding (last, length)

4646import Streamly.Benchmark.Common.Handle

4747

4848#ifdef INSPECTION

49−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)

49+import Streamly.Internal.Data.Stream (Step(..), FoldMany)

5050

5151import qualified Streamly.Internal.Data.MutArray.Type as MA

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

benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+2−2

@@ -38,9 +38,9 @@ import Gauge hiding (env)

3838import Streamly.Benchmark.Common.Handle

3939

4040#ifdef INSPECTION

41−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

41+import Streamly.Internal.Data.Stream (Step(..))

4242

43−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

43+import qualified Streamly.Internal.Data.Stream as D

4444import qualified Streamly.Internal.Data.Tuple.Strict as Strict

4545import qualified Streamly.Internal.Data.Stream.MutChunked as MAS

4646import qualified Streamly.Internal.Data.Array.Type as AT

benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1

@@ -39,7 +39,7 @@ import Streamly.Benchmark.Common.Handle

3939

4040#ifdef INSPECTION

4141import Streamly.Internal.Data.Unbox (Unbox)

42−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

42+import Streamly.Internal.Data.Stream.StreamD (Step(..))

4343import qualified Streamly.Internal.Data.Fold.Type as Fold

4444import qualified Streamly.Internal.Data.Tuple.Strict as Strict

4545import qualified Streamly.Internal.Data.Array.Type as Array

core/src/Streamly/Internal/FileSystem/Handle.hs+1−1

@@ -137,7 +137,7 @@ import qualified Streamly.Internal.Data.MutArray.Type as MArray

137137import qualified Streamly.Internal.Data.Refold.Type as Refold

138138import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)

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

140−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

140+import qualified Streamly.Internal.Data.Stream as D

141141 (Stream(..), Step(..))

142142import qualified Streamly.Internal.Data.Unfold as UF

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

core/streamly-core.cabal+15−13

@@ -290,8 +290,6 @@ library

290290 , Streamly.Internal.Data.Fold.Step

291291 , Streamly.Internal.Data.Refold.Type

292292 , Streamly.Internal.Data.Fold.Type

293− , Streamly.Internal.Data.Stream.StreamD.Step

294− , Streamly.Internal.Data.Stream.StreamD.Type

295293 , Streamly.Internal.Data.Unfold.Type

296294 , Streamly.Internal.Data.Producer.Type

297295 , Streamly.Internal.Data.Producer

@@ -316,13 +314,6 @@ library

316314 -- streamly-core-streams

317315 , Streamly.Internal.Data.StreamK

318316 -- StreamD depends on streamly-array-types

319− , Streamly.Internal.Data.Stream.StreamD.Generate

320− , Streamly.Internal.Data.Stream.StreamD.Eliminate

321− , Streamly.Internal.Data.Stream.StreamD.Nesting

322− , Streamly.Internal.Data.Stream.StreamD.Transform

323− , Streamly.Internal.Data.Stream.StreamD.Exception

324− , Streamly.Internal.Data.Stream.StreamD.Lift

325− , Streamly.Internal.Data.Stream.StreamD.Top

326317 , Streamly.Internal.Data.Stream.StreamD

327318 , Streamly.Internal.Data.Stream.Common

328319 , Streamly.Internal.Data.Stream

@@ -332,7 +323,6 @@ library

332323 -- streamly-core-data

333324 , Streamly.Internal.Data.Builder

334325 , Streamly.Internal.Data.Unfold

335− , Streamly.Internal.Data.Unfold.Enumeration

336326 , Streamly.Internal.Data.Fold.Tee

337327 , Streamly.Internal.Data.Fold

338328 , Streamly.Internal.Data.Fold.Chunked

@@ -341,13 +331,11 @@ library

341331 , Streamly.Internal.Data.Pipe

342332

343333 -- streamly-transformers (non-base)

344− , Streamly.Internal.Data.Stream.StreamD.Transformer

345334 , Streamly.Internal.Data.Stream.StreamK.Transformer

346335

347336 -- streamly-containers (non-base)

348− , Streamly.Internal.Data.Stream.StreamD.Container

349− , Streamly.Internal.Data.Fold.Container

350337

338+ , Streamly.Internal.Data.Fold.Container

351339 , Streamly.Internal.Data.Stream.Chunked

352340

353341 -- streamly-core-data-arrays

@@ -420,6 +408,20 @@ library

420408 , Streamly.Unicode.Parser

421409 , Streamly.Unicode.Stream

422410 , Streamly.Unicode.String

411+ other-modules:

412+ Streamly.Internal.Data.Stream.StreamD.Container

413+ , Streamly.Internal.Data.Stream.StreamD.Eliminate

414+ , Streamly.Internal.Data.Stream.StreamD.Exception

415+ , Streamly.Internal.Data.Stream.StreamD.Generate

416+ , Streamly.Internal.Data.Stream.StreamD.Lift

417+ , Streamly.Internal.Data.Stream.StreamD.Nesting

418+ , Streamly.Internal.Data.Stream.StreamD.Step

419+ , Streamly.Internal.Data.Stream.StreamD.Top

420+ , Streamly.Internal.Data.Stream.StreamD.Transform

421+ , Streamly.Internal.Data.Stream.StreamD.Transformer

422+ , Streamly.Internal.Data.Stream.StreamD.Type

423+

424+ , Streamly.Internal.Data.Unfold.Enumeration

423425

424426 if flag(dev)

425427 exposed-modules:

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

@@ -34,7 +34,7 @@ import Streamly.Internal.Data.Stream.Channel.Dispatcher (dumpSVarStats)

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

3535

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

37−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

37+import qualified Streamly.Internal.Data.Stream as D

3838

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

4040

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

@@ -59,7 +59,7 @@ import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

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

6060 (foldStreamShared, cons, mkStream, foldStream, fromEffect

6161 , nil, concatMapWith, fromPure, bindWith)

62−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

62+import qualified Streamly.Internal.Data.Stream as D

6363 (mapM, fromStreamK, toStreamK)

6464import qualified Streamly.Internal.Data.Stream.Serial as Stream (toStreamK)

6565

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

@@ -70,7 +70,7 @@ import Streamly.Internal.Data.Stream.SVar.Generate (fromSVar, fromSVarD)

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

7171 (foldStreamShared, mkStream, foldStream, fromEffect

7272 , nil, concatMapWith, fromPure, bindWith)

73−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

73+import qualified Streamly.Internal.Data.Stream as D

7474 (Stream(..), Step(..), mapM, toStreamK, fromStreamK)

7575import qualified Streamly.Internal.Data.Stream.Serial as Stream (toStreamK)

7676

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

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

110110 , concatMapDivK

111111 )

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

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

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

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

115115

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

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

@@ -34,12 +34,12 @@ import Data.IORef (newIORef, readIORef, mkWeakIORef, writeIORef)

3434import Data.Maybe (isNothing)

3535import Streamly.Internal.Control.Concurrent

3636 (MonadAsync, MonadRunInIO, askRunInIO)

37−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

37+import Streamly.Internal.Data.Stream (Stream)

3838import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

3939import System.Mem (performMajorGC)

4040

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

42−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

42+import qualified Streamly.Internal.Data.Stream as D

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

4444

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

src/Streamly/Internal/Data/Stream/Exception/Lifted.hs+1−1

@@ -35,7 +35,7 @@ import Data.Map.Strict (Map)

3535import GHC.Exts (inline)

3636import Streamly.Internal.Control.Concurrent

3737 (MonadRunInIO, MonadAsync, withRunInIO)

38−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

38+import Streamly.Internal.Data.Stream (Stream)

3939import Streamly.Internal.Data.IOFinalizer.Lifted

4040 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)

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

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

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

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

3333 (IsStream(..), fromStreamD, toStreamD)

3434

35−import qualified Streamly.Internal.Data.Stream.StreamD.Exception as D

35+import qualified Streamly.Internal.Data.Stream as D

3636 ( before

3737 , afterUnsafe

3838 , onException

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

@@ -119,7 +119,7 @@ import qualified Streamly.Internal.Data.Stream.Ahead as Ahead

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

120120import qualified Streamly.Internal.Data.Stream.Parallel as Parallel

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

122−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

122+import qualified Streamly.Internal.Data.Stream as D

123123 (Stream(..), toStreamK, fromStreamK

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

125125 , foldlx', foldl', fold)

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

@@ -66,13 +66,13 @@ import Data.Maybe (fromJust)

6666

6767import Streamly.Data.Fold (Fold)

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

69−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

69+import Streamly.Internal.Data.Stream (Step(..))

7070

7171import qualified Data.Set as Set

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

7373 (StreamK, foldStreamShared, mkStream, foldStream, fromEffect

7474 , nil, concatMapWith, fromPure, bindWith)

75−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

75+import qualified Streamly.Internal.Data.Stream as D

7676 (Stream(..), mapM, toStreamK, fromStreamK)

7777import qualified Streamly.Internal.Data.Stream.SVar.Generate as SVar

7878import qualified Streamly.Internal.Data.Stream.SVar.Eliminate as SVar

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

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

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

4141import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

4242

43−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

43+import qualified Streamly.Internal.Data.Stream as D

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

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

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

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

@@ -43,7 +43,7 @@ import Streamly.Internal.Data.Stream.Serial (SerialT)

4343import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

4444import System.Mem (performMajorGC)

4545

46−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

46+import qualified Streamly.Internal.Data.Stream as D

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

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

4949 (Stream, foldStreamShared, mkStream, foldStream)

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

@@ -73,9 +73,7 @@ import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)

7373import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

7474

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

76−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

77−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as D

78−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

76+import qualified Streamly.Internal.Data.Stream as D

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

8078

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

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

@@ -62,7 +62,7 @@ import Data.Proxy (Proxy(..))

6262import Streamly.Data.Fold (Fold)

6363import Streamly.Internal.Data.Fold.Type (Fold (..))

6464import Streamly.Internal.Data.IsMap (IsMap(..))

65−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

65+import Streamly.Internal.Data.Stream (Stream)

6666import Streamly.Internal.Data.Time.Units

6767 ( AbsTime

6868 , MilliSecond64(..)

src/Streamly/Internal/Data/Unfold/Exception.hs+1−1

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

2525 (MonadRunInIO, MonadAsync, withRunInIO)

2626import Streamly.Internal.Data.IOFinalizer.Lifted

2727 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)

28−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

28+import Streamly.Internal.Data.Stream (Step(..))

2929

3030import qualified Control.Monad.Catch as MC

3131

src/Streamly/Internal/Data/Unfold/SVar.hs+1−1

@@ -21,7 +21,7 @@ import Control.Monad.IO.Class (MonadIO(..))

2121import Data.IORef (newIORef, readIORef, mkWeakIORef, writeIORef)

2222import Data.Maybe (isNothing)

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

24−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

24+import Streamly.Internal.Data.Stream (Step(..))

2525import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

2626import Streamly.Internal.Data.SVar (printSVar, cleanupSVar, sendStopToProducer)

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

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

@@ -131,7 +131,7 @@ import qualified GHC.IO.Device as RawIO

131131import Streamly.Internal.Data.Array.Type

132132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)

133133import Streamly.Internal.System.IO (defaultChunkSize)

134−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

134+import Streamly.Internal.Data.Stream (Stream)

135135#if !defined(mingw32_HOST_OS)

136136{-

137137import Streamly.Internal.Data.Stream.IsStream.Type (toStreamD)

@@ -149,7 +149,7 @@ import qualified Streamly.Internal.Data.MutArray as MArray

149149 (MutArray(..), asPtrUnsafe)

150150import qualified Streamly.Internal.Data.Stream.Chunked as AS

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

152−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

152+import qualified Streamly.Internal.Data.Stream as D

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

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

155155

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

@@ -89,7 +89,7 @@ import qualified Network.Socket as Net

8989import Streamly.Internal.Data.Array.Type (Array(..))

9090import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)

9191import Streamly.Internal.Data.Fold (Fold)

92−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

92+import Streamly.Internal.Data.Stream (Stream)

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

9494-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

9595import Streamly.Internal.System.IO (defaultChunkSize)

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

101101import qualified Streamly.Internal.Data.MutArray as MArray

102102 (MutArray(..), asPtrUnsafe, pinnedNewBytes)

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

104−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

104+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)

streamly.cabal+15−13

@@ -410,9 +410,6 @@ library

410410 , Streamly.Prelude

411411

412412 -- Deprecated Internal modules

413− , Streamly.Internal.Data.SVar.Worker

414− , Streamly.Internal.Data.SVar.Dispatch

415− , Streamly.Internal.Data.SVar.Pull

416413 , Streamly.Internal.Data.SVar

417414

418415 , Streamly.Internal.Data.Unfold.SVar

@@ -428,19 +425,10 @@ library

428425 , Streamly.Internal.Data.Stream.Ahead

429426 , Streamly.Internal.Data.Stream.ZipAsync

430427

431− , Streamly.Internal.Data.Stream.IsStream.Type

428+ , Streamly.Internal.Data.Stream.IsStream

432429 , Streamly.Internal.Data.Stream.IsStream.Combinators

433430 , Streamly.Internal.Data.Stream.IsStream.Common

434431 , Streamly.Internal.Data.Stream.IsStream.Enumeration

435− , Streamly.Internal.Data.Stream.IsStream.Generate

436− , Streamly.Internal.Data.Stream.IsStream.Eliminate

437− , Streamly.Internal.Data.Stream.IsStream.Transform

438− , Streamly.Internal.Data.Stream.IsStream.Expand

439− , Streamly.Internal.Data.Stream.IsStream.Reduce

440− , Streamly.Internal.Data.Stream.IsStream.Exception

441− , Streamly.Internal.Data.Stream.IsStream.Lift

442− , Streamly.Internal.Data.Stream.IsStream.Top

443− , Streamly.Internal.Data.Stream.IsStream

444432

445433 if !impl(ghcjs) && flag(dev)

446434 exposed-modules:

@@ -473,6 +461,20 @@ library

473461 , Streamly.Data.Stream.Concurrent

474462 , Streamly.Data.Stream.Time

475463

464+ , Streamly.Internal.Data.Stream.IsStream.Type

465+ , Streamly.Internal.Data.Stream.IsStream.Generate

466+ , Streamly.Internal.Data.Stream.IsStream.Eliminate

467+ , Streamly.Internal.Data.Stream.IsStream.Transform

468+ , Streamly.Internal.Data.Stream.IsStream.Expand

469+ , Streamly.Internal.Data.Stream.IsStream.Reduce

470+ , Streamly.Internal.Data.Stream.IsStream.Exception

471+ , Streamly.Internal.Data.Stream.IsStream.Lift

472+ , Streamly.Internal.Data.Stream.IsStream.Top

473+

474+ , Streamly.Internal.Data.SVar.Worker

475+ , Streamly.Internal.Data.SVar.Dispatch

476+ , Streamly.Internal.Data.SVar.Pull

477+

476478 build-depends:

477479 -- Core libraries shipped with ghc, the min and max

478480 -- constraints of these libraries should match with

test/Streamly/Test/Prelude/Top.hs+1−1

@@ -14,7 +14,7 @@ import Test.QuickCheck

1414 )

1515import Test.QuickCheck.Monadic (monadicIO, assert, run)

1616import qualified Streamly.Prelude as S

17−import qualified Streamly.Internal.Data.Stream.IsStream.Top as Top

17+import qualified Streamly.Internal.Data.Stream.IsStream as Top

1818

1919import Prelude hiding

2020 (maximum, minimum, elem, notElem, null, product, sum, head, last, take)