c88755f · streamly · git.iko.soy

git.iko.soy/streamly

Move StreamD.Type to Internal

commitc88755f4deddc08e6de6f2d383f0e258e01ce40c authoradithyaov <adi.obilisetty@gmail.com> dateThu 7 Nov 2019, 13:59 (7 years ago) parentffcfcac

11 files changed+18−18

compare with master

unifiedsplit

src/Streamly/Benchmark/FileIO/Array.hs+1−1 src/Streamly/Benchmark/FileIO/Stream.hs+1−1 src/Streamly/FileSystem/FD.hs+2−2 src/Streamly/Streams/StreamD/Type.hs → src/Streamly/Internal/Data/Stream/StreamD/Type.hs+4−4 src/Streamly/Internal/Data/Unfold.hs+2−2 src/Streamly/Internal/Data/Unfold/Types.hs+1−1 src/Streamly/Internal/FileSystem/Handle.hs+1−1 src/Streamly/Internal/Memory/Array/Types.hs+1−1 src/Streamly/Internal/Network/Socket.hs+1−1 src/Streamly/Streams/StreamD.hs+1−1 streamly.cabal+3−3

src/Streamly/Benchmark/FileIO/Array.hs+1−1

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

5555

5656#ifdef INSPECTION

5757import Foreign.Storable (Storable)

58−import Streamly.Streams.StreamD.Type (Step(..))

58+import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

5959import Test.Inspection

6060#endif

6161

src/Streamly/Benchmark/FileIO/Stream.hs+1−1

@@ -86,7 +86,7 @@ import qualified Streamly.Streams.StreamD as D

8686

8787#ifdef INSPECTION

8888import Foreign.Storable (Storable)

89−import Streamly.Streams.StreamD.Type (Step(..), GroupState)

89+import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), GroupState)

9090import Test.Inspection

9191#endif

9292

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

@@ -143,7 +143,7 @@ import Streamly.Streams.StreamK.Type (IsStream, mkStream)

143143#if !defined(mingw32_HOST_OS)

144144import Streamly.Internal.Memory.Array.Types (groupIOVecsOf)

145145import Streamly.Streams.StreamD (toStreamD)

146−import Streamly.Streams.StreamD.Type (fromStreamD)

146+import Streamly.Internal.Data.Stream.StreamD.Type (fromStreamD)

147147import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

148148#endif

149149-- import Streamly.Data.Fold (Fold)

@@ -152,7 +152,7 @@ import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

152152import qualified Streamly.Memory.Array as A

153153import qualified Streamly.Internal.Memory.ArrayStream as AS

154154import qualified Streamly.Prelude as S

155−import qualified Streamly.Streams.StreamD.Type as D

155+import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

156156

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

158158-- References

src/Streamly/Streams/StreamD/Type.hs → src/Streamly/Internal/Data/Stream/StreamD/Type.hsrenamed+4−4

@@ -9,10 +9,10 @@

99{-# LANGUAGE ViewPatterns #-}

1010{-# LANGUAGE RankNTypes #-}

1111

12−#include "../inline.hs"

12+#include "inline.hs"

1313

1414-- |

15−-- Module : Streamly.Streams.StreamD.Type

15+-- Module : Streamly.Internal.Data.Stream.StreamD.Type

1717-- Copyright : (c) Roman Leshchinskiy 2008-2010

1818--

@@ -21,7 +21,7 @@

2121-- Stability : experimental

2222-- Portability : GHC

2323

24−module Streamly.Streams.StreamD.Type

24+module Streamly.Internal.Data.Stream.StreamD.Type

2525 (

2626 -- * The stream type

2727 Step (..)

@@ -519,7 +519,7 @@ groupsOf n (Fold fstep initial extract) (Stream step state) =

519519 -- implications.

520520 when (n <= 0) $

521521 -- XXX we can pass the module string from the higher level API

522− error $ "Streamly.Streams.StreamD.Type.groupsOf: the size of "

522+ error $ "Streamly.Internal.Data.Stream.StreamD.Type.groupsOf: the size of "

523523 ++ "groups [" ++ show n ++ "] must be a natural number"

524524 -- fs = fold state

525525 fs <- initial

src/Streamly/Internal/Data/Unfold.hs+2−2

@@ -123,9 +123,9 @@ import Data.Void (Void)

123123import GHC.Types (SPEC(..))

124124import Prelude hiding (concat, map, takeWhile, take, filter, const)

125125

126−import Streamly.Streams.StreamD.Type (Stream(..), Step(..))

126+import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..), Step(..))

127127#if __GLASGOW_HASKELL__ < 800

128−import Streamly.Streams.StreamD.Type (pattern Stream)

128+import Streamly.Internal.Data.Stream.StreamD.Type (pattern Stream)

129129#endif

130130import Streamly.Internal.Data.Unfold.Types (Unfold(..))

131131import Streamly.Internal.Data.Fold.Types (Fold(..))

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

@@ -16,7 +16,7 @@ module Streamly.Internal.Data.Unfold.Types

1616 )

1717where

1818

19−import Streamly.Streams.StreamD.Type (Step(..))

19+import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

2020

2121------------------------------------------------------------------------------

2222-- Monadic Unfolds

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

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

123123import qualified Streamly.Internal.Memory.ArrayStream as AS

124124import qualified Streamly.Internal.Prelude as S

125125import qualified Streamly.Memory.Array as A

126−import qualified Streamly.Streams.StreamD.Type as D

126+import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

127127

128128-------------------------------------------------------------------------------

129129-- References

src/Streamly/Internal/Memory/Array/Types.hs+1−1

@@ -120,7 +120,7 @@ import Streamly.FileSystem.FDIO (IOVec(..))

120120#endif

121121

122122import qualified Streamly.Memory.Malloc as Malloc

123−import qualified Streamly.Streams.StreamD.Type as D

123+import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

124124import qualified Streamly.Streams.StreamK as K

125125import qualified GHC.Exts as Exts

126126

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

@@ -102,7 +102,7 @@ import qualified Streamly.Memory.Array as A

102102import qualified Streamly.Internal.Memory.ArrayStream as AS

103103import qualified Streamly.Internal.Memory.Array.Types as A

104104import qualified Streamly.Prelude as S

105−import qualified Streamly.Streams.StreamD.Type as D

105+import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

106106

107107-- | @'useSocketM' socket act@ runs the monadic computation @act@ passing the

108108-- socket handle to it. The handle will be closed on exit from 'useSocketM',

src/Streamly/Streams/StreamD.hs+1−1

@@ -330,7 +330,7 @@ import Streamly.Internal.Data.SVar (MonadAsync, defState, adaptState)

330330import Streamly.Internal.Data.Unfold.Types (Unfold(..))

331331import Streamly.Internal.Data.Strict (Tuple'(..))

332332

333−import Streamly.Streams.StreamD.Type

333+import Streamly.Internal.Data.Stream.StreamD.Type

334334

335335import qualified Streamly.Internal.Data.Pipe.Types as Pipe

336336import qualified Streamly.Internal.Memory.Array.Types as A

streamly.cabal+3−3

@@ -270,7 +270,6 @@ library

270270 , Streamly.Streams.StreamK

271271 , Streamly.Streams.StreamDK.Type

272272 , Streamly.Streams.StreamDK

273− , Streamly.Streams.StreamD.Type

274273 , Streamly.Streams.StreamD

275274 , Streamly.Streams.Enumeration

276275 , Streamly.Streams.Prelude

@@ -306,6 +305,7 @@ library

306305 , Streamly.Internal.Data.Time

307306 , Streamly.Internal.Data.Time.Units

308307 , Streamly.Internal.Data.Time.Clock

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

309309 , Streamly.Internal.Data.SVar

310310 , Streamly.Internal.Memory.Array.Types

311311 , Streamly.Internal.Memory.Array

@@ -670,6 +670,7 @@ benchmark base

670670 hs-source-dirs: benchmark, src

671671 main-is: BaseStreams.hs

672672 other-modules: Streamly.Internal.Data.Atomics

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

673674 , Streamly.Internal.Data.SVar

674675 , Streamly.Internal.Data.Time.Units

675676 , Streamly.Internal.Data.Time.Clock

@@ -677,7 +678,6 @@ benchmark base

677678 , Streamly.Streams.StreamDK

678679 , Streamly.Streams.StreamK.Type

679680 , Streamly.Streams.StreamK

680− , Streamly.Streams.StreamD.Type

681681 , Streamly.Streams.StreamD

682682 , Streamly.Streams.Prelude

683683 , Streamly.FileSystem.IOVec

@@ -725,12 +725,12 @@ executable nano-bench

725725 c-sources: src/Streamly/Internal/Data/Time/Darwin.c

726726 main-is: NanoBenchmarks.hs

727727 other-modules: Streamly.Internal.Data.Atomics

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

728729 , Streamly.Internal.Data.SVar

729730 , Streamly.Internal.Data.Time.Units

730731 , Streamly.Internal.Data.Time.Clock

731732 , Streamly.Streams.StreamK.Type

732733 , Streamly.Streams.StreamK

733− , Streamly.Streams.StreamD.Type

734734 , Streamly.FileSystem.IOVec

735735 , Streamly.Streams.StreamD

736736 if flag(dev)