git.iko.soy/servant
on master help sign in
Rename emptyAPIServer to emptyServer
f5d9983David Turner
doc/tutorial/Docs.lhs+1−1
compare with master
unifiedsplit
@@ -221,7 +221,7 @@ api :: Proxy DocsAPI
221api = Proxy
221api = Proxy
222
222
223server :: Server DocsAPI
223server :: Server DocsAPI
224−server = (Server.server3 :<|> emptyAPIServer) :<|> Tagged serveDocs where
224+server = (Server.server3 :<|> emptyServer) :<|> Tagged serveDocs where
225 serveDocs _ respond =
225 serveDocs _ respond =
226 respond $ responseLBS ok200 [plain] docsBS
226 respond $ responseLBS ok200 [plain] docsBS
227 plain = ("Content-Type", "text/plain")
227 plain = ("Content-Type", "text/plain")
doc/tutorial/Javascript.lhs+1−1
@@ -134,7 +134,7 @@ api' = Proxy
134server :: Server API
134server :: Server API
135server = randomPoint
135server = randomPoint
136 :<|> searchBook
136 :<|> searchBook
137− :<|> emptyAPIServer
137+ :<|> emptyServer
138
138
139server' :: Server API'
139server' :: Server API'
140server' = server
140server' = server
doc/tutorial/Server.lhs+1−1
@@ -1026,7 +1026,7 @@ TODO prose
1026type CombinedAPI2 = API :<|> EmptyAPI
1026type CombinedAPI2 = API :<|> EmptyAPI
1027
1027
1028server11 :: Server CombinedAPI2
1028server11 :: Server CombinedAPI2
1029−server11 = server3 :<|> emptyAPIServer
1029+server11 = server3 :<|> emptyServer
1030```
1030```
1031
1031
1032## Using another monad for your handlers
1032## Using another monad for your handlers
servant-client/test/Servant/ClientSpec.hs+1−2
@@ -166,8 +166,7 @@ server = serve api (
166 :<|> (\ a b c d -> return (a, b, c, d))
166 :<|> (\ a b c d -> return (a, b, c, d))
167 :<|> (return $ addHeader 1729 $ addHeader "eg2" True)
167 :<|> (return $ addHeader 1729 $ addHeader "eg2" True)
168 :<|> return NoContent
168 :<|> return NoContent
169− :<|> emptyAPIServer
169+ :<|> emptyServer)
170− )
171
170
172
171
173type FailApi =
172type FailApi =
servant-server/src/Servant/Server.hs+1−1
@@ -18,7 +18,7 @@ module Servant.Server
18 HasServer(..)
18 HasServer(..)
19 , Server
19 , Server
20 , EmptyServer
20 , EmptyServer
21− , emptyAPIServer
21+ , emptyServer
22 , Handler (..)
22 , Handler (..)
23 , runHandler
23 , runHandler
24
24
servant-server/src/Servant/Server/Internal.hs+2−2
@@ -536,8 +536,8 @@ instance HasServer api context => HasServer (HttpVersion :> api) context where
536data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
536data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
537
537
538-- | Server for `EmptyAPI`
538-- | Server for `EmptyAPI`
539−emptyAPIServer :: Server EmptyAPI
539+emptyServer :: Server EmptyAPI
540−emptyAPIServer = Tagged EmptyServer
540+emptyServer = Tagged EmptyServer
541
541
542-- | The server for an `EmptyAPI` is `emptyAPIServer`.
542-- | The server for an `EmptyAPI` is `emptyAPIServer`.
543--
543--
servant-server/test/Servant/ServerSpec.hs+2−2
@@ -49,7 +49,7 @@ import Servant.API ((:<|>) (..), (:>), AuthProtect,
49import Servant.API.Internal.Test.ComprehensiveAPI
49import Servant.API.Internal.Test.ComprehensiveAPI
50import Servant.Server (Server, Handler, Tagged (..), err401, err403,
50import Servant.Server (Server, Handler, Tagged (..), err401, err403,
51 err404, serve, serveWithContext,
51 err404, serve, serveWithContext,
52− Context((:.), EmptyContext), emptyAPIServer)
52+ Context((:.), EmptyContext), emptyServer)
53import Test.Hspec (Spec, context, describe, it,
53import Test.Hspec (Spec, context, describe, it,
54 shouldBe, shouldContain)
54 shouldBe, shouldContain)
55import qualified Test.Hspec.Wai as THW
55import qualified Test.Hspec.Wai as THW
@@ -618,7 +618,7 @@ miscServ :: Server MiscCombinatorsAPI
618miscServ = versionHandler
618miscServ = versionHandler
619 :<|> secureHandler
619 :<|> secureHandler
620 :<|> hostHandler
620 :<|> hostHandler
621− :<|> emptyAPIServer
621+ :<|> emptyServer
622
622
623 where versionHandler = return . show
623 where versionHandler = return . show
624 secureHandler Secure = return "secure"
624 secureHandler Secure = return "secure"