resourcet 1.1.5 → 1.1.6

raw patch · 6 files changed

+18/−32 lines, 6 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• ChangeLog.md +4/−0
• Control/Monad/Trans/Resource.hs +3/−16
• Control/Monad/Trans/Resource/Internal.hs +5/−15
• Data/Acquire.hs +4/−0
• Data/Acquire/Internal.hs +1/−0
• resourcet.cabal +1/−1

@@ -1,3 +1,7 @@+## 1.1.6++* Safe/Trustworthy for resourcet [#220](https://github.com/snoyberg/conduit/pull/220)+ ## 1.1.5  *  Add pass-through instances for Alternative and MonadPlus [#214](https://github.com/snoyberg/conduit/pull/214)

@@ -10,6 +10,9 @@ #if __GLASGOW_HASKELL__ >= 704 {-# LANGUAGE ConstraintKinds #-} #endif+#if __GLASGOW_HASKELL__ >= 707+{-# LANGUAGE Safe #-}+#endif -- | Allocate resources which are guaranteed to be released. -- -- For more information, see <https://www.fpcomplete.com/user/snoyberg/library-documentation/resourcet>.@@ -73,27 +76,11 @@ import Data.Monoid (Monoid) import qualified Control.Exception.Lifted as L -import Control.Monad.Trans.Identity ( IdentityT)-import Control.Monad.Trans.List     ( ListT    )-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  ) import Control.Monad.Trans.Resource.Internal-import Control.Monad.Trans.RWS      ( RWST     ) -import qualified Control.Monad.Trans.RWS.Strict    as Strict ( RWST   )-import qualified Control.Monad.Trans.State.Strict  as Strict ( StateT )-import qualified Control.Monad.Trans.Writer.Strict as Strict ( WriterT ) import Control.Concurrent (ThreadId, forkIO) -import Control.Monad.ST (ST)--import qualified Control.Monad.ST.Lazy as Lazy- import Data.Functor.Identity (Identity, runIdentity)-import Control.Monad.Morph import Control.Monad.Catch (MonadThrow, throwM) import Control.Monad.Catch.Pure (CatchT, runCatchT) import Data.Acquire.Internal (ReleaseType (..))

@@ -7,6 +7,11 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE RankNTypes #-}+-- Can only turn on SafeHaskell when using a newer GHC, otherwise we get build+-- failures due to the manual Typeable instance below.+#if __GLASGOW_HASKELL__ >= 707+{-# LANGUAGE Safe #-}+#endif  module Control.Monad.Trans.Resource.Internal(     InvalidAccess(..)@@ -55,7 +60,6 @@ import Control.Monad (liftM) #endif import qualified Control.Exception as E-import Control.Monad.ST (ST) import Control.Monad.Catch (MonadThrow (..), MonadCatch (..) #if MIN_VERSION_exceptions(0,6,0)     , MonadMask (..)@@ -69,20 +73,6 @@ import Data.Word(Word) import Prelude hiding (catch) import Data.Acquire.Internal (ReleaseType (..))--#if __GLASGOW_HASKELL__ >= 704-import Control.Monad.ST.Unsafe (unsafeIOToST)-#else-import Control.Monad.ST (unsafeIOToST)-#endif--#if __GLASGOW_HASKELL__ >= 704-import qualified Control.Monad.ST.Lazy.Unsafe as LazyUnsafe-#else-import qualified Control.Monad.ST.Lazy as LazyUnsafe-#endif--import qualified Control.Monad.ST.Lazy as Lazy  import Control.Monad.Morph 

@@ -1,3 +1,7 @@+{-# LANGUAGE CPP #-}+#if __GLASGOW_HASKELL__ >= 707+{-# LANGUAGE Safe #-}+#endif -- | This was previously known as the Resource monad. However, that term is -- confusing next to the ResourceT transformer, so it has been renamed. module Data.Acquire

@@ -4,6 +4,7 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE Trustworthy #-} module Data.Acquire.Internal     ( Acquire (..)     , Allocated (..)

@@ -1,5 +1,5 @@ Name:                resourcet-Version:             1.1.5+Version:             1.1.6 Synopsis:            Deterministic allocation and freeing of scarce resources. description:         Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/resourcet>. License:             BSD3