git.iko.soy/typeable/servant
on master help sign in
Rename emptyAPIServer to emptyServer
commitf5d9983381b96ee1ce03e97e3e1d4982e1c92972 authorDavid Turner <dave.c.turner@gmail.com> dateTue 16 May 2017, 15:59 (9 years ago) parent6feb27e
7 files changed+9−10
compare with master
unifiedsplit
doc/tutorial/Docs.lhs+1−1 doc/tutorial/Javascript.lhs+1−1 doc/tutorial/Server.lhs+1−1 servant-client/test/Servant/ClientSpec.hs+1−2 servant-server/src/Servant/Server.hs+1−1 servant-server/src/Servant/Server/Internal.hs+2−2 servant-server/test/Servant/ServerSpec.hs+2−2
doc/tutorial/Docs.lhs+1−1
@@ -221,7 +221,7 @@ api :: Proxy DocsAPI
221221api = Proxy
222222
223223server :: Server DocsAPI
224−server = (Server.server3 :<|> emptyAPIServer) :<|> Tagged serveDocs where
224+server = (Server.server3 :<|> emptyServer) :<|> Tagged serveDocs where
225225 serveDocs _ respond =
226226 respond $ responseLBS ok200 [plain] docsBS
227227 plain = ("Content-Type", "text/plain")
doc/tutorial/Javascript.lhs+1−1
@@ -134,7 +134,7 @@ api' = Proxy
134134server :: Server API
135135server = randomPoint
136136 :<|> searchBook
137− :<|> emptyAPIServer
137+ :<|> emptyServer
138138
139139server' :: Server API'
140140server' = server
doc/tutorial/Server.lhs+1−1
@@ -1026,7 +1026,7 @@ TODO prose
10261026type CombinedAPI2 = API :<|> EmptyAPI
10271027
10281028server11 :: Server CombinedAPI2
1029−server11 = server3 :<|> emptyAPIServer
1029+server11 = server3 :<|> emptyServer
10301030```
10311031
10321032## Using another monad for your handlers
servant-client/test/Servant/ClientSpec.hs+1−2
@@ -166,8 +166,7 @@ server = serve api (
166166 :<|> (\ a b c d -> return (a, b, c, d))
167167 :<|> (return $ addHeader 1729 $ addHeader "eg2" True)
168168 :<|> return NoContent
169− :<|> emptyAPIServer
170− )
169+ :<|> emptyServer)
171170
172171
173172type FailApi =
servant-server/src/Servant/Server.hs+1−1
@@ -18,7 +18,7 @@ module Servant.Server
1818 HasServer(..)
1919 , Server
2020 , EmptyServer
21− , emptyAPIServer
21+ , emptyServer
2222 , Handler (..)
2323 , runHandler
2424
servant-server/src/Servant/Server/Internal.hs+2−2
@@ -536,8 +536,8 @@ instance HasServer api context => HasServer (HttpVersion :> api) context where
536536data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
537537
538538-- | Server for `EmptyAPI`
539−emptyAPIServer :: Server EmptyAPI
540−emptyAPIServer = Tagged EmptyServer
539+emptyServer :: Server EmptyAPI
540+emptyServer = Tagged EmptyServer
541541
542542-- | The server for an `EmptyAPI` is `emptyAPIServer`.
543543--
servant-server/test/Servant/ServerSpec.hs+2−2
@@ -49,7 +49,7 @@ import Servant.API ((:<|>) (..), (:>), AuthProtect,
4949import Servant.API.Internal.Test.ComprehensiveAPI
5050import Servant.Server (Server, Handler, Tagged (..), err401, err403,
5151 err404, serve, serveWithContext,
52− Context((:.), EmptyContext), emptyAPIServer)
52+ Context((:.), EmptyContext), emptyServer)
5353import Test.Hspec (Spec, context, describe, it,
5454 shouldBe, shouldContain)
5555import qualified Test.Hspec.Wai as THW
@@ -618,7 +618,7 @@ miscServ :: Server MiscCombinatorsAPI
618618miscServ = versionHandler
619619 :<|> secureHandler
620620 :<|> hostHandler
621− :<|> emptyAPIServer
621+ :<|> emptyServer
622622
623623 where versionHandler = return . show
624624 secureHandler Secure = return "secure"