From 0f4c73bffe1973c752cc8021fe178e0921a99c23 Mon Sep 17 00:00:00 2001 From: Timo von Holtz Date: Wed, 27 May 2015 11:29:08 +1000 Subject: [PATCH] Make safeLink safer (#92) --- servant/src/Servant/Utils/Links.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servant/src/Servant/Utils/Links.hs b/servant/src/Servant/Utils/Links.hs index 8b9537af..a217e20d 100644 --- a/servant/src/Servant/Utils/Links.hs +++ b/servant/src/Servant/Utils/Links.hs @@ -72,8 +72,7 @@ -- -- >>> let bad_link = Proxy :: Proxy ("hello" :> Delete '[JSON] ()) -- >>> safeLink api bad_link --- --- :64:1: +-- ... -- Could not deduce (Or -- (IsElem' (Delete '[JSON] ()) (Get '[JSON] Int)) -- (IsElem' @@ -168,7 +167,8 @@ type family IsElem endpoint api :: Constraint where IsElem (e :> sa) (e :> sb) = IsElem sa sb IsElem sa (Header x :> sb) = IsElem sa sb IsElem sa (ReqBody y x :> sb) = IsElem sa sb - IsElem (e :> sa) (Capture x y :> sb) = IsElem sa sb + IsElem (Capture z y :> sa) (Capture x y :> sb) + = IsElem sa sb IsElem sa (QueryParam x y :> sb) = IsElem sa sb IsElem sa (QueryParams x y :> sb) = IsElem sa sb IsElem sa (QueryFlag x :> sb) = IsElem sa sb