From fcf5402861a45dd4086256f01dad39de86d84e49 Mon Sep 17 00:00:00 2001
From: Daniel Larsson <daniel.j.larsson@gmail.com>
Date: Thu, 15 Jan 2015 10:44:45 +0100
Subject: [PATCH] Rebased to latest upstream

---
 src/Servant/QQ.hs               | 1 -
 src/Servant/Utils/Links.hs      | 4 ++--
 test/Servant/QQSpec.hs          | 1 +
 test/Servant/Utils/LinksSpec.hs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Servant/QQ.hs b/src/Servant/QQ.hs
index ee5d7ae2..6c09e2bf 100644
--- a/src/Servant/QQ.hs
+++ b/src/Servant/QQ.hs
@@ -29,7 +29,6 @@
 module Servant.QQ (sitemap) where
 
 import Control.Monad ( void )
-import Control.Applicative ( (<$>) )
 import Language.Haskell.TH.Quote ( QuasiQuoter(..) )
 import Language.Haskell.TH
     ( mkName, Type(AppT, ConT, LitT), TyLit(StrTyLit) )
diff --git a/src/Servant/Utils/Links.hs b/src/Servant/Utils/Links.hs
index bb9c9dbb..f545ac58 100644
--- a/src/Servant/Utils/Links.hs
+++ b/src/Servant/Utils/Links.hs
@@ -53,8 +53,8 @@ import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )
 
 import Servant.API.Capture ( Capture )
 import Servant.API.ReqBody ( ReqBody )
-import Servant.API.QueryParam ( QueryParam )
-import Servant.API.MatrixParam ( MatrixParam )
+import Servant.API.QueryParam ( QueryParam, QueryParams, QueryFlag )
+import Servant.API.MatrixParam ( MatrixParam, MatrixParams, MatrixFlag )
 import Servant.API.Get ( Get )
 import Servant.API.Post ( Post )
 import Servant.API.Put ( Put )
diff --git a/test/Servant/QQSpec.hs b/test/Servant/QQSpec.hs
index 9352ad9e..0747f843 100644
--- a/test/Servant/QQSpec.hs
+++ b/test/Servant/QQSpec.hs
@@ -15,6 +15,7 @@ import Servant.API
     ( (:<|>),
       ReqBody,
       QueryParam,
+      MatrixParam,
       Put,
       Get,
       Post,
diff --git a/test/Servant/Utils/LinksSpec.hs b/test/Servant/Utils/LinksSpec.hs
index 403b245e..4217e10e 100644
--- a/test/Servant/Utils/LinksSpec.hs
+++ b/test/Servant/Utils/LinksSpec.hs
@@ -6,7 +6,7 @@ module Servant.Utils.LinksSpec where
 import Test.Hspec ( Spec, it, describe )
 
 import Servant.API
-    ( type (:<|>), ReqBody, QueryParam, Get, Post, Capture, type (:>) )
+    ( type (:<|>), ReqBody, QueryParam, MatrixParam, MatrixParams, MatrixFlag, Get, Post, Capture, type (:>) )
 import Servant.QQSpec ( (~>) )
 import Servant.Utils.Links ( IsElem, IsLink )