preamble 0.0.21 → 0.0.22

raw patch · 4 files changed

+12/−20 lines, 4 files

Files

• preamble.cabal +1/−1
• src/Preamble/Types/Alias.hs +1/−18
• src/Preamble/Types/Ctx.hs +3/−1
• src/Preamble/Types/Trans.hs +7/−0

@@ -1,5 +1,5 @@ name:                  preamble-version:               0.0.21+version:               0.0.22 synopsis:              Yet another prelude. description:           A prelude built on basic-prelude. homepage:              https://github.com/swift-nav/preamble

@@ -8,10 +8,8 @@   ( module Preamble.Types.Alias   ) where -import Control.Monad.Catch+ import Control.Monad.Logger-import Control.Monad.Trans.Control-import Control.Monad.Trans.Resource import Data.Aeson import Preamble.Prelude @@ -22,18 +20,3 @@ -- | Trace -- type Trace = Loc -> LogSource -> LogLevel -> LogStr -> IO ()---- | MonadControl----type MonadControl m =-  ( MonadBaseControl IO m-  , MonadIO m-  , MonadMask m-  )---- | MonadMain----type MonadMain m =-  ( MonadControl m-  , MonadResource m-  )

@@ -12,6 +12,7 @@ import Control.Monad.Catch import Control.Monad.Logger import Control.Monad.Reader+import Control.Monad.Trans.Resource import Preamble.Prelude import Preamble.Types.Alias @@ -29,7 +30,8 @@ $(makeClassy ''Ctx)  type MonadCtx c m =-  ( MonadMain m+  ( MonadIO m+  , MonadResource m   , MonadReader c m   , MonadLogger m   , MonadCatch m

@@ -29,11 +29,14 @@  instance MonadBase b m => MonadBase b (TransT c m) where   liftBase = liftBaseDefault+  {-# INLINE liftBase #-}  instance MonadBaseControl b m => MonadBaseControl b (TransT c m) where     type StM (TransT c m) a = ComposeSt (TransT c) m a     liftBaseWith = defaultLiftBaseWith+    {-# INLINE liftBaseWith #-}     restoreM = defaultRestoreM+    {-# INLINE restoreM #-}  instance MonadTransControl (TransT c) where   type StT (TransT c) a = StT (ReaderT c) a@@ -41,10 +44,14 @@     liftWith $ \g ->       liftWith $ \h ->         f (h . g . unTransT)+  {-# INLINE liftWith #-}   restoreT = TransT . restoreT . restoreT+  {-# INLINE restoreT #-}  instance MonadTrans (TransT c) where   lift = TransT . lift . lift+  {-# INLINE lift #-}  instance MonadResource m => MonadResource (TransT c m) where   liftResourceT = lift . liftResourceT+  {-# INLINE liftResourceT #-}