From a22a9811903e5b8d0ff96bb1da9a91b2b912542a Mon Sep 17 00:00:00 2001
From: Denis Redozubov <denis.redozubov@gmail.com>
Date: Tue, 1 Mar 2016 21:25:04 +0300
Subject: [PATCH] update base-compat imports

---
 servant-server/src/Servant/Server/Internal.hs                | 1 +
 servant-server/src/Servant/Server/Internal/Enter.hs          | 1 +
 .../src/Servant/Server/Internal/RoutingApplication.hs        | 1 +
 servant/src/Servant/API/Alternative.hs                       | 3 ++-
 servant/src/Servant/API/ContentTypes.hs                      | 5 +++--
 servant/src/Servant/API/ResponseHeaders.hs                   | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs
index 31c758b2..c9679d9e 100644
--- a/servant-server/src/Servant/Server/Internal.hs
+++ b/servant-server/src/Servant/Server/Internal.hs
@@ -42,6 +42,7 @@ import           Network.Wai                (Application, Request, Response,
                                              rawQueryString, remoteHost,
                                              requestHeaders, requestMethod,
                                              responseLBS, vault)
+import           Prelude                    ()
 import           Prelude.Compat
 import           Web.HttpApiData            (FromHttpApiData)
 import           Web.HttpApiData.Internal   (parseHeaderMaybe,
diff --git a/servant-server/src/Servant/Server/Internal/Enter.hs b/servant-server/src/Servant/Server/Internal/Enter.hs
index 169a05b6..f1c88b2e 100644
--- a/servant-server/src/Servant/Server/Internal/Enter.hs
+++ b/servant-server/src/Servant/Server/Internal/Enter.hs
@@ -22,6 +22,7 @@ import qualified Control.Monad.State.Strict  as SState
 import qualified Control.Monad.Writer.Lazy   as LWriter
 import qualified Control.Monad.Writer.Strict as SWriter
 import           Data.Typeable
+import           Prelude                     ()
 import           Prelude.Compat
 
 import           Servant.API
diff --git a/servant-server/src/Servant/Server/Internal/RoutingApplication.hs b/servant-server/src/Servant/Server/Internal/RoutingApplication.hs
index e7a53c3c..7d0c4341 100644
--- a/servant-server/src/Servant/Server/Internal/RoutingApplication.hs
+++ b/servant-server/src/Servant/Server/Internal/RoutingApplication.hs
@@ -11,6 +11,7 @@ module Servant.Server.Internal.RoutingApplication where
 import           Control.Monad.Trans.Except         (ExceptT, runExceptT)
 import           Network.Wai                        (Application, Request,
                                                      Response, ResponseReceived)
+import           Prelude                            ()
 import           Prelude.Compat
 import           Servant.Server.Internal.ServantErr
 
diff --git a/servant/src/Servant/API/Alternative.hs b/servant/src/Servant/API/Alternative.hs
index 144f8b48..a7651d3c 100644
--- a/servant/src/Servant/API/Alternative.hs
+++ b/servant/src/Servant/API/Alternative.hs
@@ -10,7 +10,8 @@
 module Servant.API.Alternative ((:<|>)(..)) where
 
 import           Data.Typeable    (Typeable)
-import           Prelude.Compat (Monoid(..), Traversable, Foldable)
+import           Prelude ()
+import           Prelude.Compat
 
 -- | Union of two APIs, first takes precedence in case of overlap.
 --
diff --git a/servant/src/Servant/API/ContentTypes.hs b/servant/src/Servant/API/ContentTypes.hs
index 1e0febdb..6ca29330 100644
--- a/servant/src/Servant/API/ContentTypes.hs
+++ b/servant/src/Servant/API/ContentTypes.hs
@@ -73,7 +73,7 @@ module Servant.API.ContentTypes
     ) where
 
 import           Control.Arrow                    (left)
-import           Control.Monad.Compat             hiding (mapM)
+import           Control.Monad.Compat
 import           Data.Aeson                       (FromJSON(..), ToJSON(..), encode)
 import           Data.Aeson.Parser                (value)
 import           Data.Aeson.Types                 (parseEither)
@@ -96,7 +96,8 @@ import           GHC.Generics                     (Generic)
 import qualified Network.HTTP.Media               as M
 import           Network.URI                      (escapeURIString,
                                                    isUnreserved, unEscapeString)
-import           Prelude.Compat                   ((<*), (*>))
+import           Prelude                          ()
+import           Prelude.Compat
 
 -- * Provided content types
 data JSON deriving Typeable
diff --git a/servant/src/Servant/API/ResponseHeaders.hs b/servant/src/Servant/API/ResponseHeaders.hs
index 09d567a7..cde14938 100644
--- a/servant/src/Servant/API/ResponseHeaders.hs
+++ b/servant/src/Servant/API/ResponseHeaders.hs
@@ -39,6 +39,7 @@ import           GHC.TypeLits                (KnownSymbol, symbolVal)
 import qualified Network.HTTP.Types.Header   as HTTP
 
 import           Servant.API.Header          (Header (..))
+import           Prelude                     ()
 import           Prelude.Compat
 
 -- | Response Header objects. You should never need to construct one directly.