conduit-extra 1.3.5 → 1.3.6
raw patch · 4 files changed
+30/−7 lines, 4 filesdep −bytestring-builderdep ~basedep ~transformersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependencies removed: bytestring-builder
Dependency ranges changed: base, transformers
API changes (from Hackage documentation)
- Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, r Data.Type.Equality.~ (), r' Data.Type.Equality.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.BuilderInput o m r, n r')
- Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, r Data.Type.Equality.~ (), r' Data.Type.Equality.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.FlushInput o m r, n r')
- Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, r Data.Type.Equality.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.BuilderInput o m r)
- Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, r Data.Type.Equality.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.FlushInput o m r)
- Data.Conduit.Process: instance (r Data.Type.Equality.~ (), Control.Monad.IO.Class.MonadIO m, i Data.Type.Equality.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Internal.Conduit.ConduitM i o m r)
- Data.Conduit.Process: instance (r Data.Type.Equality.~ (), Control.Monad.IO.Class.MonadIO m, o Data.Type.Equality.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.OutputSink (Data.Conduit.Internal.Conduit.ConduitM i o m r)
- Data.Conduit.Process: instance (r Data.Type.Equality.~ (), r' Data.Type.Equality.~ (), Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, i Data.Type.Equality.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Internal.Conduit.ConduitM i o m r, n r')
- Data.Conduit.Process: instance (r Data.Type.Equality.~ (), r' Data.Type.Equality.~ (), Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, o Data.Type.Equality.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.OutputSink (Data.Conduit.Internal.Conduit.ConduitM i o m r, n r')
+ Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, r GHC.Types.~ (), r' GHC.Types.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.BuilderInput o m r, n r')
+ Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, r GHC.Types.~ (), r' GHC.Types.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.FlushInput o m r, n r')
+ Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, r GHC.Types.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.BuilderInput o m r)
+ Data.Conduit.Process: instance (Control.Monad.IO.Class.MonadIO m, r GHC.Types.~ ()) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Process.FlushInput o m r)
+ Data.Conduit.Process: instance (r GHC.Types.~ (), Control.Monad.IO.Class.MonadIO m, i GHC.Types.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Internal.Conduit.ConduitM i o m r)
+ Data.Conduit.Process: instance (r GHC.Types.~ (), Control.Monad.IO.Class.MonadIO m, o GHC.Types.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.OutputSink (Data.Conduit.Internal.Conduit.ConduitM i o m r)
+ Data.Conduit.Process: instance (r GHC.Types.~ (), r' GHC.Types.~ (), Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, i GHC.Types.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.InputSource (Data.Conduit.Internal.Conduit.ConduitM i o m r, n r')
+ Data.Conduit.Process: instance (r GHC.Types.~ (), r' GHC.Types.~ (), Control.Monad.IO.Class.MonadIO m, Control.Monad.IO.Class.MonadIO n, o GHC.Types.~ Data.ByteString.Internal.ByteString) => Data.Streaming.Process.Internal.OutputSink (Data.Conduit.Internal.Conduit.ConduitM i o m r, n r')
- Data.Conduit.Binary: sinkFile :: MonadResource m => FilePath -> ConduitT ByteString o m ()
+ Data.Conduit.Binary: sinkFile :: forall (m :: Type -> Type) o. MonadResource m => FilePath -> ConduitT ByteString o m ()
- Data.Conduit.Binary: sinkFileCautious :: MonadResource m => FilePath -> ConduitM ByteString o m ()
+ Data.Conduit.Binary: sinkFileCautious :: forall (m :: Type -> Type) o. MonadResource m => FilePath -> ConduitM ByteString o m ()
- Data.Conduit.Binary: sinkHandle :: MonadIO m => Handle -> ConduitT ByteString o m ()
+ Data.Conduit.Binary: sinkHandle :: forall (m :: Type -> Type) o. MonadIO m => Handle -> ConduitT ByteString o m ()
- Data.Conduit.Binary: sinkHandleBuilder :: MonadIO m => Handle -> ConduitM Builder o m ()
+ Data.Conduit.Binary: sinkHandleBuilder :: forall (m :: Type -> Type) o. MonadIO m => Handle -> ConduitM Builder o m ()
- Data.Conduit.Binary: sinkHandleFlush :: MonadIO m => Handle -> ConduitM (Flush ByteString) o m ()
+ Data.Conduit.Binary: sinkHandleFlush :: forall (m :: Type -> Type) o. MonadIO m => Handle -> ConduitM (Flush ByteString) o m ()
- Data.Conduit.Binary: sinkIOHandle :: MonadResource m => IO Handle -> ConduitT ByteString o m ()
+ Data.Conduit.Binary: sinkIOHandle :: forall (m :: Type -> Type) o. MonadResource m => IO Handle -> ConduitT ByteString o m ()
- Data.Conduit.Binary: sinkSystemTempFile :: MonadResource m => String -> ConduitM ByteString o m FilePath
+ Data.Conduit.Binary: sinkSystemTempFile :: forall (m :: Type -> Type) o. MonadResource m => String -> ConduitM ByteString o m FilePath
- Data.Conduit.Binary: sinkTempFile :: MonadResource m => FilePath -> String -> ConduitM ByteString o m FilePath
+ Data.Conduit.Binary: sinkTempFile :: forall (m :: Type -> Type) o. MonadResource m => FilePath -> String -> ConduitM ByteString o m FilePath
- Data.Conduit.Binary: sourceFile :: MonadResource m => FilePath -> ConduitT i ByteString m ()
+ Data.Conduit.Binary: sourceFile :: forall (m :: Type -> Type) i. MonadResource m => FilePath -> ConduitT i ByteString m ()
- Data.Conduit.Binary: sourceHandle :: MonadIO m => Handle -> ConduitT i ByteString m ()
+ Data.Conduit.Binary: sourceHandle :: forall (m :: Type -> Type) i. MonadIO m => Handle -> ConduitT i ByteString m ()
- Data.Conduit.Binary: sourceHandleUnsafe :: MonadIO m => Handle -> ConduitT i ByteString m ()
+ Data.Conduit.Binary: sourceHandleUnsafe :: forall (m :: Type -> Type) i. MonadIO m => Handle -> ConduitT i ByteString m ()
- Data.Conduit.Binary: sourceIOHandle :: MonadResource m => IO Handle -> ConduitT i ByteString m ()
+ Data.Conduit.Binary: sourceIOHandle :: forall (m :: Type -> Type) i. MonadResource m => IO Handle -> ConduitT i ByteString m ()
- Data.Conduit.Binary: withSinkFile :: (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM ByteString o n () -> m a) -> m a
+ Data.Conduit.Binary: withSinkFile :: forall m (n :: Type -> Type) o a. (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM ByteString o n () -> m a) -> m a
- Data.Conduit.Binary: withSinkFileBuilder :: (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM Builder o n () -> m a) -> m a
+ Data.Conduit.Binary: withSinkFileBuilder :: forall m (n :: Type -> Type) o a. (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM Builder o n () -> m a) -> m a
- Data.Conduit.Binary: withSinkFileCautious :: (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM ByteString o n () -> m a) -> m a
+ Data.Conduit.Binary: withSinkFileCautious :: forall m (n :: Type -> Type) o a. (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM ByteString o n () -> m a) -> m a
- Data.Conduit.Binary: withSourceFile :: (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM i ByteString n () -> m a) -> m a
+ Data.Conduit.Binary: withSourceFile :: forall m (n :: Type -> Type) i a. (MonadUnliftIO m, MonadIO n) => FilePath -> (ConduitM i ByteString n () -> m a) -> m a
- Data.Conduit.ByteString.Builder: builderToByteString :: PrimMonad m => ConduitT Builder ByteString m ()
+ Data.Conduit.ByteString.Builder: builderToByteString :: forall (m :: Type -> Type). PrimMonad m => ConduitT Builder ByteString m ()
- Data.Conduit.ByteString.Builder: builderToByteStringFlush :: PrimMonad m => ConduitT (Flush Builder) (Flush ByteString) m ()
+ Data.Conduit.ByteString.Builder: builderToByteStringFlush :: forall (m :: Type -> Type). PrimMonad m => ConduitT (Flush Builder) (Flush ByteString) m ()
- Data.Conduit.ByteString.Builder: builderToByteStringWith :: PrimMonad m => BufferAllocStrategy -> ConduitT Builder ByteString m ()
+ Data.Conduit.ByteString.Builder: builderToByteStringWith :: forall (m :: Type -> Type). PrimMonad m => BufferAllocStrategy -> ConduitT Builder ByteString m ()
- Data.Conduit.ByteString.Builder: builderToByteStringWithFlush :: PrimMonad m => BufferAllocStrategy -> ConduitT (Flush Builder) (Flush ByteString) m ()
+ Data.Conduit.ByteString.Builder: builderToByteStringWithFlush :: forall (m :: Type -> Type). PrimMonad m => BufferAllocStrategy -> ConduitT (Flush Builder) (Flush ByteString) m ()
- Data.Conduit.ByteString.Builder: unsafeBuilderToByteString :: PrimMonad m => ConduitT Builder ByteString m ()
+ Data.Conduit.ByteString.Builder: unsafeBuilderToByteString :: forall (m :: Type -> Type). PrimMonad m => ConduitT Builder ByteString m ()
- Data.Conduit.Filesystem: sourceDirectory :: MonadResource m => FilePath -> ConduitT i FilePath m ()
+ Data.Conduit.Filesystem: sourceDirectory :: forall (m :: Type -> Type) i. MonadResource m => FilePath -> ConduitT i FilePath m ()
- Data.Conduit.Filesystem: sourceDirectoryDeep :: MonadResource m => Bool -> FilePath -> ConduitT i FilePath m ()
+ Data.Conduit.Filesystem: sourceDirectoryDeep :: forall (m :: Type -> Type) i. MonadResource m => Bool -> FilePath -> ConduitT i FilePath m ()
- Data.Conduit.Network: runTCPClient :: () => ClientSettings -> (AppData -> IO a) -> IO a
+ Data.Conduit.Network: runTCPClient :: ClientSettings -> (AppData -> IO a) -> IO a
- Data.Conduit.Network: runTCPServer :: () => ServerSettings -> (AppData -> IO ()) -> IO a
+ Data.Conduit.Network: runTCPServer :: ServerSettings -> (AppData -> IO ()) -> IO a
- Data.Conduit.Network: runTCPServerWithHandle :: () => ServerSettings -> ConnectionHandle -> IO a
+ Data.Conduit.Network: runTCPServerWithHandle :: ServerSettings -> ConnectionHandle -> IO a
- Data.Conduit.Network.Unix: runUnixClient :: () => ClientSettingsUnix -> (AppDataUnix -> IO a) -> IO a
+ Data.Conduit.Network.Unix: runUnixClient :: ClientSettingsUnix -> (AppDataUnix -> IO a) -> IO a
- Data.Conduit.Network.Unix: runUnixServer :: () => ServerSettingsUnix -> (AppDataUnix -> IO ()) -> IO a
+ Data.Conduit.Network.Unix: runUnixServer :: ServerSettingsUnix -> (AppDataUnix -> IO ()) -> IO a
- Data.Conduit.Process.Typed: createSink :: MonadIO m => StreamSpec 'STInput (ConduitM ByteString o m ())
+ Data.Conduit.Process.Typed: createSink :: MonadIO m => StreamSpec 'STInput (ConduitM ByteString o m ())
- Data.Conduit.Process.Typed: createSinkClose :: MonadIO m => StreamSpec 'STInput (ConduitM ByteString o m ())
+ Data.Conduit.Process.Typed: createSinkClose :: MonadIO m => StreamSpec 'STInput (ConduitM ByteString o m ())
- Data.Conduit.Process.Typed: createSource :: MonadIO m => StreamSpec 'STOutput (ConduitM i ByteString m ())
+ Data.Conduit.Process.Typed: createSource :: MonadIO m => StreamSpec 'STOutput (ConduitM i ByteString m ())
- Data.Conduit.Text: decodeUtf8 :: MonadThrow m => ConduitT ByteString Text m ()
+ Data.Conduit.Text: decodeUtf8 :: forall (m :: Type -> Type). MonadThrow m => ConduitT ByteString Text m ()
- Data.Conduit.Text: decodeUtf8Lenient :: Monad m => ConduitT ByteString Text m ()
+ Data.Conduit.Text: decodeUtf8Lenient :: forall (m :: Type -> Type). Monad m => ConduitT ByteString Text m ()
- Data.Conduit.Text: encodeUtf8 :: (Monad m, Utf8 text binary) => ConduitT text binary m ()
+ Data.Conduit.Text: encodeUtf8 :: forall (m :: Type -> Type) text binary. (Monad m, Utf8 text binary) => ConduitT text binary m ()
Files
- ChangeLog.md +4/−0
- Data/Conduit/Lazy.hs +6/−2
- Data/Conduit/Process.hs +13/−0
- conduit-extra.cabal +7/−5
ChangeLog.md view
@@ -1,5 +1,9 @@ # ChangeLog for conduit-extra +## 1.3.6++* Add support for `transformers-0.6`+ ## 1.3.5 * Add `createSinkClose`
Data/Conduit/Lazy.hs view
@@ -21,9 +21,11 @@ import Control.Monad.IO.Unlift (MonadIO, liftIO, MonadUnliftIO, withUnliftIO, unliftIO) import Control.Monad.Trans.Identity ( IdentityT)+#if !MIN_VERSION_transformers(0,6,0)+import Control.Monad.Trans.Error ( ErrorT, Error) import Control.Monad.Trans.List ( ListT )+#endif import Control.Monad.Trans.Maybe ( MaybeT )-import Control.Monad.Trans.Error ( ErrorT, Error) import Control.Monad.Trans.Reader ( ReaderT ) import Control.Monad.Trans.State ( StateT ) import Control.Monad.Trans.Writer ( WriterT )@@ -100,9 +102,11 @@ #define GO(T) instance MonadActive m => MonadActive (T m) where monadActive = lift monadActive #define GOX(X, T) instance (X, MonadActive m) => MonadActive (T m) where monadActive = lift monadActive GO(IdentityT)+#if !MIN_VERSION_transformers(0,6,0)+GOX(Error e, ErrorT e) GO(ListT)+#endif GO(MaybeT)-GOX(Error e, ErrorT e) GO(ReaderT r) GO(StateT s) GOX(Monoid w, WriterT w)
Data/Conduit/Process.hs view
@@ -6,6 +6,9 @@ -- | A full tutorial for this module is available at: -- <https://github.com/snoyberg/conduit/blob/master/PROCESS.md>. --+-- Some utilities in this module require the threaded runtime because they use+-- 'System.Process.waitForProcess' internally.+-- -- Note that this is a very thin layer around the @Data.Streaming.Process@ module. In particular, it: -- -- * Provides orphan instances for conduit@@ -82,6 +85,8 @@ -- terminated. This behavior is different from 'sourceProcessWithStreams' due -- to historical reasons. --+-- Requires the threaded runtime.+-- -- Since 1.1.2 sourceProcessWithConsumer :: MonadIO m => CreateProcess@@ -97,6 +102,8 @@ -- | Like @sourceProcessWithConsumer@ but providing the command to be run as -- a @String@. --+-- Requires the threaded runtime.+-- -- Since 1.1.2 sourceCmdWithConsumer :: MonadIO m => String -- ^command@@ -120,6 +127,8 @@ -- IO is required because the streams are run concurrently -- using the <https://hackage.haskell.org/package/async async> package --+-- Requires the threaded runtime.+-- -- @since 1.1.12 sourceProcessWithStreams :: MonadUnliftIO m@@ -148,6 +157,8 @@ -- | Like @sourceProcessWithStreams@ but providing the command to be run as -- a @String@. --+-- Requires the threaded runtime.+-- -- @since 1.1.12 sourceCmdWithStreams :: MonadUnliftIO m@@ -160,6 +171,8 @@ -- | Same as 'withCheckedProcess', but kills the child process in the case of -- an exception being thrown by the provided callback function.+--+-- Requires the threaded runtime. -- -- @since 1.1.11 withCheckedProcessCleanup
conduit-extra.cabal view
@@ -1,5 +1,6 @@+Cabal-version: >=1.10 Name: conduit-extra-Version: 1.3.5+Version: 1.3.6 Synopsis: Batteries included conduit: adapters for common libraries. Description: The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit.@@ -9,7 +10,6 @@ Maintainer: michael@snoyman.com Category: Data, Conduit Build-type: Simple-Cabal-version: >=1.8 Homepage: http://github.com/snoyberg/conduit extra-source-files: test/random@@ -19,6 +19,7 @@ README.md Library+ default-language: Haskell2010 Exposed-modules: Data.Conduit.Attoparsec Data.Conduit.Binary Data.Conduit.ByteString.Builder@@ -38,7 +39,7 @@ -- These architectures are able to perform unaligned memory accesses cpp-options: -DALLOW_UNALIGNED_ACCESS - Build-depends: base >= 4.9 && < 5+ Build-depends: base >= 4.12 && < 5 , conduit >= 1.3 && < 1.4 , bytestring >= 0.10.2@@ -62,6 +63,7 @@ test-suite test hs-source-dirs: test+ default-language: Haskell2010 main-is: Spec.hs type: exitcode-stdio-1.0 ghc-options: -threaded@@ -73,7 +75,6 @@ , async , attoparsec- , bytestring-builder , bytestring , exceptions , process@@ -86,6 +87,7 @@ , transformers-base , directory , filepath+ build-tool-depends: hspec-discover:hspec-discover ghc-options: -Wall if os(windows) cpp-options: -DWINDOWS@@ -102,6 +104,7 @@ Data.Conduit.ZlibSpec benchmark blaze+ default-language: Haskell2010 type: exitcode-stdio-1.0 hs-source-dirs: bench build-depends: base@@ -109,7 +112,6 @@ , conduit-extra , gauge , bytestring- , bytestring-builder , transformers main-is: blaze.hs ghc-options: -Wall -O2 -rtsopts