git.iko.soy/typeable/servant
on master help sign in
update base-compat imports
commita22a9811903e5b8d0ff96bb1da9a91b2b912542a authorDenis Redozubov <denis.redozubov@gmail.com> dateTue 1 Mar 2016, 21:25 (11 years ago) parentc755f47
6 files changed+9−3
compare with master
unifiedsplit
servant-server/src/Servant/Server/Internal.hs+1 servant-server/src/Servant/Server/Internal/Enter.hs+1 servant-server/src/Servant/Server/Internal/RoutingApplication.hs+1 servant/src/Servant/API/Alternative.hs+2−1 servant/src/Servant/API/ContentTypes.hs+3−2 servant/src/Servant/API/ResponseHeaders.hs+1
servant-server/src/Servant/Server/Internal.hs+1
@@ -42,6 +42,7 @@ import Network.Wai (Application, Request, Response,
4242 rawQueryString, remoteHost,
4343 requestHeaders, requestMethod,
4444 responseLBS, vault)
45+import Prelude ()
4546import Prelude.Compat
4647import Web.HttpApiData (FromHttpApiData)
4748import Web.HttpApiData.Internal (parseHeaderMaybe,
servant-server/src/Servant/Server/Internal/Enter.hs+1
@@ -22,6 +22,7 @@ import qualified Control.Monad.State.Strict as SState
2222import qualified Control.Monad.Writer.Lazy as LWriter
2323import qualified Control.Monad.Writer.Strict as SWriter
2424import Data.Typeable
25+import Prelude ()
2526import Prelude.Compat
2627
2728import Servant.API
servant-server/src/Servant/Server/Internal/RoutingApplication.hs+1
@@ -11,6 +11,7 @@ module Servant.Server.Internal.RoutingApplication where
1111import Control.Monad.Trans.Except (ExceptT, runExceptT)
1212import Network.Wai (Application, Request,
1313 Response, ResponseReceived)
14+import Prelude ()
1415import Prelude.Compat
1516import Servant.Server.Internal.ServantErr
1617
servant/src/Servant/API/Alternative.hs+2−1
@@ -10,7 +10,8 @@
1010module Servant.API.Alternative ((:<|>)(..)) where
1111
1212import Data.Typeable (Typeable)
13−import Prelude.Compat (Monoid(..), Traversable, Foldable)
13+import Prelude ()
14+import Prelude.Compat
1415
1516-- | Union of two APIs, first takes precedence in case of overlap.
1617--
servant/src/Servant/API/ContentTypes.hs+3−2
@@ -73,7 +73,7 @@ module Servant.API.ContentTypes
7373 ) where
7474
7575import Control.Arrow (left)
76−import Control.Monad.Compat hiding (mapM)
76+import Control.Monad.Compat
7777import Data.Aeson (FromJSON(..), ToJSON(..), encode)
7878import Data.Aeson.Parser (value)
7979import Data.Aeson.Types (parseEither)
@@ -96,7 +96,8 @@ import GHC.Generics (Generic)
9696import qualified Network.HTTP.Media as M
9797import Network.URI (escapeURIString,
9898 isUnreserved, unEscapeString)
99−import Prelude.Compat ((<*), (*>))
99+import Prelude ()
100+import Prelude.Compat
100101
101102-- * Provided content types
102103data JSON deriving Typeable
servant/src/Servant/API/ResponseHeaders.hs+1
@@ -39,6 +39,7 @@ import GHC.TypeLits (KnownSymbol, symbolVal)
3939import qualified Network.HTTP.Types.Header as HTTP
4040
4141import Servant.API.Header (Header (..))
42+import Prelude ()
4243import Prelude.Compat
4344
4445-- | Response Header objects. You should never need to construct one directly.