fcf5402 · servant · git.iko.soy

git.iko.soy/servant

Rebased to latest upstream

commitfcf5402861a45dd4086256f01dad39de86d84e49 authorDaniel Larsson <daniel.j.larsson@gmail.com> dateThu 15 Jan 2015, 10:44 (12 years ago) parent0b2f2ae

4 files changed+4−4

compare with master

unifiedsplit

src/Servant/QQ.hs−1 src/Servant/Utils/Links.hs+2−2 test/Servant/QQSpec.hs+1 test/Servant/Utils/LinksSpec.hs+1−1

src/Servant/QQ.hs−1

@@ -29,7 +29,6 @@

2929module Servant.QQ (sitemap) where

3030

3131import Control.Monad ( void )

32−import Control.Applicative ( (<$>) )

3332import Language.Haskell.TH.Quote ( QuasiQuoter(..) )

3433import Language.Haskell.TH

3534 ( mkName, Type(AppT, ConT, LitT), TyLit(StrTyLit) )

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

@@ -53,8 +53,8 @@ import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )

5353

5454import Servant.API.Capture ( Capture )

5555import Servant.API.ReqBody ( ReqBody )

56−import Servant.API.QueryParam ( QueryParam )

57−import Servant.API.MatrixParam ( MatrixParam )

56+import Servant.API.QueryParam ( QueryParam, QueryParams, QueryFlag )

57+import Servant.API.MatrixParam ( MatrixParam, MatrixParams, MatrixFlag )

5858import Servant.API.Get ( Get )

5959import Servant.API.Post ( Post )

6060import Servant.API.Put ( Put )

test/Servant/QQSpec.hs+1

@@ -15,6 +15,7 @@ import Servant.API

1515 ( (:<|>),

1616 ReqBody,

1717 QueryParam,

18+ MatrixParam,

1819 Put,

1920 Get,

2021 Post,

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

@@ -6,7 +6,7 @@ module Servant.Utils.LinksSpec where

66import Test.Hspec ( Spec, it, describe )

88import Servant.API

9− ( type (:<|>), ReqBody, QueryParam, Get, Post, Capture, type (:>) )

9+ ( type (:<|>), ReqBody, QueryParam, MatrixParam, MatrixParams, MatrixFlag, Get, Post, Capture, type (:>) )

1010import Servant.QQSpec ( (~>) )

1111import Servant.Utils.Links ( IsElem, IsLink )

1212