git.iko.soy/typeable/servant
on master help sign in
use base-compat
commitc528eb24ca367ff5fee7835116630bc1f5aa893e authorDenis Redozubov <denis.redozubov@gmail.com> dateTue 1 Mar 2016, 14:21 (11 years ago) parente34003e
7 files changed+9−19
compare with master
unifiedsplit
servant/servant.cabal+1 servant/src/Servant/API/Alternative.hs+2−5 servant/src/Servant/API/ContentTypes.hs+3−5 servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs−1 servant/src/Servant/API/ResponseHeaders.hs+1−3 servant/src/Servant/Utils/Links.hs+1−5 stack-ghc-7.8.4.yaml+1
servant/servant.cabal+1
@@ -47,6 +47,7 @@ library
4747 Servant.Utils.Links
4848 build-depends:
4949 base >=4.7 && <5
50+ , base-compat >= 0.8
5051 , aeson >= 0.7
5152 , attoparsec >= 0.12
5253 , bytestring == 0.10.*
servant/src/Servant/API/Alternative.hs+2−5
@@ -9,12 +9,9 @@
99{-# OPTIONS_HADDOCK not-home #-}
1010module Servant.API.Alternative ((:<|>)(..)) where
1111
12−#if !MIN_VERSION_base(4,8,0)
13−import Data.Monoid (Monoid (..))
14−import Data.Traversable (Traversable)
15−import Data.Foldable (Foldable)
16−#endif
1712import Data.Typeable (Typeable)
13+import Prelude.Compat (Monoid(..), Traversable, Foldable)
14+
1815-- | Union of two APIs, first takes precedence in case of overlap.
1916--
2017-- Example:
servant/src/Servant/API/ContentTypes.hs+3−5
@@ -72,11 +72,8 @@ module Servant.API.ContentTypes
7272 , canHandleAcceptH
7373 ) where
7474
75−#if !MIN_VERSION_base(4,8,0)
76−import Control.Applicative ((*>), (<*))
77−#endif
7875import Control.Arrow (left)
79−import Control.Monad
76+import Control.Monad.Compat hiding (mapM)
8077import Data.Aeson (FromJSON(..), ToJSON(..), encode)
8178import Data.Aeson.Parser (value)
8279import Data.Aeson.Types (parseEither)
@@ -88,7 +85,7 @@ import Data.ByteString.Lazy (ByteString, fromStrict,
8885import qualified Data.ByteString.Lazy as B
8986import qualified Data.ByteString.Lazy.Char8 as BC
9087import Data.Maybe (isJust)
91−import Data.Monoid
88+import Data.Monoid.Compat
9289import Data.String.Conversions (cs)
9390import qualified Data.Text as TextS
9491import qualified Data.Text.Encoding as TextS
@@ -99,6 +96,7 @@ import GHC.Generics (Generic)
9996import qualified Network.HTTP.Media as M
10097import Network.URI (escapeURIString,
10198 isUnreserved, unEscapeString)
99+import Prelude.Compat ((<*), (*>))
102100
103101-- * Provided content types
104102data JSON deriving Typeable
servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs−1
@@ -7,7 +7,6 @@
77module Servant.API.Internal.Test.ComprehensiveAPI where
88
99import Data.Proxy
10−
1110import Servant.API
1211
1312type GET = Get '[JSON] ()
servant/src/Servant/API/ResponseHeaders.hs+1−3
@@ -30,9 +30,6 @@ module Servant.API.ResponseHeaders
3030 , HList(..)
3131 ) where
3232
33−#if !MIN_VERSION_base(4,8,0)
34−import Control.Applicative ((<$>))
35−#endif
3633import Data.ByteString.Char8 as BS (pack, unlines, init)
3734import Data.ByteString.Conversion (ToByteString, toByteString',
3835 FromByteString, fromByteString)
@@ -42,6 +39,7 @@ import GHC.TypeLits (KnownSymbol, symbolVal)
4239import qualified Network.HTTP.Types.Header as HTTP
4340
4441import Servant.API.Header (Header (..))
42+import Prelude.Compat
4543
4644-- | Response Header objects. You should never need to construct one directly.
4745-- Instead, use 'addHeader'.
servant/src/Servant/Utils/Links.hs+1−5
@@ -105,11 +105,7 @@ import Data.List
105105import Data.Proxy ( Proxy(..) )
106106import qualified Data.Text as Text
107107import qualified Data.ByteString.Char8 as BSC
108−#if !MIN_VERSION_base(4,8,0)
109−import Data.Monoid ( Monoid(..), (<>) )
110−#else
111−import Data.Monoid ( (<>) )
112−#endif
108+import Data.Monoid.Compat ( Monoid(..), (<>) )
113109import Network.URI ( URI(..), escapeURIString, isUnreserved )
114110import GHC.TypeLits ( KnownSymbol, symbolVal )
115111import GHC.Exts(Constraint)
stack-ghc-7.8.4.yaml+1
@@ -12,6 +12,7 @@ packages:
1212- servant-mock/
1313- servant-server/
1414extra-deps:
15+- base-compat-0.9.0
1516- hspec-2.2.0
1617- hspec-core-2.2.0
1718- hspec-discover-2.2.0