use base-compat in servant-server

This commit is contained in:
Denis Redozubov 2016-03-01 14:41:24 +03:00
parent c528eb24ca
commit c755f47806
6 changed files with 7 additions and 10 deletions

View file

@ -47,6 +47,7 @@ library
Servant.Utils.StaticFiles
build-depends:
base >= 4.7 && < 5
, base-compat >= 0.9
, aeson >= 0.7 && < 0.12
, attoparsec >= 0.12 && < 0.14
, base64-bytestring == 1.0.*

View file

@ -22,9 +22,6 @@ module Servant.Server.Internal
, module Servant.Server.Internal.ServantErr
) where
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative ((<$>))
#endif
import Control.Monad.Trans.Except (ExceptT)
import qualified Data.ByteString as B
import qualified Data.ByteString.Char8 as BC8
@ -45,6 +42,7 @@ import Network.Wai (Application, Request, Response,
rawQueryString, remoteHost,
requestHeaders, requestMethod,
responseLBS, vault)
import Prelude.Compat
import Web.HttpApiData (FromHttpApiData)
import Web.HttpApiData.Internal (parseHeaderMaybe,
parseQueryParamMaybe,

View file

@ -10,9 +10,6 @@
{-# LANGUAGE UndecidableInstances #-}
module Servant.Server.Internal.Enter where
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative
#endif
import qualified Control.Category as C
#if MIN_VERSION_mtl(2,2,1)
import Control.Monad.Except
@ -25,6 +22,8 @@ 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.Compat
import Servant.API
class Enter typ arg ret | typ arg -> ret, typ ret -> arg where

View file

@ -8,12 +8,10 @@
{-# LANGUAGE StandaloneDeriving #-}
module Servant.Server.Internal.RoutingApplication where
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative ((<$>))
#endif
import Control.Monad.Trans.Except (ExceptT, runExceptT)
import Network.Wai (Application, Request,
Response, ResponseReceived)
import Prelude.Compat
import Servant.Server.Internal.ServantErr
type RoutingApplication =

View file

@ -47,7 +47,7 @@ library
Servant.Utils.Links
build-depends:
base >=4.7 && <5
, base-compat >= 0.8
, base-compat >= 0.9
, aeson >= 0.7
, attoparsec >= 0.12
, bytestring == 0.10.*

View file

@ -14,6 +14,7 @@ packages:
- servant-mock/
- servant-server/
extra-deps:
- base-compat-0.9.0
- engine-io-wai-1.0.2
- control-monad-omega-0.3.1
- should-not-typecheck-2.0.1