ea36656 · servant · git.iko.soy

git.iko.soy/servant

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

Re-export Application.

commitea36656dcd4c006c2ddf204c76b2635ad1d5cf40 authorJulian Arni <jkarni@gmail.com> dateThu 12 May 2016, 10:38 (10 years ago) parentff40b32 2112545

3 files changed+5−3

unifiedsplit

servant-client/test/Servant/ClientSpec.hs+1−2

@@ -45,8 +45,7 @@ import qualified Network.HTTP.Client as C

4545import Network.HTTP.Media

4646import qualified Network.HTTP.Types as HTTP

4747import Network.Socket

48−import Network.Wai (Application, Request,

49− requestHeaders, responseLBS)

48+import Network.Wai (Request, requestHeaders, responseLBS)

5049import Network.Wai.Handler.Warp

5150import System.IO.Unsafe (unsafePerformIO)

5251import Test.Hspec

servant-server/src/Servant/Server.hs+3

@@ -95,6 +95,9 @@ module Servant.Server

9595 , err504

9696 , err505

9797

98+ -- * Re-exports

99+ , Application

100+

98101 ) where

99102

100103import Data.Proxy (Proxy)

servant-server/test/Servant/Server/RouterSpec.hs+1−1

@@ -8,7 +8,7 @@ import Control.Monad (unless)

88import Data.Proxy (Proxy(..))

99import Data.Text (unpack)

1010import Network.HTTP.Types (Status (..))

11−import Network.Wai (Application, responseBuilder)

11+import Network.Wai (responseBuilder)

1212import Network.Wai.Internal (Response (ResponseBuilder))

1313import Test.Hspec

1414import Test.Hspec.Wai (get, shouldRespondWith, with)