on master help sign in
Rebased to latest upstream
fcf5402Daniel Larsson
src/Servant/QQ.hs−1
@@ -29,7 +29,6 @@
29module Servant.QQ (sitemap) where
29module Servant.QQ (sitemap) where
30
30
31import Control.Monad ( void )
31import Control.Monad ( void )
32−import Control.Applicative ( (<$>) )
33import Language.Haskell.TH.Quote ( QuasiQuoter(..) )
32import Language.Haskell.TH.Quote ( QuasiQuoter(..) )
34import Language.Haskell.TH
33import Language.Haskell.TH
35 ( mkName, Type(AppT, ConT, LitT), TyLit(StrTyLit) )
34 ( mkName, Type(AppT, ConT, LitT), TyLit(StrTyLit) )
src/Servant/Utils/Links.hs+2−2
@@ -53,8 +53,8 @@ import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )
53
53
54import Servant.API.Capture ( Capture )
54import Servant.API.Capture ( Capture )
55import Servant.API.ReqBody ( ReqBody )
55import Servant.API.ReqBody ( ReqBody )
56−import Servant.API.QueryParam ( QueryParam )
56+import Servant.API.QueryParam ( QueryParam, QueryParams, QueryFlag )
57−import Servant.API.MatrixParam ( MatrixParam )
57+import Servant.API.MatrixParam ( MatrixParam, MatrixParams, MatrixFlag )
58import Servant.API.Get ( Get )
58import Servant.API.Get ( Get )
59import Servant.API.Post ( Post )
59import Servant.API.Post ( Post )
60import Servant.API.Put ( Put )
60import Servant.API.Put ( Put )
test/Servant/QQSpec.hs+1
@@ -15,6 +15,7 @@ import Servant.API
15 ( (:<|>),
15 ( (:<|>),
16 ReqBody,
16 ReqBody,
17 QueryParam,
17 QueryParam,
18+ MatrixParam,
18 Put,
19 Put,
19 Get,
20 Get,
20 Post,
21 Post,
test/Servant/Utils/LinksSpec.hs+1−1
@@ -6,7 +6,7 @@ module Servant.Utils.LinksSpec where
6import Test.Hspec ( Spec, it, describe )
6import Test.Hspec ( Spec, it, describe )
7
7
8import Servant.API
8import Servant.API
9− ( type (:<|>), ReqBody, QueryParam, Get, Post, Capture, type (:>) )
9+ ( type (:<|>), ReqBody, QueryParam, MatrixParam, MatrixParams, MatrixFlag, Get, Post, Capture, type (:>) )
10import Servant.QQSpec ( (~>) )
10import Servant.QQSpec ( (~>) )
11import Servant.Utils.Links ( IsElem, IsLink )
11import Servant.Utils.Links ( IsElem, IsLink )
12
12