710c560 · typeable/servant

git.iko.soy/typeable/servant

Merge pull request #160 from haskell-servant/jkarni/fix-is-elem-header

Fix IsElem for Header.

commit710c560de829ce69a699f10a0e9c40e5d5a0f37d authorAlp Mestanogullari <alpmestan@gmail.com> dateThu 23 Jul 2015, 13:50 (11 years ago) parentf7d25c5 29e3c1a

3 files changed+3−2

compare with master

unifiedsplit

servant/CHANGELOG.md+1 servant/src/Servant/Utils/Links.hs+1−1 servant/test/Servant/Utils/LinksSpec.hs+1−1

servant/CHANGELOG.md+1

@@ -2,6 +2,7 @@ HEAD

22----

44* Add `HttpVersion`, `IsSecure`, `RemoteHost` and `Vault` combinators

5+* Fix safeLink, so Header is not in fact required.

670.4.2

78-----

servant/src/Servant/Utils/Links.hs+1−1

@@ -166,7 +166,7 @@ type family IsElem' a s :: Constraint

166166type family IsElem endpoint api :: Constraint where

167167 IsElem e (sa :<|> sb) = Or (IsElem e sa) (IsElem e sb)

168168 IsElem (e :> sa) (e :> sb) = IsElem sa sb

169− IsElem sa (Header x :> sb) = IsElem sa sb

169+ IsElem sa (Header sym x :> sb) = IsElem sa sb

170170 IsElem sa (ReqBody y x :> sb) = IsElem sa sb

171171 IsElem (Capture z y :> sa) (Capture x y :> sb)

172172 = IsElem sa sb

servant/test/Servant/Utils/LinksSpec.hs+1−1

@@ -25,7 +25,7 @@ type TestApi =

2525 :<|> "get" :> Get '[JSON] ()

2626 :<|> "put" :> Put '[JSON] ()

2727 :<|> "post" :> ReqBody '[JSON] 'True :> Post '[JSON] ()

28− :<|> "delete" :> Header "ponies" :> Delete '[JSON] ()

28+ :<|> "delete" :> Header "ponies" String :> Delete '[JSON] ()

2929 :<|> "raw" :> Raw

3030

3131type TestLink = "hello" :> "hi" :> Get '[JSON] Bool