c88755f · streamly · git.iko.soy

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

compare with master

unifiedsplit

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

55

56#ifdef INSPECTION

57import Foreign.Storable (Storable)

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

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

59import Test.Inspection

60#endif

61

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

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

86

87#ifdef INSPECTION

88import Foreign.Storable (Storable)

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

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

90import Test.Inspection

91#endif

92

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

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

143#if !defined(mingw32_HOST_OS)

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

145import Streamly.Streams.StreamD (toStreamD)

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

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

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

148#endif

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

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

152import qualified Streamly.Memory.Array as A

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

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

156

157-------------------------------------------------------------------------------

158-- References

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

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

9{-# LANGUAGE ViewPatterns #-}

10{-# LANGUAGE RankNTypes #-}

11

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

12+#include "inline.hs"

13

14-- |

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

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

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

18--

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

21-- Stability : experimental

22-- Portability : GHC

23

24−module Streamly.Streams.StreamD.Type

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

25 (

26 -- * The stream type

27 Step (..)

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

519 -- implications.

520 when (n <= 0) $

521 -- 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 "

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

524 -- fs = fold state

525 fs <- initial

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

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

123import GHC.Types (SPEC(..))

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

125

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

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

127#if __GLASGOW_HASKELL__ < 800

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

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

129#endif

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

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

16 )

17where

18

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

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

20

21------------------------------------------------------------------------------

22-- Monadic Unfolds

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

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

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

124import qualified Streamly.Internal.Prelude as S

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

127

128-------------------------------------------------------------------------------

129-- References

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

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

120#endif

121

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

124import qualified Streamly.Streams.StreamK as K

125import qualified GHC.Exts as Exts

126

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

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

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

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

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

106

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

108-- 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)

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

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

332

333−import Streamly.Streams.StreamD.Type

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

334

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

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

streamly.cabal+3−3

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

270 , Streamly.Streams.StreamK

271 , Streamly.Streams.StreamDK.Type

272 , Streamly.Streams.StreamDK

273− , Streamly.Streams.StreamD.Type

274 , Streamly.Streams.StreamD

273 , Streamly.Streams.StreamD

275 , Streamly.Streams.Enumeration

274 , Streamly.Streams.Enumeration

276 , Streamly.Streams.Prelude

275 , Streamly.Streams.Prelude

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

306 , Streamly.Internal.Data.Time

305 , Streamly.Internal.Data.Time

307 , Streamly.Internal.Data.Time.Units

306 , Streamly.Internal.Data.Time.Units

308 , Streamly.Internal.Data.Time.Clock

307 , Streamly.Internal.Data.Time.Clock

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

309 , Streamly.Internal.Data.SVar

310 , Streamly.Internal.Memory.Array.Types

311 , Streamly.Internal.Memory.Array

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

670 hs-source-dirs: benchmark, src

671 main-is: BaseStreams.hs

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

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

673 , Streamly.Internal.Data.SVar

674 , Streamly.Internal.Data.SVar

674 , Streamly.Internal.Data.Time.Units

675 , Streamly.Internal.Data.Time.Units

675 , Streamly.Internal.Data.Time.Clock

676 , Streamly.Internal.Data.Time.Clock

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

677 , Streamly.Streams.StreamDK

678 , Streamly.Streams.StreamDK

678 , Streamly.Streams.StreamK.Type

679 , Streamly.Streams.StreamK.Type

679 , Streamly.Streams.StreamK

680 , Streamly.Streams.StreamK

680− , Streamly.Streams.StreamD.Type

681 , Streamly.Streams.StreamD

682 , Streamly.Streams.Prelude

683 , Streamly.FileSystem.IOVec

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

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

726 main-is: NanoBenchmarks.hs

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

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

728 , Streamly.Internal.Data.SVar

729 , Streamly.Internal.Data.SVar

729 , Streamly.Internal.Data.Time.Units

730 , Streamly.Internal.Data.Time.Units

730 , Streamly.Internal.Data.Time.Clock

731 , Streamly.Internal.Data.Time.Clock

731 , Streamly.Streams.StreamK.Type

732 , Streamly.Streams.StreamK.Type

732 , Streamly.Streams.StreamK

733 , Streamly.Streams.StreamK

733− , Streamly.Streams.StreamD.Type

734 , Streamly.FileSystem.IOVec

735 , Streamly.Streams.StreamD

736 if flag(dev)