710c560 · typeable/servant

servant/CHANGELOG.md+1

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

2----

3

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

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

5

6

60.4.2

70.4.2

7-----

8-----

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

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

166type family IsElem endpoint api :: Constraint where

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

168 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

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

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

172 = IsElem sa sb

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

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

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

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

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

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

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

29 :<|> "raw" :> Raw

30

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