From c689bc8db95b6b0a1bb324e8c0052059fa090e25 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan <bos@serpentine.com> Date: Wed, 4 Dec 2013 14:41:36 -0800 Subject: [PATCH] Rename Lazy internal modules --HG-- rename : Data/Text/Lazy/Encoding/Fusion.hs => Data/Text/Internal/Lazy/Encoding/Fusion.hs rename : Data/Text/Lazy/Fusion.hs => Data/Text/Internal/Lazy/Fusion.hs rename : Data/Text/Lazy/Search.hs => Data/Text/Internal/Lazy/Search.hs extra : amend_source : 2c28ab48f28c6a5750a180a503e1efec634253ea --- Data/Text/{ => Internal}/Lazy/Encoding/Fusion.hs | 2 +- Data/Text/{ => Internal}/Lazy/Fusion.hs | 2 +- Data/Text/{ => Internal}/Lazy/Search.hs | 2 +- Data/Text/Lazy.hs | 6 +++--- Data/Text/Lazy/Encoding.hs | 4 ++-- benchmarks/haskell/Benchmarks/Stream.hs | 4 ++-- tests/Tests/Properties.hs | 4 ++-- tests/Tests/QuickCheckUtils.hs | 2 +- tests/text-tests.cabal | 6 +++--- text.cabal | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) rename Data/Text/{ => Internal}/Lazy/Encoding/Fusion.hs (99%) rename Data/Text/{ => Internal}/Lazy/Fusion.hs (99%) rename Data/Text/{ => Internal}/Lazy/Search.hs (99%) diff --git a/Data/Text/Lazy/Encoding/Fusion.hs b/Data/Text/Internal/Lazy/Encoding/Fusion.hs similarity index 99% rename from Data/Text/Lazy/Encoding/Fusion.hs rename to Data/Text/Internal/Lazy/Encoding/Fusion.hs index f15fabc9..52ed58d1 100644 --- a/Data/Text/Lazy/Encoding/Fusion.hs +++ b/Data/Text/Internal/Lazy/Encoding/Fusion.hs @@ -13,7 +13,7 @@ -- Fusible 'Stream'-oriented functions for converting between lazy -- 'Text' and several common encodings. -module Data.Text.Lazy.Encoding.Fusion +module Data.Text.Internal.Lazy.Encoding.Fusion ( -- * Streaming -- streamASCII diff --git a/Data/Text/Lazy/Fusion.hs b/Data/Text/Internal/Lazy/Fusion.hs similarity index 99% rename from Data/Text/Lazy/Fusion.hs rename to Data/Text/Internal/Lazy/Fusion.hs index 783b3134..86c6a4c4 100644 --- a/Data/Text/Lazy/Fusion.hs +++ b/Data/Text/Internal/Lazy/Fusion.hs @@ -11,7 +11,7 @@ -- -- Core stream fusion functionality for text. -module Data.Text.Lazy.Fusion +module Data.Text.Internal.Lazy.Fusion ( stream , unstream diff --git a/Data/Text/Lazy/Search.hs b/Data/Text/Internal/Lazy/Search.hs similarity index 99% rename from Data/Text/Lazy/Search.hs rename to Data/Text/Internal/Lazy/Search.hs index 7a0fd367..5378b07c 100644 --- a/Data/Text/Lazy/Search.hs +++ b/Data/Text/Internal/Lazy/Search.hs @@ -14,7 +14,7 @@ -- Moore, Horspool, Sunday, and Lundh. Adapted from the strict -- implementation. -module Data.Text.Lazy.Search +module Data.Text.Internal.Lazy.Search ( indices ) where diff --git a/Data/Text/Lazy.hs b/Data/Text/Lazy.hs index 61a17ecf..752abfd1 100644 --- a/Data/Text/Lazy.hs +++ b/Data/Text/Lazy.hs @@ -210,13 +210,13 @@ import qualified Data.Text as T import qualified Data.Text.Internal as T import qualified Data.Text.Internal.Fusion.Common as S import qualified Data.Text.Unsafe as T -import qualified Data.Text.Lazy.Fusion as S +import qualified Data.Text.Internal.Lazy.Fusion as S import Data.Text.Internal.Fusion.Types (PairS(..)) -import Data.Text.Lazy.Fusion (stream, unstream) +import Data.Text.Internal.Lazy.Fusion (stream, unstream) import Data.Text.Lazy.Internal (Text(..), chunk, empty, foldlChunks, foldrChunks) import Data.Text.Internal (firstf, safe, textP) import qualified Data.Text.Util as U -import Data.Text.Lazy.Search (indices) +import Data.Text.Internal.Lazy.Search (indices) #if __GLASGOW_HASKELL__ >= 702 import qualified GHC.CString as GHC #else diff --git a/Data/Text/Lazy/Encoding.hs b/Data/Text/Lazy/Encoding.hs index 654d01c6..e4a00a75 100644 --- a/Data/Text/Lazy/Encoding.hs +++ b/Data/Text/Lazy/Encoding.hs @@ -57,8 +57,8 @@ import qualified Data.ByteString.Lazy.Internal as B import qualified Data.ByteString.Unsafe as B import qualified Data.Text.Encoding as TE import qualified Data.Text.Lazy as L -import qualified Data.Text.Lazy.Encoding.Fusion as E -import qualified Data.Text.Lazy.Fusion as F +import qualified Data.Text.Internal.Lazy.Encoding.Fusion as E +import qualified Data.Text.Internal.Lazy.Fusion as F import Data.Text.Unsafe (unsafeDupablePerformIO) -- $strict diff --git a/benchmarks/haskell/Benchmarks/Stream.hs b/benchmarks/haskell/Benchmarks/Stream.hs index c8b2da99..3e87a17f 100644 --- a/benchmarks/haskell/Benchmarks/Stream.hs +++ b/benchmarks/haskell/Benchmarks/Stream.hs @@ -21,8 +21,8 @@ import qualified Data.Text.Internal.Encoding.Fusion.Common as F import qualified Data.Text.Internal.Fusion as T import qualified Data.Text.IO as T import qualified Data.Text.Lazy.Encoding as TL -import qualified Data.Text.Lazy.Encoding.Fusion as TL -import qualified Data.Text.Lazy.Fusion as TL +import qualified Data.Text.Internal.Lazy.Encoding.Fusion as TL +import qualified Data.Text.Internal.Lazy.Fusion as TL import qualified Data.Text.Lazy.IO as TL instance NFData a => NFData (Stream a) where diff --git a/tests/Tests/Properties.hs b/tests/Tests/Properties.hs index 7058eb6a..2f504f14 100644 --- a/tests/Tests/Properties.hs +++ b/tests/Tests/Properties.hs @@ -43,9 +43,9 @@ import qualified Data.Text.Lazy.Builder as TB import qualified Data.Text.Lazy.Builder.Int as TB import qualified Data.Text.Lazy.Builder.RealFloat as TB import qualified Data.Text.Lazy.Encoding as EL -import qualified Data.Text.Lazy.Fusion as SL +import qualified Data.Text.Internal.Lazy.Fusion as SL import qualified Data.Text.Lazy.IO as TL -import qualified Data.Text.Lazy.Search as S (indices) +import qualified Data.Text.Internal.Lazy.Search as S (indices) import qualified Data.Text.UnsafeShift as U import qualified System.IO as IO diff --git a/tests/Tests/QuickCheckUtils.hs b/tests/Tests/QuickCheckUtils.hs index 3aa5e65b..b2729995 100644 --- a/tests/Tests/QuickCheckUtils.hs +++ b/tests/Tests/QuickCheckUtils.hs @@ -46,7 +46,7 @@ import qualified Data.Text.Encoding.Error as T import qualified Data.Text.Internal.Fusion as TF import qualified Data.Text.Internal.Fusion.Common as TF import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Fusion as TLF +import qualified Data.Text.Internal.Lazy.Fusion as TLF import qualified Data.Text.Lazy.Internal as TL import qualified System.IO as IO diff --git a/tests/text-tests.cabal b/tests/text-tests.cabal index b3a9658e..e735ca8d 100644 --- a/tests/text-tests.cabal +++ b/tests/text-tests.cabal @@ -93,12 +93,12 @@ library Data.Text.Lazy.Builder.RealFloat Data.Text.Internal.Builder.RealFloat.Functions Data.Text.Lazy.Encoding - Data.Text.Lazy.Encoding.Fusion - Data.Text.Lazy.Fusion + Data.Text.Internal.Lazy.Encoding.Fusion + Data.Text.Internal.Lazy.Fusion Data.Text.Lazy.IO Data.Text.Lazy.Internal Data.Text.Lazy.Read - Data.Text.Lazy.Search + Data.Text.Internal.Lazy.Search Data.Text.Private Data.Text.Read Data.Text.Search diff --git a/text.cabal b/text.cabal index c9572509..5962aaac 100644 --- a/text.cabal +++ b/text.cabal @@ -108,9 +108,9 @@ library Data.Text.Internal.Builder.Int.Digits Data.Text.Internal.Builder Data.Text.Internal.Builder.RealFloat.Functions - Data.Text.Lazy.Encoding.Fusion - Data.Text.Lazy.Fusion - Data.Text.Lazy.Search + Data.Text.Internal.Lazy.Encoding.Fusion + Data.Text.Internal.Lazy.Fusion + Data.Text.Internal.Lazy.Search Data.Text.Private Data.Text.Search Data.Text.Unsafe.Base -- GitLab