From d3325c60f6a367535f871e0e35bd9d61a282d9fe Mon Sep 17 00:00:00 2001 From: adithyaov Date: Fri, 28 Aug 2020 01:30:30 +0530 Subject: [PATCH] Rename Streamly.Internal.Data.Unicode.Stream According to the new module structure, it should be Streamly.Internal.Unicode.Stream --- .hlint.ignore | 2 +- benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs | 2 +- benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs | 2 +- examples/HandleIO.hs | 2 +- examples/WordClassifier.hs | 2 +- examples/WordCount.hs | 2 +- src/Streamly/Data/Unicode/Stream.hs | 2 +- src/Streamly/Internal/FileSystem/Event/Darwin.hs | 2 +- src/Streamly/Internal/FileSystem/Event/Linux.hs | 4 ++-- src/Streamly/Internal/Memory/Unicode/Array.hs | 2 +- src/Streamly/Internal/Unicode/Array/Prim/Pinned.hs | 2 +- src/Streamly/Internal/{Data => }/Unicode/Stream.hs | 6 +++--- streamly.cabal | 3 +-- test/String.hs | 2 +- 14 files changed, 17 insertions(+), 18 deletions(-) rename src/Streamly/Internal/{Data => }/Unicode/Stream.hs (99%) diff --git a/.hlint.ignore b/.hlint.ignore index ef696f0bc..3a46618cc 100644 --- a/.hlint.ignore +++ b/.hlint.ignore @@ -13,7 +13,7 @@ src/Streamly/Internal/Data/Stream/StreamDK/Type.hs src/Streamly/Internal/Data/Stream/StreamD.hs src/Streamly/Internal/Data/Pipe/Types.hs src/Streamly/Internal/Data/SmallArray/Types.hs -src/Streamly/Internal/Data/Unicode/Stream.hs +src/Streamly/Internal/Unicode/Stream.hs src/Streamly/Internal/Data/IORef/Prim.hs src/Streamly/Internal/Data/Array/Prim/Types.hs src/Streamly/Internal/Data/Array/Prim/MutTypesInclude.hs diff --git a/benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs b/benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs index 8876fd9d3..dc868210e 100644 --- a/benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs +++ b/benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs @@ -41,7 +41,7 @@ import qualified Streamly.FileSystem.Handle as FH -- import qualified Streamly.Internal.Data.Fold as IFL import qualified Streamly.Internal.Data.Parser as PR import qualified Streamly.Internal.Data.Stream.StreamD as D -import qualified Streamly.Internal.Data.Unicode.Stream as IUS +import qualified Streamly.Internal.Unicode.Stream as IUS import qualified Streamly.Internal.FileSystem.Handle as IFH import qualified Streamly.Internal.Memory.Array as A import qualified Streamly.Internal.Memory.Array.Types as AT diff --git a/benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs b/benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs index 4791b7b7e..a0f032f23 100644 --- a/benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs +++ b/benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs @@ -31,7 +31,7 @@ import qualified Streamly.Data.Fold as FL import qualified Streamly.Data.Unicode.Stream as SS import qualified Streamly.FileSystem.Handle as FH import qualified Streamly.Internal.Data.Unfold as IUF -import qualified Streamly.Internal.Data.Unicode.Stream as IUS +import qualified Streamly.Internal.Unicode.Stream as IUS import qualified Streamly.Internal.FileSystem.Handle as IFH import qualified Streamly.Internal.Memory.ArrayStream as AS import qualified Streamly.Internal.Memory.Unicode.Array as IUA diff --git a/examples/HandleIO.hs b/examples/HandleIO.hs index 87918eda8..ef26cbe51 100644 --- a/examples/HandleIO.hs +++ b/examples/HandleIO.hs @@ -10,7 +10,7 @@ import qualified Streamly.Prelude as S -- import qualified Streamly.FileSystem.FD as FH import qualified Streamly.Internal.Data.Fold as FL -import qualified Streamly.Internal.Data.Unicode.Stream as US +import qualified Streamly.Internal.Unicode.Stream as US import qualified Streamly.Internal.Memory.ArrayStream as AS import qualified Streamly.Internal.Data.Stream.IsStream as S diff --git a/examples/WordClassifier.hs b/examples/WordClassifier.hs index 1d5e7543d..488ce35e9 100644 --- a/examples/WordClassifier.hs +++ b/examples/WordClassifier.hs @@ -17,7 +17,7 @@ import qualified Data.List as List import qualified Data.Ord as Ord import Foreign.Storable (Storable(..)) import qualified Streamly.Data.Unicode.Stream as S -import qualified Streamly.Internal.Data.Unicode.Stream as S +import qualified Streamly.Internal.Unicode.Stream as S import qualified Streamly.Data.Fold as FL import qualified Streamly.Internal.Data.Fold as IFL import qualified Streamly.Internal.Data.Unfold as IUF diff --git a/examples/WordCount.hs b/examples/WordCount.hs index dfab500a6..1f975eb38 100644 --- a/examples/WordCount.hs +++ b/examples/WordCount.hs @@ -36,7 +36,7 @@ import Data.Word (Word8) import GHC.Conc (numCapabilities) import System.Environment (getArgs) import System.IO (Handle, openFile, IOMode(..)) -import Streamly.Internal.Data.Unicode.Stream +import Streamly.Internal.Unicode.Stream (DecodeState, DecodeError(..), CodePoint, decodeUtf8Either, resumeDecodeUtf8Either) diff --git a/src/Streamly/Data/Unicode/Stream.hs b/src/Streamly/Data/Unicode/Stream.hs index 6b83019c4..89db0f562 100644 --- a/src/Streamly/Data/Unicode/Stream.hs +++ b/src/Streamly/Data/Unicode/Stream.hs @@ -92,5 +92,5 @@ module Streamly.Data.Unicode.Stream ) where -import Streamly.Internal.Data.Unicode.Stream +import Streamly.Internal.Unicode.Stream import Prelude hiding (lines, words, unlines, unwords) diff --git a/src/Streamly/Internal/FileSystem/Event/Darwin.hs b/src/Streamly/Internal/FileSystem/Event/Darwin.hs index 456b4d543..f82306bf4 100644 --- a/src/Streamly/Internal/FileSystem/Event/Darwin.hs +++ b/src/Streamly/Internal/FileSystem/Event/Darwin.hs @@ -171,7 +171,7 @@ import System.IO (Handle, hClose) import qualified Data.List.NonEmpty as NonEmpty import qualified Streamly.Internal.Data.Parser as PR import qualified Streamly.Internal.Data.Stream.IsStream as S -import qualified Streamly.Internal.Data.Unicode.Stream as U +import qualified Streamly.Internal.Unicode.Stream as U import qualified Streamly.Internal.FileSystem.Handle as FH import qualified Streamly.Internal.Memory.Array as A diff --git a/src/Streamly/Internal/FileSystem/Event/Linux.hs b/src/Streamly/Internal/FileSystem/Event/Linux.hs index f3f6fece5..dd9fd093e 100644 --- a/src/Streamly/Internal/FileSystem/Event/Linux.hs +++ b/src/Streamly/Internal/FileSystem/Event/Linux.hs @@ -178,7 +178,7 @@ import qualified Data.List.NonEmpty as NonEmpty import qualified Streamly.Internal.Data.Fold as FL import qualified Streamly.Internal.Data.Parser as PR import qualified Streamly.Internal.Data.Stream.IsStream as S -import qualified Streamly.Internal.Data.Unicode.Stream as U +import qualified Streamly.Internal.Unicode.Stream as U import qualified Streamly.Internal.FileSystem.Handle as FH import qualified Streamly.Internal.Memory.Array as A @@ -732,7 +732,7 @@ watchToStream (Watch handle wdMap) = -- -- /Internal/ -- -watchPathsWith :: +watchPathsWith :: (Config -> Config) -> NonEmpty (Array Word8) -> SerialT IO Event watchPathsWith f paths = S.bracket before after watchToStream diff --git a/src/Streamly/Internal/Memory/Unicode/Array.hs b/src/Streamly/Internal/Memory/Unicode/Array.hs index da6179ce4..82c47910d 100644 --- a/src/Streamly/Internal/Memory/Unicode/Array.hs +++ b/src/Streamly/Internal/Memory/Unicode/Array.hs @@ -22,7 +22,7 @@ import Streamly (IsStream, MonadAsync) import Prelude hiding (String, lines, words, unlines, unwords) import Streamly.Memory.Array (Array) -import qualified Streamly.Internal.Data.Unicode.Stream as S +import qualified Streamly.Internal.Unicode.Stream as S import qualified Streamly.Memory.Array as A -- | Break a string up into a stream of strings at newline characters. diff --git a/src/Streamly/Internal/Unicode/Array/Prim/Pinned.hs b/src/Streamly/Internal/Unicode/Array/Prim/Pinned.hs index 0fef37b28..f8ad765f9 100644 --- a/src/Streamly/Internal/Unicode/Array/Prim/Pinned.hs +++ b/src/Streamly/Internal/Unicode/Array/Prim/Pinned.hs @@ -22,7 +22,7 @@ import Streamly (IsStream, MonadAsync) import Prelude hiding (String, lines, words, unlines, unwords) import Streamly.Internal.Data.Array.Prim.Pinned (Array) -import qualified Streamly.Internal.Data.Unicode.Stream as S +import qualified Streamly.Internal.Unicode.Stream as S import qualified Streamly.Internal.Data.Array.Prim.Pinned as A -- | Break a string up into a stream of strings at newline characters. diff --git a/src/Streamly/Internal/Data/Unicode/Stream.hs b/src/Streamly/Internal/Unicode/Stream.hs similarity index 99% rename from src/Streamly/Internal/Data/Unicode/Stream.hs rename to src/Streamly/Internal/Unicode/Stream.hs index 9a598e41e..3065db01c 100644 --- a/src/Streamly/Internal/Data/Unicode/Stream.hs +++ b/src/Streamly/Internal/Unicode/Stream.hs @@ -1,9 +1,9 @@ -- | --- Module : Streamly.Data.Internal.Unicode.Stream +-- Module : Streamly.Internal.Unicode.Stream -- Copyright : (c) 2018 Composewell Technologies -- (c) Bjoern Hoehrmann 2008-2009 -- --- License : BSD3 +-- License : BSD-3-Clause -- Maintainer : streamly@composewell.com -- Stability : experimental -- Portability : GHC @@ -11,7 +11,7 @@ #include "inline.hs" -module Streamly.Internal.Data.Unicode.Stream +module Streamly.Internal.Unicode.Stream ( -- * Construction (Decoding) decodeLatin1 diff --git a/streamly.cabal b/streamly.cabal index 98d15ae50..cff435843 100644 --- a/streamly.cabal +++ b/streamly.cabal @@ -480,7 +480,7 @@ library , Streamly.Internal.FileSystem.File -- Text Processing - , Streamly.Internal.Data.Unicode.Stream + , Streamly.Internal.Unicode.Stream , Streamly.Internal.Unicode.Char , Streamly.Internal.Memory.Unicode.Array , Streamly.Internal.Unicode.Array.Prim.Pinned @@ -490,7 +490,6 @@ library -- Deprecated - if !impl(ghcjs) exposed-modules: Streamly.Network.Socket diff --git a/test/String.hs b/test/String.hs index 69a6637c9..6a6051e1b 100644 --- a/test/String.hs +++ b/test/String.hs @@ -13,7 +13,7 @@ import qualified Streamly.Memory.Array as A import qualified Streamly.Internal.Memory.ArrayStream as AS import qualified Streamly.Prelude as S import qualified Streamly.Data.Unicode.Stream as SS -import qualified Streamly.Internal.Data.Unicode.Stream as IUS +import qualified Streamly.Internal.Unicode.Stream as IUS import qualified Streamly.Internal.Memory.Unicode.Array as IUA -- Coverage build takes too long with default number of tests