62058cb · typeable/wai

git.iko.soy/typeable/wai

catching up to GHC 7.8.

commit62058cbeea516ba33f0d4e919b680a40d837d8ec authorKazu Yamamoto <kazu@iij.ad.jp> dateFri 11 Oct 2013, 11:08 (13 years ago) parent4a2278a

3 files changed+4−4

unifiedsplit

warp/Network/Wai/Handler/Warp/Request.hs+1−1

@@ -6,7 +6,7 @@ module Network.Wai.Handler.Warp.Request where

77import Control.Applicative

88import Control.Exception.Lifted (throwIO)

9−import Control.Monad.IO.Class (MonadIO, liftIO)

9+import Control.Monad.IO.Class (liftIO)

1010import Data.ByteString (ByteString)

1111import qualified Data.ByteString as S

1212import qualified Data.ByteString.Char8 as B (unpack)

warp/Network/Wai/Handler/Warp/Response.hs+1−1

@@ -11,7 +11,7 @@ import Blaze.ByteString.Builder (fromByteString, Builder, toByteStringIO, flush)

1111import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)

1212import Control.Applicative

1313import Control.Exception

14−import Control.Monad.IO.Class (MonadIO, liftIO)

14+import Control.Monad.IO.Class (liftIO)

1515import Data.ByteString (ByteString)

1616import qualified Data.ByteString.Char8 as B (pack)

1717import qualified Data.CaseInsensitive as CI

warp/Network/Wai/Handler/Warp/Run.hs+2−2

@@ -8,7 +8,7 @@ import Control.Concurrent (threadDelay, forkIOWithUnmask)

88import qualified Control.Concurrent as Conc (yield)

99import Control.Exception as E

1010import Control.Monad (forever, when, unless, void)

11−import Control.Monad.IO.Class (MonadIO, liftIO)

11+import Control.Monad.IO.Class (liftIO)

1212import Data.ByteString (ByteString)

1313import qualified Data.ByteString as S

1414import Data.Conduit

@@ -237,7 +237,7 @@ serveConnection timeoutHandle settings cleaner app conn remoteHost' =

237237 where

238238 th = threadHandle cleaner

239239

240− send500 = void . mask $ \restore ->

240+ send500 = void $ mask $ \restore ->

241241 sendResponse settings cleaner dummyreq conn restore internalError

242242

243243 dummyreq = defaultRequest { remoteHost = remoteHost' }