diff --git a/src/Streamly.hs b/src/Streamly.hs index 5b975d252..5f661653f 100644 --- a/src/Streamly.hs +++ b/src/Streamly.hs @@ -228,7 +228,7 @@ import Streamly.Internal.Data.Stream.Ahead import Streamly.Internal.Data.Stream.Async import Streamly.Internal.Data.Stream.Combinators import Streamly.Streams.Parallel -import Streamly.Streams.Serial +import Streamly.Internal.Data.Stream.Serial import Streamly.Internal.Data.Stream.StreamK hiding (serial) import Streamly.Internal.Data.Stream.Zip diff --git a/src/Streamly/FileSystem/FD.hs b/src/Streamly/FileSystem/FD.hs index 521a058df..bd5d36f38 100644 --- a/src/Streamly/FileSystem/FD.hs +++ b/src/Streamly/FileSystem/FD.hs @@ -137,7 +137,7 @@ import qualified GHC.IO.FD as FD import qualified GHC.IO.Device as RawIO import Streamly.Internal.Memory.Array.Types (Array(..), byteLength, defaultChunkSize) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream) #if !defined(mingw32_HOST_OS) diff --git a/src/Streamly/Internal/Data/Array.hs b/src/Streamly/Internal/Data/Array.hs index 1e9eeaf48..d7ee6ae23 100644 --- a/src/Streamly/Internal/Data/Array.hs +++ b/src/Streamly/Internal/Data/Array.hs @@ -59,7 +59,7 @@ import qualified GHC.Exts as Exts import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Data.Fold.Types (Fold(..)) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import qualified Streamly.Internal.Data.Stream.StreamD as D diff --git a/src/Streamly/Internal/Data/List.hs b/src/Streamly/Internal/Data/List.hs index 65c7424bb..65ff8eb4f 100644 --- a/src/Streamly/Internal/Data/List.hs +++ b/src/Streamly/Internal/Data/List.hs @@ -84,7 +84,7 @@ import Data.Semigroup (Semigroup(..)) #endif import GHC.Exts (IsList(..), IsString(..)) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.Zip (ZipSerialM) import qualified Streamly.Streams.Prelude as P diff --git a/src/Streamly/Internal/Data/Pipe.hs b/src/Streamly/Internal/Data/Pipe.hs index 1c3875e0a..2a08c874c 100644 --- a/src/Streamly/Internal/Data/Pipe.hs +++ b/src/Streamly/Internal/Data/Pipe.hs @@ -257,7 +257,7 @@ import Streamly.Internal.Data.Pipe.Types (Pipe(..), PipeState(..), Step(..), zipWith, tee, map, compose) -- import Streamly.Internal.Memory.Array.Types (Array) -- import Streamly.Memory.Ring (Ring) --- import Streamly.Streams.Serial (SerialT) +-- import Streamly.Internal.Data.Stream.Serial (SerialT) -- import Streamly.Internal.Data.Stream.StreamK (IsStream()) -- import Streamly.Internal.Data.Time.Units -- (AbsTime, MilliSecond64(..), addToAbsTime, diffAbsTime, toRelTime, diff --git a/src/Streamly/Internal/Data/Stream/Ahead.hs b/src/Streamly/Internal/Data/Stream/Ahead.hs index 9c2bafe76..9d45a6afc 100644 --- a/src/Streamly/Internal/Data/Stream/Ahead.hs +++ b/src/Streamly/Internal/Data/Stream/Ahead.hs @@ -47,7 +47,7 @@ import GHC.Exts (inline) import qualified Data.Heap as H import Streamly.Internal.Data.Stream.SVar (fromSVar) -import Streamly.Streams.Serial (map) +import Streamly.Internal.Data.Stream.Serial (map) import Streamly.Internal.Data.SVar import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream, foldStreamShared, diff --git a/src/Streamly/Internal/Data/Stream/Async.hs b/src/Streamly/Internal/Data/Stream/Async.hs index 25425f24e..582deed74 100644 --- a/src/Streamly/Internal/Data/Stream/Async.hs +++ b/src/Streamly/Internal/Data/Stream/Async.hs @@ -58,7 +58,7 @@ import qualified Data.Set as S import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS) import Streamly.Internal.Data.Stream.SVar (fromSVar) -import Streamly.Streams.Serial (map) +import Streamly.Internal.Data.Stream.Serial (map) import Streamly.Internal.Data.SVar import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream, adapt, foldStreamShared, diff --git a/src/Streamly/Internal/Data/Stream/Combinators.hs b/src/Streamly/Internal/Data/Stream/Combinators.hs index 1e07c0923..9e016fe22 100644 --- a/src/Streamly/Internal/Data/Stream/Combinators.hs +++ b/src/Streamly/Internal/Data/Stream/Combinators.hs @@ -31,7 +31,7 @@ import Data.Int (Int64) import Streamly.Internal.Data.SVar import Streamly.Internal.Data.Stream.StreamK -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) ------------------------------------------------------------------------------- -- Concurrency control diff --git a/src/Streamly/Internal/Data/Stream/Enumeration.hs b/src/Streamly/Internal/Data/Stream/Enumeration.hs index e95977c6d..1635f6c54 100644 --- a/src/Streamly/Internal/Data/Stream/Enumeration.hs +++ b/src/Streamly/Internal/Data/Stream/Enumeration.hs @@ -66,7 +66,7 @@ import Streamly.Internal.Data.Stream.StreamD (fromStreamD) import Streamly.Internal.Data.Stream.StreamK (IsStream(..)) import qualified Streamly.Internal.Data.Stream.StreamD as D -import qualified Streamly.Streams.Serial as Serial +import qualified Streamly.Internal.Data.Stream.Serial as Serial ------------------------------------------------------------------------------- -- Enumeration of Integral types diff --git a/src/Streamly/Streams/Serial.hs b/src/Streamly/Internal/Data/Stream/Serial.hs similarity index 99% rename from src/Streamly/Streams/Serial.hs rename to src/Streamly/Internal/Data/Stream/Serial.hs index 6464e2b44..aa12204e8 100644 --- a/src/Streamly/Streams/Serial.hs +++ b/src/Streamly/Internal/Data/Stream/Serial.hs @@ -9,7 +9,7 @@ {-# LANGUAGE UndecidableInstances #-} -- XXX -- | --- Module : Streamly.Streams.Serial +-- Module : Streamly.Internal.Data.Stream.Serial -- Copyright : (c) 2017 Harendra Kumar -- -- License : BSD3 @@ -18,7 +18,7 @@ -- Portability : GHC -- -- -module Streamly.Streams.Serial +module Streamly.Internal.Data.Stream.Serial ( -- * Serial appending stream SerialT diff --git a/src/Streamly/Internal/Data/Stream/Zip.hs b/src/Streamly/Internal/Data/Stream/Zip.hs index 12e521e46..c872177cb 100644 --- a/src/Streamly/Internal/Data/Stream/Zip.hs +++ b/src/Streamly/Internal/Data/Stream/Zip.hs @@ -49,7 +49,7 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec, import Prelude hiding (map, repeat, zipWith) import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream) -import Streamly.Streams.Serial (map) +import Streamly.Internal.Data.Stream.Serial (map) import Streamly.Internal.Data.SVar (MonadAsync) import Streamly.Internal.Prelude (zipWith, zipAsyncWith) diff --git a/src/Streamly/Internal/FileSystem/Dir.hs b/src/Streamly/Internal/FileSystem/Dir.hs index 2d2a79928..c7fc7633b 100644 --- a/src/Streamly/Internal/FileSystem/Dir.hs +++ b/src/Streamly/Internal/FileSystem/Dir.hs @@ -73,7 +73,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..)) -- import Streamly.Internal.Memory.Array.Types -- (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit, -- lpackArraysChunksOf) --- import Streamly.Streams.Serial (SerialT) +-- import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) diff --git a/src/Streamly/Internal/FileSystem/File.hs b/src/Streamly/Internal/FileSystem/File.hs index 6a0b8c9e2..d9e157eea 100644 --- a/src/Streamly/Internal/FileSystem/File.hs +++ b/src/Streamly/Internal/FileSystem/File.hs @@ -107,7 +107,7 @@ import Streamly.Internal.Data.Fold.Types (Fold(..)) import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import Streamly.Internal.Data.SVar (MonadAsync) -- import Streamly.Data.Fold (Fold) diff --git a/src/Streamly/Internal/FileSystem/Handle.hs b/src/Streamly/Internal/FileSystem/Handle.hs index b9ae112e3..c18f71235 100644 --- a/src/Streamly/Internal/FileSystem/Handle.hs +++ b/src/Streamly/Internal/FileSystem/Handle.hs @@ -124,7 +124,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit, lpackArraysChunksOf) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) diff --git a/src/Streamly/Internal/Memory/Array.hs b/src/Streamly/Internal/Memory/Array.hs index ffc135fac..df167bd7f 100644 --- a/src/Streamly/Internal/Memory/Array.hs +++ b/src/Streamly/Internal/Memory/Array.hs @@ -142,12 +142,12 @@ import GHC.IO (IO(..)) import Streamly.Internal.Data.Fold.Types (Fold(..)) import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..), length) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import qualified Streamly.Internal.Memory.Array.Types as A import qualified Streamly.Streams.Prelude as P -import qualified Streamly.Streams.Serial as Serial +import qualified Streamly.Internal.Data.Stream.Serial as Serial import qualified Streamly.Internal.Data.Stream.StreamD as D import qualified Streamly.Internal.Data.Stream.StreamK as K diff --git a/src/Streamly/Internal/Memory/ArrayStream.hs b/src/Streamly/Internal/Memory/ArrayStream.hs index 354bcb3de..19686ee25 100644 --- a/src/Streamly/Internal/Memory/ArrayStream.hs +++ b/src/Streamly/Internal/Memory/ArrayStream.hs @@ -50,7 +50,7 @@ import Foreign.Storable (Storable(..)) import Prelude hiding (length, null, last, map, (!!), read, concat) import Streamly.Internal.Memory.Array.Types (Array(..), length) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import qualified Streamly.Internal.Memory.Array as A diff --git a/src/Streamly/Internal/Network/Inet/TCP.hs b/src/Streamly/Internal/Network/Inet/TCP.hs index f7e64f958..854b36ecb 100644 --- a/src/Streamly/Internal/Network/Inet/TCP.hs +++ b/src/Streamly/Internal/Network/Inet/TCP.hs @@ -112,7 +112,7 @@ import Streamly.Internal.Data.Fold.Types (Fold(..)) import Streamly.Internal.Data.SVar (fork) import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Network.Socket (SockSpec(..), accept, connections) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) diff --git a/src/Streamly/Internal/Network/Socket.hs b/src/Streamly/Internal/Network/Socket.hs index f6c0fd9ac..3cabd3b06 100644 --- a/src/Streamly/Internal/Network/Socket.hs +++ b/src/Streamly/Internal/Network/Socket.hs @@ -95,7 +95,7 @@ import qualified Network.Socket as Net import Streamly (MonadAsync) import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..)) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream) import Streamly.Data.Fold (Fold) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) diff --git a/src/Streamly/Internal/Prelude.hs b/src/Streamly/Internal/Prelude.hs index c5d5b9587..20242c32f 100644 --- a/src/Streamly/Internal/Prelude.hs +++ b/src/Streamly/Internal/Prelude.hs @@ -453,7 +453,7 @@ import Streamly.Streams.Prelude (fromStreamS, toStreamS, foldWith, foldMapWith, forEachWith) import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD) import Streamly.Internal.Data.Stream.StreamK (IsStream((|:), consM)) -import Streamly.Streams.Serial (SerialT) +import Streamly.Internal.Data.Stream.Serial (SerialT) import Streamly.Internal.Data.Pipe.Types (Pipe (..)) import Streamly.Internal.Data.Time.Units (AbsTime, MilliSecond64(..), addToAbsTime, diffAbsTime, toRelTime, @@ -474,7 +474,7 @@ import qualified Streamly.Internal.Data.Stream.StreamK as S import qualified Streamly.Internal.Data.Stream.StreamD as S #endif -import qualified Streamly.Streams.Serial as Serial +import qualified Streamly.Internal.Data.Stream.Serial as Serial import qualified Streamly.Streams.Parallel as Par ------------------------------------------------------------------------------ diff --git a/src/Streamly/Streams/Parallel.hs b/src/Streamly/Streams/Parallel.hs index 45cb17780..5a195cfbb 100644 --- a/src/Streamly/Streams/Parallel.hs +++ b/src/Streamly/Streams/Parallel.hs @@ -55,7 +55,7 @@ import Prelude hiding (map) import qualified Data.Set as Set import Streamly.Internal.Data.Stream.SVar (fromSVar, fromStreamVar) -import Streamly.Streams.Serial (map) +import Streamly.Internal.Data.Stream.Serial (map) import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream, foldStreamShared, adapt) diff --git a/streamly.cabal b/streamly.cabal index dbb256fbb..49fd48c81 100644 --- a/streamly.cabal +++ b/streamly.cabal @@ -288,7 +288,7 @@ library -- Higher level streams , Streamly.Internal.Data.Stream.SVar - , Streamly.Streams.Serial + , Streamly.Internal.Data.Stream.Serial , Streamly.Internal.Data.Stream.Async , Streamly.Streams.Parallel , Streamly.Internal.Data.Stream.Ahead