From eae50557854d33624618a4ca7bcb68a88ec8f288 Mon Sep 17 00:00:00 2001 From: michaelt Date: Wed, 4 Jun 2014 13:03:50 -0400 Subject: depend on streaming commons --- Pipes/Text/Encoding.hs | 15 ++++++++------- pipes-text.cabal | 25 +++++++++++++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Pipes/Text/Encoding.hs b/Pipes/Text/Encoding.hs index 37a4aa3..e00cd43 100644 --- a/Pipes/Text/Encoding.hs +++ b/Pipes/Text/Encoding.hs @@ -52,7 +52,8 @@ import Data.ByteString.Char8 as B8 import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Encoding as TE -import Data.Text.StreamDecoding +import qualified Data.Streaming.Text as Stream +import Data.Streaming.Text (DecodeResult(..)) import Control.Monad (join) import Data.Word (Word8) import Pipes @@ -202,27 +203,27 @@ decodeStream = loop where decodeUtf8 :: Monad m => Producer ByteString m r -> Producer Text m (Producer ByteString m r) -decodeUtf8 = decodeStream streamUtf8 +decodeUtf8 = decodeStream Stream.decodeUtf8 {-# INLINE decodeUtf8 #-} decodeUtf8Pure :: Monad m => Producer ByteString m r -> Producer Text m (Producer ByteString m r) -decodeUtf8Pure = decodeStream streamUtf8Pure +decodeUtf8Pure = decodeStream Stream.decodeUtf8Pure {-# INLINE decodeUtf8Pure #-} decodeUtf16LE :: Monad m => Producer ByteString m r -> Producer Text m (Producer ByteString m r) -decodeUtf16LE = decodeStream streamUtf16LE +decodeUtf16LE = decodeStream Stream.decodeUtf16LE {-# INLINE decodeUtf16LE #-} decodeUtf16BE :: Monad m => Producer ByteString m r -> Producer Text m (Producer ByteString m r) -decodeUtf16BE = decodeStream streamUtf16BE +decodeUtf16BE = decodeStream Stream.decodeUtf16BE {-# INLINE decodeUtf16BE #-} decodeUtf32LE :: Monad m => Producer ByteString m r -> Producer Text m (Producer ByteString m r) -decodeUtf32LE = decodeStream streamUtf32LE +decodeUtf32LE = decodeStream Stream.decodeUtf32LE {-# INLINE decodeUtf32LE #-} decodeUtf32BE :: Monad m => Producer ByteString m r -> Producer Text m (Producer ByteString m r) -decodeUtf32BE = decodeStream streamUtf32BE +decodeUtf32BE = decodeStream Stream.decodeUtf32BE {-# INLINE decodeUtf32BE #-} diff --git a/pipes-text.cabal b/pipes-text.cabal index f4e554d..4f1602c 100644 --- a/pipes-text.cabal +++ b/pipes-text.cabal @@ -1,5 +1,5 @@ name: pipes-text -version: 0.0.0.10 +version: 0.0.0.11 synopsis: Text pipes. description: * This package will be in a draft, or testing, phase until version 0.0.1. Please report any installation difficulties, or any wisdom about the api, on the github page or the . @@ -34,17 +34,18 @@ flag noio library exposed-modules: Pipes.Text, Pipes.Text.Encoding - build-depends: base >= 4 && < 5 , - bytestring >= 0.9 , - text >=0.11.2 && < 1.2, - text-stream-decode >= 0.1 && < 0.2, - profunctors >= 3.1.1 && < 4.1, - pipes >=4.0 && < 4.2, - pipes-group >= 1.0.0 && < 1.1, - pipes-parse >=2.0 && < 3.1, - pipes-safe, - pipes-bytestring >= 1.0 && < 2.1, - transformers >= 0.2.0.0 && < 0.4 + build-depends: base >= 4 && < 5 , + bytestring >= 0.9.2.1 && < 0.11, + text >= 0.11.2 && < 1.2 , + streaming-commons >= 0.1 && < 0.2 , + profunctors >= 3.1.1 && < 4.1 , + pipes >= 4.0 && < 4.2 , + pipes-group >= 1.0.0 && < 1.1 , + pipes-parse >= 3.0.0 && < 3.1 , + pipes-safe >= 2.1 && < 2.3 , + pipes-bytestring >= 1.0 && < 2.1 , + transformers >= 0.2.0.0 && < 0.5 + other-extensions: RankNTypes default-language: Haskell2010 ghc-options: -O2 -- cgit v1.2.3