7d91e50 · servant · git.iko.soy

git.iko.soy/servant

Correct ReqBody instance for link generation. Was partially applied

commit7d91e50fc76b8f74d7304121ec79afb0c99016a4 authorChristian Marie <christian@ponies.io> dateTue 17 Mar 2015, 12:10 (12 years ago) parent47a30c6

2 files changed+4−4

unifiedsplit

src/Servant/Utils/Links.hs+3−3

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

159159type family IsElem endpoint api :: Constraint where

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

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

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

162+ IsElem sa (Header x :> sb) = IsElem sa sb

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

164164 IsElem (e :> sa) (Capture x y :> sb) = IsElem sa sb

165165 IsElem sa (QueryParam x y :> sb) = IsElem sa sb

@@ -320,8 +320,8 @@ instance (KnownSymbol sym, HasLink sub)

320320 k = symbolVal (Proxy :: Proxy sym)

321321

322322-- Misc instances

323−instance HasLink sub => HasLink (ReqBody a :> sub) where

324− type MkLink (ReqBody a :> sub) = MkLink sub

323+instance HasLink sub => HasLink (ReqBody ct a :> sub) where

324+ type MkLink (ReqBody ct a :> sub) = MkLink sub

325325 toLink _ = toLink (Proxy :: Proxy sub)

326326

327327instance (ToText v, HasLink sub)

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

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

2929 :<|> "raw" :> Raw

3030

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

32−type TestLink2 = "greet" :> Post '[PlainText] Bool

32+type TestLink2 = "greet" :> ReqBody '[JSON] [Int] :> Post '[PlainText] Bool

3333type TestLink3 = "parent" :> "child" :> Get '[JSON] String

3434

3535type BadTestLink = "hallo" :> "hi" :> Get '[JSON] Bool