git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1068 from cocreature/monadmask
56d95aeAlp Mestanogullari
servant-server/src/Servant/Server/Internal/Handler.hs+2−2
compare with master
unifiedsplit
@@ -11,7 +11,7 @@ import Prelude.Compat
11import Control.Monad.Base
11import Control.Monad.Base
12 (MonadBase (..))
12 (MonadBase (..))
13import Control.Monad.Catch
13import Control.Monad.Catch
14− (MonadCatch, MonadThrow)
14+ (MonadCatch, MonadMask, MonadThrow)
15import Control.Monad.Error.Class
15import Control.Monad.Error.Class
16 (MonadError)
16 (MonadError)
17import Control.Monad.IO.Class
17import Control.Monad.IO.Class
@@ -29,7 +29,7 @@ newtype Handler a = Handler { runHandler' :: ExceptT ServantErr IO a }
29 deriving
29 deriving
30 ( Functor, Applicative, Monad, MonadIO, Generic
30 ( Functor, Applicative, Monad, MonadIO, Generic
31 , MonadError ServantErr
31 , MonadError ServantErr
32− , MonadThrow, MonadCatch
32+ , MonadThrow, MonadCatch, MonadMask
33 )
33 )
34
34
35instance MonadBase IO Handler where
35instance MonadBase IO Handler where