eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #505 from haskell-servant/jkarni/reexport-application

Browse source 
Re-export Application.
This commit is contained in:
Julian Arni 2016-05-12 10:38:46 +02:00
commit ea36656dcd
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servant-client/test/Servant/ClientSpec.hs
View file

@ -45,8 +45,7 @@ import qualified Network.HTTP.Client as C
import Network.HTTP.Media import Network.HTTP.Media
import qualified Network.HTTP.Types as HTTP import qualified Network.HTTP.Types as HTTP
import Network.Socket import Network.Socket
import Network.Wai (Application, Request, import Network.Wai (Request, requestHeaders, responseLBS)
requestHeaders, responseLBS)
import Network.Wai.Handler.Warp import Network.Wai.Handler.Warp
import System.IO.Unsafe (unsafePerformIO) import System.IO.Unsafe (unsafePerformIO)
import Test.Hspec import Test.Hspec

3
servant-server/src/Servant/Server.hs
View file

@ -95,6 +95,9 @@ module Servant.Server
, err504 , err504
, err505 , err505
-- * Re-exports
, Application
) where ) where
import Data.Proxy (Proxy) import Data.Proxy (Proxy)

2
servant-server/test/Servant/Server/RouterSpec.hs
View file

@ -8,7 +8,7 @@ import Control.Monad (unless)
import Data.Proxy (Proxy(..)) import Data.Proxy (Proxy(..))
import Data.Text (unpack) import Data.Text (unpack)
import Network.HTTP.Types (Status (..)) import Network.HTTP.Types (Status (..))
import Network.Wai (Application, responseBuilder) import Network.Wai (responseBuilder)
import Network.Wai.Internal (Response (ResponseBuilder)) import Network.Wai.Internal (Response (ResponseBuilder))
import Test.Hspec import Test.Hspec
import Test.Hspec.Wai (get, shouldRespondWith, with) import Test.Hspec.Wai (get, shouldRespondWith, with)