git.iko.soy/typeable/servant
on master help sign in
Adopt http-types-0.10
commit6ff70e2cdf05bedbc27f3305b923c02a4cbfba4f authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 23 Oct 2017, 08:04 (9 years ago) parent85929ab
2 files changed+12−4
compare with master
unifiedsplit
servant-server/servant-server.cabal+1−2 servant-server/test/Servant/ServerSpec.hs+11−2
servant-server/servant-server.cabal+1−2
@@ -1,6 +1,5 @@
11name: servant-server
2−version: 0.11
3−x-revision: 2
2+version: 0.11.0.1
43synopsis: A family of combinators for defining webservices APIs and serving them
54description:
65 A family of combinators for defining webservices APIs and serving them
servant-server/test/Servant/ServerSpec.hs+11−2
@@ -28,7 +28,11 @@ import Network.HTTP.Types (Status (..), hAccept, hContentType,
2828 methodDelete, methodGet,
2929 methodHead, methodPatch,
3030 methodPost, methodPut, ok200,
31+#if MIN_VERSION_http_types(0,10,0)
32+ imATeapot418,
33+#else
3134 imATeaPot418,
35+#endif
3236 parseQuery)
3337import Network.Wai (Application, Request, requestHeaders, pathInfo,
3438 queryString, rawQueryString,
@@ -65,6 +69,11 @@ import Servant.Server.Experimental.Auth
6569import Servant.Server.Internal.Context
6670 (NamedContext(..))
6771
72+#if !MIN_VERSION_http_types(0,10,0)
73+imATeapot418 :: Status
74+imATeapot418 = imATeaPot418
75+#endif
76+
6877-- * comprehensive api test
6978
7079-- This declaration simply checks that all instances are in place.
@@ -657,7 +666,7 @@ basicAuthApi = Proxy
657666basicAuthServer :: Server BasicAuthAPI
658667basicAuthServer =
659668 const (return jerry) :<|>
660− (Tagged $ \ _ respond -> respond $ responseLBS imATeaPot418 [] "")
669+ (Tagged $ \ _ respond -> respond $ responseLBS imATeapot418 [] "")
661670
662671basicAuthContext :: Context '[ BasicAuthCheck () ]
663672basicAuthContext =
@@ -702,7 +711,7 @@ genAuthApi = Proxy
702711
703712genAuthServer :: Server GenAuthAPI
704713genAuthServer = const (return tweety)
705− :<|> (Tagged $ \ _ respond -> respond $ responseLBS imATeaPot418 [] "")
714+ :<|> (Tagged $ \ _ respond -> respond $ responseLBS imATeapot418 [] "")
706715
707716type instance AuthServerData (AuthProtect "auth") = ()
708717