git.iko.soy/servant
on master help sign in
use base-compat in servant-server
commitc755f478067ec7f8e1cee352e59e36d743e90a75 authorDenis Redozubov <denis.redozubov@gmail.com> dateTue 1 Mar 2016, 14:41 (11 years ago) parentc528eb2
6 files changed+7−10
compare with master
unifiedsplit
servant-server/servant-server.cabal+1 servant-server/src/Servant/Server/Internal.hs+1−3 servant-server/src/Servant/Server/Internal/Enter.hs+2−3 servant-server/src/Servant/Server/Internal/RoutingApplication.hs+1−3 servant/servant.cabal+1−1 stack.yaml+1
servant-server/servant-server.cabal+1
@@ -47,6 +47,7 @@ library
4747 Servant.Utils.StaticFiles
4848 build-depends:
4949 base >= 4.7 && < 5
50+ , base-compat >= 0.9
5051 , aeson >= 0.7 && < 0.12
5152 , attoparsec >= 0.12 && < 0.14
5253 , base64-bytestring == 1.0.*
servant-server/src/Servant/Server/Internal.hs+1−3
@@ -22,9 +22,6 @@ module Servant.Server.Internal
2222 , module Servant.Server.Internal.ServantErr
2323 ) where
2424
25−#if !MIN_VERSION_base(4,8,0)
26−import Control.Applicative ((<$>))
27−#endif
2825import Control.Monad.Trans.Except (ExceptT)
2926import qualified Data.ByteString as B
3027import qualified Data.ByteString.Char8 as BC8
@@ -45,6 +42,7 @@ import Network.Wai (Application, Request, Response,
4542 rawQueryString, remoteHost,
4643 requestHeaders, requestMethod,
4744 responseLBS, vault)
45+import Prelude.Compat
4846import Web.HttpApiData (FromHttpApiData)
4947import Web.HttpApiData.Internal (parseHeaderMaybe,
5048 parseQueryParamMaybe,
servant-server/src/Servant/Server/Internal/Enter.hs+2−3
@@ -10,9 +10,6 @@
1010{-# LANGUAGE UndecidableInstances #-}
1111module Servant.Server.Internal.Enter where
1212
13−#if !MIN_VERSION_base(4,8,0)
14−import Control.Applicative
15−#endif
1613import qualified Control.Category as C
1714#if MIN_VERSION_mtl(2,2,1)
1815import Control.Monad.Except
@@ -25,6 +22,8 @@ import qualified Control.Monad.State.Strict as SState
2522import qualified Control.Monad.Writer.Lazy as LWriter
2623import qualified Control.Monad.Writer.Strict as SWriter
2724import Data.Typeable
25+import Prelude.Compat
26+
2827import Servant.API
2928
3029class Enter typ arg ret | typ arg -> ret, typ ret -> arg where
servant-server/src/Servant/Server/Internal/RoutingApplication.hs+1−3
@@ -8,12 +8,10 @@
88{-# LANGUAGE StandaloneDeriving #-}
99module Servant.Server.Internal.RoutingApplication where
1010
11−#if !MIN_VERSION_base(4,8,0)
12−import Control.Applicative ((<$>))
13−#endif
1411import Control.Monad.Trans.Except (ExceptT, runExceptT)
1512import Network.Wai (Application, Request,
1613 Response, ResponseReceived)
14+import Prelude.Compat
1715import Servant.Server.Internal.ServantErr
1816
1917type RoutingApplication =
servant/servant.cabal+1−1
@@ -47,7 +47,7 @@ library
4747 Servant.Utils.Links
4848 build-depends:
4949 base >=4.7 && <5
50− , base-compat >= 0.8
50+ , base-compat >= 0.9
5151 , aeson >= 0.7
5252 , attoparsec >= 0.12
5353 , bytestring == 0.10.*
stack.yaml+1
@@ -14,6 +14,7 @@ packages:
1414- servant-mock/
1515- servant-server/
1616extra-deps:
17+- base-compat-0.9.0
1718- engine-io-wai-1.0.2
1819- control-monad-omega-0.3.1
1920- should-not-typecheck-2.0.1