git.iko.soy/typeable/servant-reflex
on master help sign in
Merge pull request #1 from 3noch/master

Updates for official servant 0.5 release

commit58922dd1299566304c18b14d06475d1e36c4bb9c authorDoug Beardsley <mightybyte@gmail.com> dateSat 26 Mar 2016, 01:56 (11 years ago) parent1c0ec5e9ef1919
5 files changed+6−11
compare with master
unifiedsplit
.gitmodules−3 LICENSE.md deps/servant−1 servant-reflex.cabal+3−4 src/Servant/Reflex.hs+3−3
.gitmodules−3
@@ -1,9 +1,6 @@
11[submodule "deps/reflex-dom-contrib"]
22 path = deps/reflex-dom-contrib
33 url = git@github.com:reflex-frp/reflex-dom-contrib.git
4−[submodule "deps/servant"]
5− path = deps/servant
6− url = https://github.com/haskell-servant/servant.git
74[submodule "deps/servant-snap"]
85 path = deps/servant-snap
96 url = https://github.com/haskell-servant/servant-snap
LICENSE.mdnew file

No changes to the content.

deps/servantdeleted−1

Submodule changed.

servant-reflex.cabal+3−4
@@ -3,7 +3,7 @@ Version: 0.1
33Synopsis: Servant reflex API generator
44Description: Servant reflex API generator
55License: AllRightsReserved
6−License-file: LICENSE
6+License-file: LICENSE.md
77Author: Doug Beardsley
88Maintainer: mightybyte@gmail.com
99Stability: Experimental
@@ -12,10 +12,10 @@ Build-type: Simple
1212Cabal-version: >=1.8
1313
1414library
15− exposed-modules:
15+ exposed-modules:
1616 Servant.Reflex
1717
18− other-modules:
18+ other-modules:
1919 Servant.Common.BaseUrl
2020 Servant.Common.Req
2121
@@ -53,4 +53,3 @@ executable example
5353 main-is: Example.hs
5454 other-modules: API
5555 hs-source-dirs: exec
56−
src/Servant/Reflex.hs+3−3
@@ -159,7 +159,7 @@ instance {-# OVERLAPPING #-}
159159-- -- ExceptT ServantError IO (Headers ls NoContent)
160160-- clientWithRoute Proxy req baseurl = do
161161-- let method = reflectMethod (Proxy :: Proxy method)
162−-- hdrs <- performRequestNoBody method req baseurl
162+-- hdrs <- performRequestNoBody method req baseurl
163163-- return $ Headers { getResponse = NoContent
164164-- , getHeadersHList = buildHeadersTo hdrs
165165-- }
@@ -410,9 +410,9 @@ instance HasClient t m api => HasClient t m (IsSecure :> api) where
410410 clientWithRoute (Proxy :: Proxy api) q req baseurl
411411
412412instance HasClient t m subapi =>
413− HasClient t m (WithNamedConfig name config subapi) where
413+ HasClient t m (WithNamedContext name config subapi) where
414414
415− type Client t m (WithNamedConfig name config subapi) = Client t m subapi
415+ type Client t m (WithNamedContext name config subapi) = Client t m subapi
416416 clientWithRoute Proxy q = clientWithRoute (Proxy :: Proxy subapi) q
417417
418418