git.iko.soy/typeable/servant-reflex
on master help sign in
Merge pull request #1 from 3noch/master
58922ddDoug Beardsley
.gitmodules−3
compare with master
unifiedsplit
@@ -1,9 +1,6 @@
1[submodule "deps/reflex-dom-contrib"]
1[submodule "deps/reflex-dom-contrib"]
2 path = deps/reflex-dom-contrib
2 path = deps/reflex-dom-contrib
3 url = git@github.com:reflex-frp/reflex-dom-contrib.git
3 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
7[submodule "deps/servant-snap"]
4[submodule "deps/servant-snap"]
8 path = deps/servant-snap
5 path = deps/servant-snap
9 url = https://github.com/haskell-servant/servant-snap
6 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
3Synopsis: Servant reflex API generator
3Synopsis: Servant reflex API generator
4Description: Servant reflex API generator
4Description: Servant reflex API generator
5License: AllRightsReserved
5License: AllRightsReserved
6−License-file: LICENSE
6+License-file: LICENSE.md
7Author: Doug Beardsley
7Author: Doug Beardsley
8Maintainer: mightybyte@gmail.com
8Maintainer: mightybyte@gmail.com
9Stability: Experimental
9Stability: Experimental
@@ -12,10 +12,10 @@ Build-type: Simple
12Cabal-version: >=1.8
12Cabal-version: >=1.8
13
13
14library
14library
15− exposed-modules:
15+ exposed-modules:
16 Servant.Reflex
16 Servant.Reflex
17
17
18− other-modules:
18+ other-modules:
19 Servant.Common.BaseUrl
19 Servant.Common.BaseUrl
20 Servant.Common.Req
20 Servant.Common.Req
21
21
@@ -53,4 +53,3 @@ executable example
53 main-is: Example.hs
53 main-is: Example.hs
54 other-modules: API
54 other-modules: API
55 hs-source-dirs: exec
55 hs-source-dirs: exec
56−
src/Servant/Reflex.hs+3−3
@@ -159,7 +159,7 @@ instance {-# OVERLAPPING #-}
159-- -- ExceptT ServantError IO (Headers ls NoContent)
159-- -- ExceptT ServantError IO (Headers ls NoContent)
160-- clientWithRoute Proxy req baseurl = do
160-- clientWithRoute Proxy req baseurl = do
161-- let method = reflectMethod (Proxy :: Proxy method)
161-- let method = reflectMethod (Proxy :: Proxy method)
162−-- hdrs <- performRequestNoBody method req baseurl
162+-- hdrs <- performRequestNoBody method req baseurl
163-- return $ Headers { getResponse = NoContent
163-- return $ Headers { getResponse = NoContent
164-- , getHeadersHList = buildHeadersTo hdrs
164-- , getHeadersHList = buildHeadersTo hdrs
165-- }
165-- }
@@ -410,9 +410,9 @@ instance HasClient t m api => HasClient t m (IsSecure :> api) where
410 clientWithRoute (Proxy :: Proxy api) q req baseurl
410 clientWithRoute (Proxy :: Proxy api) q req baseurl
411
411
412instance HasClient t m subapi =>
412instance HasClient t m subapi =>
413− HasClient t m (WithNamedConfig name config subapi) where
413+ HasClient t m (WithNamedContext name config subapi) where
414
414
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
416 clientWithRoute Proxy q = clientWithRoute (Proxy :: Proxy subapi) q
416 clientWithRoute Proxy q = clientWithRoute (Proxy :: Proxy subapi) q
417
417
418
418