2f9c634 · servant · git.iko.soy

git.iko.soy/servant

Explicit imports in /src.

commit2f9c6340c4d647485187a97c75f1fe6ea621ac05 authorMatthias Fischmann <mf@zerobuzz.net> dateTue 6 Jan 2015, 17:25 (12 years ago) parent6835f05

3 files changed+22−19

compare with master

unifiedsplit

src/Servant/Server.hs+5−4 src/Servant/Server/Internal.hs+14−12 src/Servant/Utils/StaticFiles.hs+3−3

src/Servant/Server.hs+5−4

@@ -11,10 +11,12 @@ module Servant.Server

1111 HasServer(..)

1212 ) where

1313

14−import Data.Proxy

15−import Network.Wai

14+import Data.Proxy (Proxy)

15+import Network.Wai (Application)

16+

1617import Servant.Server.Internal

1718

19+

1820-- * Implementing Servers

1921

2022-- | 'serve' allows you to implement an API and produce a wai 'Application'.

@@ -30,7 +32,7 @@ import Servant.Server.Internal

3032-- > postBook book = ...

3133-- >

3234-- > myApi :: Proxy MyApi

33−-- > myApi = Proxy

35+-- > myApi = Proxy

3436-- >

3537-- > app :: Application

3638-- > app = serve myApi server

@@ -39,4 +41,3 @@ import Servant.Server.Internal

3941-- > main = Network.Wai.Handler.Warp.run 8080 app

4042serve :: HasServer layout => Proxy layout -> Server layout -> Application

4143serve p server = toApplication (route p server)

42−

src/Servant/Server/Internal.hs+14−12

@@ -7,24 +7,26 @@

77{-# LANGUAGE ScopedTypeVariables #-}

88module Servant.Server.Internal where

10−import Control.Applicative

11−import Control.Monad.Trans.Either

12−import Data.Aeson

10+import Control.Applicative ((<$>))

11+import Control.Monad.Trans.Either (EitherT, runEitherT)

12+import Data.Aeson (ToJSON, FromJSON, encode, decode')

1313import qualified Data.ByteString as B

1414import qualified Data.ByteString.Lazy as BL

15−import Data.IORef

15+import Data.IORef (newIORef, readIORef, writeIORef)

1616import Data.Maybe (catMaybes)

17−import Data.Monoid

18−import Data.Proxy

19−import Data.String

20−import Data.String.Conversions

17+import Data.Monoid (Monoid, mempty, mappend)

18+import Data.Proxy (Proxy(Proxy))

19+import Data.String (fromString)

20+import Data.String.Conversions (cs, (<>))

2121import Data.Text.Encoding (decodeUtf8)

2222import Data.Text (Text)

23−import GHC.TypeLits

23+import GHC.TypeLits (KnownSymbol, symbolVal)

2424import Network.HTTP.Types hiding (Header)

25−import Network.Wai

26−import Servant.API

27−import Servant.Common.Text

25+import Network.Wai (Response, Request, ResponseReceived, Application, pathInfo, requestBody,

26+ strictRequestBody, lazyRequestBody, requestHeaders, requestMethod,

27+ rawQueryString, responseLBS)

28+import Servant.API (QueryParams, QueryParam, QueryFlag, ReqBody, Header, Capture, Get, Delete, Put, Post, Raw, (:>), (:<|>)(..))

29+import Servant.Common.Text (FromText, fromText)

2830

2931data ReqBodyState = Uncalled

3032 | Called !B.ByteString

src/Servant/Utils/StaticFiles.hs+3−3

@@ -7,9 +7,9 @@ module Servant.Utils.StaticFiles (

77 ) where

99import Filesystem.Path.CurrentOS (decodeString)

10−import Network.Wai.Application.Static

11−import Servant.API.Raw

12−import Servant.Server.Internal

10+import Network.Wai.Application.Static (staticApp, defaultFileServerSettings)

11+import Servant.API.Raw (Raw)

12+import Servant.Server.Internal (Server)

1313

1414-- | Serve anything under the specified directory as a 'Raw' endpoint.

1515--