git.iko.soy/servant
on master help sign in
Merge pull request #629 from hamishmack/master
67c26cbJulian Arni
servant-client/src/Servant/Common/Req.hs+2−1
compare with master
unifiedsplit
@@ -12,7 +12,7 @@ import Prelude.Compat
12
12
13import Control.Exception
13import Control.Exception
14import Control.Monad
14import Control.Monad
15−import Control.Monad.Catch (MonadThrow)
15+import Control.Monad.Catch (MonadThrow, MonadCatch)
16
16
17#if MIN_VERSION_mtl(2,2,0)
17#if MIN_VERSION_mtl(2,2,0)
18import Control.Monad.Except (MonadError(..))
18import Control.Monad.Except (MonadError(..))
@@ -176,6 +176,7 @@ newtype ClientM a = ClientM { runClientM' :: ReaderT ClientEnv (ExceptT ServantE
176 deriving ( Functor, Applicative, Monad, MonadIO, Generic
176 deriving ( Functor, Applicative, Monad, MonadIO, Generic
177 , MonadReader ClientEnv
177 , MonadReader ClientEnv
178 , MonadError ServantError
178 , MonadError ServantError
179+ , MonadThrow, MonadCatch
179 )
180 )
180
181
181runClientM :: ClientM a -> ClientEnv -> IO (Either ServantError a)
182runClientM :: ClientM a -> ClientEnv -> IO (Either ServantError a)