From 939a008b676aa9e433a9737751fb68af268dbe5a Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 3 Jun 2015 06:53:34 -0400 Subject: [PATCH 1/2] Bump aeson bound --- servant-server/servant-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index c0a07c3b..0bfba00a 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -40,7 +40,7 @@ library Servant.Utils.StaticFiles build-depends: base >= 4.7 && < 5 - , aeson >= 0.7 && < 0.9 + , aeson >= 0.7 && < 0.10 , attoparsec >= 0.12 && < 0.14 , bytestring >= 0.10 && < 0.11 , either >= 4.3 && < 4.5 From 74a52df1a1e837d5f9f7e74db2eaa33bed76303e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 3 Jun 2015 07:13:49 -0400 Subject: [PATCH 2/2] API.Capture: Fix haddocks --- servant/src/Servant/API/Capture.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/servant/src/Servant/API/Capture.hs b/servant/src/Servant/API/Capture.hs index a40e0233..9a2e1b61 100644 --- a/servant/src/Servant/API/Capture.hs +++ b/servant/src/Servant/API/Capture.hs @@ -9,6 +9,7 @@ import GHC.TypeLits (Symbol) -- | Capture a value from the request path under a certain type @a@. -- -- Example: +-- -- >>> -- GET /books/:isbn -- >>> type MyApi = "books" :> Capture "isbn" Text :> Get '[JSON] Book data Capture (sym :: Symbol) a