on master help sign in
Merge pull request #505 from haskell-servant/jkarni/reexport-application
ea36656Julian Arni
servant-client/test/Servant/ClientSpec.hs+1−2
@@ -45,8 +45,7 @@ import qualified Network.HTTP.Client as C
45import Network.HTTP.Media
45import Network.HTTP.Media
46import qualified Network.HTTP.Types as HTTP
46import qualified Network.HTTP.Types as HTTP
47import Network.Socket
47import Network.Socket
48−import Network.Wai (Application, Request,
49− requestHeaders, responseLBS)
48+import Network.Wai (Request, requestHeaders, responseLBS)
50import Network.Wai.Handler.Warp
49import Network.Wai.Handler.Warp
51import System.IO.Unsafe (unsafePerformIO)
50import System.IO.Unsafe (unsafePerformIO)
52import Test.Hspec
51import Test.Hspec
servant-server/src/Servant/Server.hs+3
@@ -95,6 +95,9 @@ module Servant.Server
95 , err504
95 , err504
96 , err505
96 , err505
97
97
98+ -- * Re-exports
99+ , Application
100+
98 ) where
101 ) where
99
102
100import Data.Proxy (Proxy)
103import Data.Proxy (Proxy)
servant-server/test/Servant/Server/RouterSpec.hs+1−1
@@ -8,7 +8,7 @@ import Control.Monad (unless)
8import Data.Proxy (Proxy(..))
8import Data.Proxy (Proxy(..))
9import Data.Text (unpack)
9import Data.Text (unpack)
10import Network.HTTP.Types (Status (..))
10import Network.HTTP.Types (Status (..))
11−import Network.Wai (Application, responseBuilder)
11+import Network.Wai (responseBuilder)
12import Network.Wai.Internal (Response (ResponseBuilder))
12import Network.Wai.Internal (Response (ResponseBuilder))
13import Test.Hspec
13import Test.Hspec
14import Test.Hspec.Wai (get, shouldRespondWith, with)
14import Test.Hspec.Wai (get, shouldRespondWith, with)