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

Make everyting compile again

Browse source
This commit is contained in:
Sasa Bogicevic 2018-07-06 17:10:15 +02:00
parent 5b13ff4ba3
commit 465e0b8f10
No known key found for this signature in database
GPG key ID: FB17B988AAEEB39E
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servant-server/example/greet.hs
View file

@ -6,7 +6,6 @@
{-# LANGUAGE TypeOperators #-}
import Data.Aeson
import Data.Monoid
import Data.Proxy
import Data.Text
import GHC.Generics

21
servant-server/src/Servant/Server.hs
View file

@ -10,8 +10,6 @@ module Servant.Server
( -- * Run a wai application from an API
serve
, serveWithContext
, fullyEvalResponse
, noEvalResponse
, -- * Construct a wai Application from an API
toApplication
@ -128,24 +126,13 @@ import Servant.Server.Internal
-- > main :: IO ()
-- > main = Network.Wai.Handler.Warp.run 8080 app
--
serve :: (HasServer api '[]) => Proxy api -> Server api -> Application
serve p = serveWithContext p EmptyContext
serve :: (HasServer api '[Bool]) => Proxy api -> Server api -> Application
serve p = serveWithContext p noEvalResponse
serveWithContext :: (HasServer api context, HasContextEntry context Bool)
serveWithContext :: (HasServer api context)
=> Proxy api -> Context context -> Server api -> Application
serveWithContext p context server =
toApplication
((getContextEntry context :: Bool) || False)
-- ^ determins if we should fully evaluate response
-- defaults to False
(runRouter (route p context (emptyDelayed (Route server))))
fullyEvalResponse :: Context '[Bool]
fullyEvalResponse = True :. EmptyContext
noEvalResponse :: Context '[Bool]
noEvalResponse = False :. EmptyContext
toApplication True (runRouter (route p context (emptyDelayed (Route server))))
-- | Hoist server implementation.
--