update base-compat imports

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,

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

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
 

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.
 --

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

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.