git.iko.soy/streamly
on master help sign in
Reduce internal imports of "streamly-core" in "streamly" package (#2571)
commit8ac4c0b1707d5cd17410aeb3c380d0f2a29cb8b7 authorRanjeet Ranjan <ranjeetr@composewell.com> dateThu 24 Aug 2023, 18:59 (3 years ago) parent313d178
8 files changed+58−45
compare with master
unifiedsplit
src/Streamly/Data/Stream/Exception.hs+1 src/Streamly/Internal/FileSystem/Event.hs+2−2 src/Streamly/Internal/FileSystem/Event/Linux.hs+14−8 src/Streamly/Internal/FileSystem/Event/Windows.hs+11−8 src/Streamly/Internal/FileSystem/FD.hs+5−3 src/Streamly/Internal/Network/Inet/TCP.hs+9−6 src/Streamly/Internal/Network/Socket.hs+14−14 src/Streamly/Internal/Unicode/Char.hs+2−4
src/Streamly/Data/Stream/Exception.hs+1
@@ -22,3 +22,4 @@ module Streamly.Data.Stream.Exception
2222where
2323
2424import Streamly.Internal.Data.Stream.Exception.Lifted
25+ ( bracket, finally, after )
src/Streamly/Internal/FileSystem/Event.hs+2−2
@@ -47,8 +47,8 @@ where
4747
4848import Data.List.NonEmpty (NonEmpty)
4949import Data.Word (Word8)
50−import Streamly.Internal.Data.Array (Array)
51−import Streamly.Internal.Data.Stream (Stream)
50+import Streamly.Data.Array (Array)
51+import Streamly.Data.Stream (Stream)
5252
5353#if defined(CABAL_OS_DARWIN)
5454import Streamly.Internal.FileSystem.Event.Darwin (Event)
src/Streamly/Internal/FileSystem/Event/Linux.hs+14−8
@@ -171,23 +171,29 @@ import Foreign.Storable (peek, peekByteOff, sizeOf)
171171import GHC.IO.Device (IODeviceType(Stream))
172172import GHC.IO.FD (fdFD, mkFD)
173173import GHC.IO.Handle.FD (mkHandleFromFD)
174−import Streamly.Internal.Data.Stream (Stream)
175−import Streamly.Internal.Data.Parser (Parser)
176−import Streamly.Internal.Data.Array (Array(..), byteLength)
174+import Streamly.Data.Stream (Stream)
175+import Streamly.Data.Parser (Parser)
177176import System.Directory (doesDirectoryExist)
178177import System.IO (Handle, hClose, IOMode(ReadMode))
179178import GHC.IO.Handle.FD (handleToFd)
180179
180+import Streamly.Internal.Data.Array (Array(..), byteLength)
181+
181182import qualified Data.IntMap.Lazy as Map
182183import qualified Data.List.NonEmpty as NonEmpty
183−import qualified Streamly.Internal.Data.Array as A
184184import qualified Streamly.Data.Fold as FL
185+import qualified Streamly.Data.Array as A (fromList, writeN, getIndex)
186+import qualified Streamly.Data.Stream as S
187+import qualified Streamly.FileSystem.Handle as FH
188+import qualified Streamly.Unicode.Stream as U
189+
190+import qualified Streamly.Internal.Data.Array as A
191+ ( fromStream, asCStringUnsafe, asPtrUnsafe
192+ , getSliceUnsafe, read
193+ )
194+import qualified Streamly.Internal.FileSystem.Dir as Dir (readDirs)
185195import qualified Streamly.Internal.Data.Parser as PR
186196 (takeEQ, fromEffect, fromFold)
187−import qualified Streamly.Internal.Data.Stream as S
188−import qualified Streamly.Internal.FileSystem.Dir as Dir
189−import qualified Streamly.Internal.FileSystem.Handle as FH
190−import qualified Streamly.Internal.Unicode.Stream as U
191197
192198-------------------------------------------------------------------------------
193199-- Subscription to events
src/Streamly/Internal/FileSystem/Event/Windows.hs+11−8
@@ -98,8 +98,6 @@ import Foreign.C.String (peekCWStringLen)
9898import Foreign.Marshal.Alloc (alloca, allocaBytes)
9999import Foreign.Storable (peekByteOff)
100100import Foreign.Ptr (Ptr, FunPtr, castPtr, nullPtr, nullFunPtr, plusPtr)
101−import Streamly.Internal.Data.Stream (Stream)
102−import Streamly.Internal.Data.Stream.Concurrent (eager)
103101import System.Win32.File
104102 ( FileNotificationFlag
105103 , LPOVERLAPPED
@@ -118,14 +116,19 @@ import System.Win32.File
118116 , oPEN_EXISTING
119117 )
120118import System.Win32.Types (BOOL, DWORD, HANDLE, LPVOID, LPDWORD, failIfFalse_)
119+
120+import Streamly.Data.Array (Array)
121+import Streamly.Data.Stream (Stream)
122+import Streamly.Data.Stream.Concurrent (eager)
123+
121124import qualified Data.List.NonEmpty as NonEmpty
125+import qualified Streamly.Data.Array as A (fromList)
122126import qualified Streamly.Data.Fold as Fold
123−import qualified Streamly.Internal.Data.Stream as S
124−import qualified Streamly.Internal.Data.Stream.Concurrent as S (parConcatMap)
125−import qualified Streamly.Internal.Unicode.Stream as U
126−import qualified Streamly.Internal.Unicode.Utf8 as UTF8
127−import qualified Streamly.Internal.Data.Array as A
128−import Streamly.Internal.Data.Array (Array)
127+import qualified Streamly.Data.Stream as S
128+import qualified Streamly.Data.Stream.Concurrent as S
129+import qualified Streamly.Unicode.Stream as U
130+import qualified Streamly.Internal.Unicode.Utf8 as UTF8 (pack, toArray)
131+import qualified Streamly.Internal.Data.Array as A (read)
129132
130133-- | Watch configuration, used to specify the events of interest and the
131134-- behavior of the watch.
src/Streamly/Internal/FileSystem/FD.hs+5−3
@@ -128,10 +128,12 @@ import Prelude hiding (read)
128128import qualified GHC.IO.FD as FD
129129import qualified GHC.IO.Device as RawIO
130130
131−import Streamly.Internal.Data.Array
132− (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)
131+import Streamly.Data.Array (Array)
132+import Streamly.Data.Stream (Stream)
133+
134+import Streamly.Internal.Data.Array (byteLength, unsafeFreeze, asPtrUnsafe)
133135import Streamly.Internal.System.IO (defaultChunkSize)
134−import Streamly.Internal.Data.Stream (Stream)
136+
135137#if !defined(mingw32_HOST_OS)
136138{-
137139import Streamly.Internal.Data.Stream.IsStream.Type (toStreamD)
src/Streamly/Internal/Network/Inet/TCP.hs+9−6
@@ -106,12 +106,13 @@ import Prelude hiding (read)
106106
107107import Streamly.Internal.Control.Concurrent (MonadAsync)
108108import Streamly.Internal.Control.ForkLifted (fork)
109−import Streamly.Internal.Data.Array (Array(..), pinnedWriteNUnsafe)
110−import Streamly.Internal.Data.Fold (Fold(..))
109+import Streamly.Data.Array (Array)
110+import Streamly.Internal.Data.Array (pinnedWriteNUnsafe)
111+import Streamly.Internal.Data.Fold ( Fold(..) )
111112import Streamly.Data.Stream (Stream)
112113import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
113114import Streamly.Internal.Data.Unbox (Unbox)
114−import Streamly.Internal.Data.Unfold (Unfold(..))
115+import Streamly.Data.Unfold (Unfold)
115116import Streamly.Internal.Network.Socket (SockSpec(..), accept, acceptor)
116117import Streamly.Internal.System.IO (defaultChunkSize)
117118
@@ -120,13 +121,15 @@ import qualified Network.Socket as Net
120121
121122import qualified Streamly.Data.Array as A
122123import qualified Streamly.Data.Fold as FL
124+import qualified Streamly.Data.Stream as S
123125import qualified Streamly.Data.Unfold as UF
124−import qualified Streamly.Internal.Data.Array as A
126+import qualified Streamly.Internal.Data.Array as A (pinnedChunksOf)
125127import qualified Streamly.Internal.Data.Unfold as UF (first, bracketIO)
126128import qualified Streamly.Internal.Data.Fold as FL (Step(..), reduce)
127−import qualified Streamly.Internal.Data.Stream as S
128−import qualified Streamly.Internal.Data.Stream.Exception.Lifted as S
129+
130+import qualified Streamly.Internal.Data.Stream.Exception.Lifted as S (bracket)
129131import qualified Streamly.Internal.Network.Socket as ISK
132+ (chunkReader, putBytes, putChunks, read, readChunks, writeChunks)
130133
131134-------------------------------------------------------------------------------
132135-- Accept (unfolds)
src/Streamly/Internal/Network/Socket.hs+14−14
@@ -88,22 +88,22 @@ import qualified Network.Socket as Net
8888
8989import Streamly.Internal.Data.Array (Array(..))
9090import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)
91−import Streamly.Internal.Data.Fold (Fold)
92−import Streamly.Internal.Data.Stream (Stream)
91+import Streamly.Data.Fold (Fold)
92+import Streamly.Data.Stream (Stream)
9393import Streamly.Internal.Data.Unfold (Unfold(..))
9494-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
9595import Streamly.Internal.System.IO (defaultChunkSize)
9696
97−import qualified Streamly.Data.Array as A (reader, length)
97+import qualified Streamly.Data.Array as A
9898import qualified Streamly.Data.Fold as FL
99+import qualified Streamly.Data.Stream as S
100+import qualified Streamly.Data.Unfold as UF
99101import qualified Streamly.Internal.Data.Array as A
100− (unsafeFreeze, asPtrUnsafe, byteLength, pinnedChunksOf, pinnedWriteN, pinnedWriteNUnsafe)
102+ ( unsafeFreeze, asPtrUnsafe, byteLength, pinnedChunksOf,
103+ pinnedWriteN, pinnedWriteNUnsafe )
101104import qualified Streamly.Internal.Data.MutArray as MArray
102105 (MutArray(..), asPtrUnsafe, pinnedNewBytes)
103−import qualified Streamly.Internal.Data.Stream as S
104−import qualified Streamly.Internal.Data.Stream as D
105− (Stream(..), Step(..))
106−import qualified Streamly.Data.Unfold as UF
106+import qualified Streamly.Internal.Data.Stream as S (fromStreamK, Stream(..), Step(..))
107107import qualified Streamly.Internal.Data.Unfold as UF (first, map)
108108import qualified Streamly.Internal.Data.StreamK as K (mkStream)
109109
@@ -173,7 +173,7 @@ listenTuples = Unfold step inject
173173
174174 step listener = do
175175 r <- liftIO (Net.accept listener `onException` Net.close listener)
176− return $ D.Yield r listener
176+ return $ S.Yield r listener
177177
178178-- | Unfold a three tuple @(listenQLen, spec, addr)@ into a stream of connected
179179-- protocol sockets corresponding to incoming connections. @listenQLen@ is the
@@ -344,15 +344,15 @@ _readChunksUptoWith f size h = S.fromStreamK go
344344{-# INLINE_NORMAL readChunksWith #-}
345345readChunksWith :: MonadIO m => Int -> Socket -> Stream m (Array Word8)
346346-- readChunksWith = _readChunksUptoWith readChunk
347−readChunksWith size h = D.Stream step ()
347+readChunksWith size h = S.Stream step ()
348348 where
349349 {-# INLINE_LATE step #-}
350350 step _ _ = do
351351 arr <- liftIO $ getChunk size h
352352 return $
353353 case A.length arr of
354− 0 -> D.Stop
355− _ -> D.Yield arr ()
354+ 0 -> S.Stop
355+ _ -> S.Yield arr ()
356356
357357-- | Read a stream of byte arrays from a socket. The maximum size of a single
358358-- array is limited to @defaultChunkSize@.
@@ -378,8 +378,8 @@ chunkReaderWith = Unfold step return
378378 arr <- liftIO $ getChunk size h
379379 return $
380380 case A.length arr of
381− 0 -> D.Stop
382− _ -> D.Yield arr (size, h)
381+ 0 -> S.Stop
382+ _ -> S.Yield arr (size, h)
383383
384384-- | Same as 'chunkReaderWith'
385385--
src/Streamly/Internal/Unicode/Char.hs+2−4
@@ -37,8 +37,6 @@ import Data.Char (isAsciiUpper, isAsciiLower, chr, ord)
3737import Unicode.Char (DecomposeMode(..))
3838import Streamly.Internal.Data.Stream (Stream(..), Step (..))
3939
40−import qualified Streamly.Internal.Data.Stream as Stream (Stream)
41−
4240import qualified Unicode.Char as Char
4341
4442-------------------------------------------------------------------------------
@@ -321,6 +319,6 @@ normalizeD NFKC = partialComposeD . decomposeD False Kompat
321319normalize ::
322320 Monad m
323321 => NormalizationMode
324− -> Stream.Stream m Char
325− -> Stream.Stream m Char
322+ -> Stream m Char
323+ -> Stream m Char
326324normalize = normalizeD