eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix stylistic issues

Browse source
This commit is contained in:
Oleg Grenrus 2017-01-19 00:41:18 +02:00
parent 2caabad61a
commit d4fe0e582a
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servant-server/src/Servant/Server/Internal/RoutingApplication.hs
View file

@ -53,7 +53,6 @@ instance Monad RouteResult where
newtype RouteResultT m a = RouteResultT { runRouteResultT :: m (RouteResult a) } newtype RouteResultT m a = RouteResultT { runRouteResultT :: m (RouteResult a) }
deriving (Functor) deriving (Functor)
-- As we write these instances, we get instances for `DelayedIO` with GND.
instance MonadTrans RouteResultT where instance MonadTrans RouteResultT where
lift = RouteResultT . liftM Route lift = RouteResultT . liftM Route
@ -89,8 +88,6 @@ instance MonadTransControl RouteResultT where
instance MonadThrow m => MonadThrow (RouteResultT m) where instance MonadThrow m => MonadThrow (RouteResultT m) where
throwM = lift . throwM throwM = lift . throwM
-- instance MonadCatch m => MonadCatch (RouteResultT m) where
-- instance MonadError ServantErr (RouteResultT m) where
toApplication :: RoutingApplication -> Application toApplication :: RoutingApplication -> Application
toApplication ra request respond = ra request routingRespond toApplication ra request respond = ra request routingRespond
@ -189,8 +186,8 @@ newtype DelayedIO a = DelayedIO { runDelayedIO' :: ReaderT Request (ResourceT (R
, MonadResource , MonadResource
) )
returnRouteResult :: RouteResult a -> DelayedIO a liftRouteResult :: RouteResult a -> DelayedIO a
returnRouteResult x = DelayedIO $ lift . lift $ RouteResultT . return $ x liftRouteResult x = DelayedIO $ lift . lift $ RouteResultT . return $ x
instance MonadBaseControl IO DelayedIO where instance MonadBaseControl IO DelayedIO where
type StM DelayedIO a = StM (ReaderT Request (ResourceT (RouteResultT IO))) a type StM DelayedIO a = StM (ReaderT Request (ResourceT (RouteResultT IO))) a
@ -209,11 +206,11 @@ emptyDelayed result =
-- | Fail with the option to recover. -- | Fail with the option to recover.
delayedFail :: ServantErr -> DelayedIO a delayedFail :: ServantErr -> DelayedIO a
delayedFail err = returnRouteResult $ Fail err delayedFail err = liftRouteResult $ Fail err
-- | Fail fatally, i.e., without any option to recover. -- | Fail fatally, i.e., without any option to recover.
delayedFailFatal :: ServantErr -> DelayedIO a delayedFailFatal :: ServantErr -> DelayedIO a
delayedFailFatal err = returnRouteResult $ FailFatal err delayedFailFatal err = liftRouteResult $ FailFatal err
-- | Gain access to the incoming request. -- | Gain access to the incoming request.
withRequest :: (Request -> DelayedIO a) -> DelayedIO a withRequest :: (Request -> DelayedIO a) -> DelayedIO a
@ -311,7 +308,7 @@ runDelayed Delayed{..} env req =
a <- authD a <- authD
b <- bodyD b <- bodyD
r <- ask r <- ask
returnRouteResult (serverD c a b r) liftRouteResult (serverD c a b r)
) )
req req