File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed
servant-server/src/Servant/Server/Internal Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change
1
+ synopsis: Add MonadCatch and MonadMask instances to RouteResultT and DelayedIO
2
+ packages: servant-server
3
+ prs: #1830
4
+ issues: #1829
Original file line number Diff line number Diff line change 5
5
module Servant.Server.Internal.DelayedIO where
6
6
7
7
import Control.Monad.Base (MonadBase (.. ))
8
- import Control.Monad.Catch (MonadThrow (.. ), MonadCatch (.. ), MonadMask )
8
+ import Control.Monad.Catch (MonadCatch (.. ), MonadMask , MonadThrow (.. ))
9
9
import Control.Monad.Reader (MonadReader (.. ), ReaderT (.. ), runReaderT )
10
10
import Control.Monad.Trans (MonadIO (.. ), MonadTrans (.. ))
11
11
import Control.Monad.Trans.Control (MonadBaseControl (.. ))
@@ -30,12 +30,12 @@ newtype DelayedIO a = DelayedIO {runDelayedIO' :: ReaderT Request (ResourceT (Ro
30
30
( Applicative
31
31
, Functor
32
32
, Monad
33
+ , MonadCatch
33
34
, MonadIO
35
+ , MonadMask
34
36
, MonadReader Request
35
37
, MonadResource
36
38
, MonadThrow
37
- , MonadCatch
38
- , MonadMask
39
39
)
40
40
41
41
instance MonadBase IO DelayedIO where
@@ -55,7 +55,6 @@ instance MonadBaseControl IO DelayedIO where
55
55
runInBase (runInternalState (runReaderT (runDelayedIO' x) req) s)
56
56
restoreM = DelayedIO . lift . withInternalState . const . restoreM
57
57
58
-
59
58
runDelayedIO :: DelayedIO a -> Request -> ResourceT IO (RouteResult a )
60
59
runDelayedIO m req = transResourceT runRouteResultT $ runReaderT (runDelayedIO' m) req
61
60
You can’t perform that action at this time.
0 commit comments