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

Rename emptyAPIServer to emptyServer

Browse source
This commit is contained in:
David Turner 2017-05-16 15:59:41 +00:00
parent 6feb27e7b2
commit f5d9983381
7 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/tutorial/Docs.lhs
View file

@ -221,7 +221,7 @@ api :: Proxy DocsAPI
api = Proxy api = Proxy
server :: Server DocsAPI server :: Server DocsAPI
server = (Server.server3 :<|> emptyAPIServer) :<|> Tagged serveDocs where server = (Server.server3 :<|> emptyServer) :<|> Tagged serveDocs where
serveDocs _ respond = serveDocs _ respond =
respond $ responseLBS ok200 [plain] docsBS respond $ responseLBS ok200 [plain] docsBS
plain = ("Content-Type", "text/plain") plain = ("Content-Type", "text/plain")

2
doc/tutorial/Javascript.lhs
View file

@ -134,7 +134,7 @@ api' = Proxy
server :: Server API server :: Server API
server = randomPoint server = randomPoint
:<|> searchBook :<|> searchBook
:<|> emptyAPIServer :<|> emptyServer
server' :: Server API' server' :: Server API'
server' = server server' = server

2
doc/tutorial/Server.lhs
View file

@ -1026,7 +1026,7 @@ TODO prose
type CombinedAPI2 = API :<|> EmptyAPI type CombinedAPI2 = API :<|> EmptyAPI
server11 :: Server CombinedAPI2 server11 :: Server CombinedAPI2
server11 = server3 :<|> emptyAPIServer server11 = server3 :<|> emptyServer
``` ```
## Using another monad for your handlers ## Using another monad for your handlers

3
servant-client/test/Servant/ClientSpec.hs
View file

@ -166,8 +166,7 @@ server = serve api (
:<|> (\ a b c d -> return (a, b, c, d)) :<|> (\ a b c d -> return (a, b, c, d))
:<|> (return $ addHeader 1729 $ addHeader "eg2" True) :<|> (return $ addHeader 1729 $ addHeader "eg2" True)
:<|> return NoContent :<|> return NoContent
:<|> emptyAPIServer :<|> emptyServer)
)
type FailApi = type FailApi =

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

@ -18,7 +18,7 @@ module Servant.Server
HasServer(..) HasServer(..)
, Server , Server
, EmptyServer , EmptyServer
, emptyAPIServer , emptyServer
, Handler (..) , Handler (..)
, runHandler , runHandler

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

@ -536,8 +536,8 @@ instance HasServer api context => HasServer (HttpVersion :> api) context where
data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum) data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
-- | Server for `EmptyAPI` -- | Server for `EmptyAPI`
emptyAPIServer :: Server EmptyAPI emptyServer :: Server EmptyAPI
emptyAPIServer = Tagged EmptyServer emptyServer = Tagged EmptyServer
-- | The server for an `EmptyAPI` is `emptyAPIServer`. -- | The server for an `EmptyAPI` is `emptyAPIServer`.
-- --

4
servant-server/test/Servant/ServerSpec.hs
View file

@ -49,7 +49,7 @@ import Servant.API ((:<|>) (..), (:>), AuthProtect,
import Servant.API.Internal.Test.ComprehensiveAPI import Servant.API.Internal.Test.ComprehensiveAPI
import Servant.Server (Server, Handler, Tagged (..), err401, err403, import Servant.Server (Server, Handler, Tagged (..), err401, err403,
err404, serve, serveWithContext, err404, serve, serveWithContext,
Context((:.), EmptyContext), emptyAPIServer) Context((:.), EmptyContext), emptyServer)
import Test.Hspec (Spec, context, describe, it, import Test.Hspec (Spec, context, describe, it,
shouldBe, shouldContain) shouldBe, shouldContain)
import qualified Test.Hspec.Wai as THW import qualified Test.Hspec.Wai as THW
@ -618,7 +618,7 @@ miscServ :: Server MiscCombinatorsAPI
miscServ = versionHandler miscServ = versionHandler
:<|> secureHandler :<|> secureHandler
:<|> hostHandler :<|> hostHandler
:<|> emptyAPIServer :<|> emptyServer
where versionHandler = return . show where versionHandler = return . show
secureHandler Secure = return "secure" secureHandler Secure = return "secure"