git.iko.soy/typeable/katip
on master help sign in
Merge pull request #121 from JackKelly-Bellroy/monadresource
b583d85Michael Xavier
katip/src/Katip/Core.hs+4−2
compare with master
unifiedsplit
@@ -44,7 +44,8 @@ import Control.Monad.Trans.Either
44import Control.Monad.Trans.Except
44import Control.Monad.Trans.Except
45import Control.Monad.Trans.Maybe
45import Control.Monad.Trans.Maybe
46import Control.Monad.Trans.Reader
46import Control.Monad.Trans.Reader
47−import Control.Monad.Trans.Resource (ResourceT, transResourceT)
47+import Control.Monad.Trans.Resource (MonadResource, ResourceT,
48+ transResourceT)
48import Control.Monad.Trans.RWS.Lazy (RWST, mapRWST)
49import Control.Monad.Trans.RWS.Lazy (RWST, mapRWST)
49import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
50import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
50import Control.Monad.Trans.State.Lazy (StateT, mapStateT)
51import Control.Monad.Trans.State.Lazy (StateT, mapStateT)
@@ -879,7 +880,8 @@ instance (Katip m) => Katip (ResourceT m) where
879-- opposed to implementing 'Katip' for your monad.
880-- opposed to implementing 'Katip' for your monad.
880newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
881newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
881 deriving ( Functor, Applicative, Monad, MonadIO
882 deriving ( Functor, Applicative, Monad, MonadIO
882− , MonadMask, MonadCatch, MonadThrow, MonadTrans, MonadBase b)
883+ , MonadMask, MonadCatch, MonadThrow, MonadResource, MonadTrans
884+ , MonadBase b)
883
885
884
886
885instance MonadIO m => Katip (KatipT m) where
887instance MonadIO m => Katip (KatipT m) where
katip/src/Katip/Monadic.hs+3−1
@@ -58,7 +58,8 @@ import Control.Monad.Trans.Either (EitherT, mapEitherT)
58import Control.Monad.Trans.Except (ExceptT, mapExceptT)
58import Control.Monad.Trans.Except (ExceptT, mapExceptT)
59import Control.Monad.Trans.Identity (IdentityT, mapIdentityT)
59import Control.Monad.Trans.Identity (IdentityT, mapIdentityT)
60import Control.Monad.Trans.Maybe (MaybeT, mapMaybeT)
60import Control.Monad.Trans.Maybe (MaybeT, mapMaybeT)
61−import Control.Monad.Trans.Resource (ResourceT, transResourceT)
61+import Control.Monad.Trans.Resource (MonadResource,
62+ ResourceT, transResourceT)
62import Control.Monad.Trans.RWS (RWST, mapRWST)
63import Control.Monad.Trans.RWS (RWST, mapRWST)
63import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
64import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
64import qualified Control.Monad.Trans.State.Strict as Strict (StateT, mapStateT)
65import qualified Control.Monad.Trans.State.Strict as Strict (StateT, mapStateT)
@@ -349,6 +350,7 @@ newtype KatipContextT m a = KatipContextT {
349 , MonadWriter w
350 , MonadWriter w
350 , MonadError e
351 , MonadError e
351 , MonadPlus
352 , MonadPlus
353+ , MonadResource
352 , Alternative
354 , Alternative
353 , MonadFix
355 , MonadFix
354 , MonadTrans
356 , MonadTrans