git.iko.soy/typeable/wai
on master help sign in
Simplified some deps
commit41486135dea79beec23bf8df20a65dbcdd711e4c authorMichael Snoyman <michael@snoyman.com> dateThu 29 May 2014, 07:25 (12 years ago) parent4801435
8 files changed+7−15
compare with master
unifiedsplit
wai-extra/Network/Wai/Middleware/Gzip.hs+1−1 wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1 wai-extra/wai-extra.cabal+1−2 wai/wai.cabal−1 warp/Network/Wai/Handler/Warp/Conduit.hs+2−4 warp/Network/Wai/Handler/Warp/Request.hs+2−3 warp/Network/Wai/Handler/Warp/Run.hs−1 warp/warp.cabal−2
wai-extra/Network/Wai/Middleware/Gzip.hs+1−1
@@ -28,7 +28,7 @@ import Network.Wai
2828import Data.Maybe (fromMaybe, isJust)
2929import qualified Data.ByteString.Char8 as S8
3030import qualified Data.ByteString as S
31−import Data.Default
31+import Data.Default.Class
3232import Network.HTTP.Types (Status, Header)
3333import Control.Monad.IO.Class (liftIO)
3434import Control.Monad.Trans.Resource (runResourceT)
wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1
@@ -38,7 +38,7 @@ import System.Console.ANSI
3838import Data.IORef.Lifted
3939import System.IO.Unsafe
4040
41−import Data.Default (Default (def))
41+import Data.Default.Class (Default (def))
4242import Network.Wai.Logger
4343import Network.Wai.Middleware.RequestLogger.Internal
4444
wai-extra/wai-extra.cabal+1−2
@@ -32,7 +32,7 @@ Library
3232 , http-types >= 0.7
3333 , text >= 0.7
3434 , case-insensitive >= 0.2
35− , data-default
35+ , data-default-class
3636 , fast-logger >= 2.1 && < 2.2
3737 , wai-logger >= 2.0 && < 2.2
3838 , ansi-terminal
@@ -90,7 +90,6 @@ test-suite tests
9090 , text
9191 , bytestring
9292 , directory
93− , zlib-bindings
9493 , blaze-builder >= 0.2.1.4 && < 0.4
9594 , data-default
9695 , fast-logger >= 2.1
wai/wai.cabal−1
@@ -23,7 +23,6 @@ Library
2323 , network >= 2.2.1.5
2424 , http-types >= 0.7
2525 , text >= 0.7
26− , transformers >= 0.2.2
2726 , vault >= 0.3 && < 0.4
2827 Exposed-modules: Network.Wai
2928 Network.Wai.Internal
warp/Network/Wai/Handler/Warp/Conduit.hs+2−4
@@ -3,8 +3,6 @@ module Network.Wai.Handler.Warp.Conduit where
33import Control.Applicative
44import Control.Exception
55import Control.Monad (when, unless)
6−import Control.Monad.IO.Class (MonadIO, liftIO)
7−import Control.Monad.Trans.Class (lift)
86import Data.ByteString (ByteString)
97import Data.ByteString.Lazy.Char8 (pack)
108import qualified Data.ByteString as S
@@ -39,7 +37,7 @@ readISource (ISource src ref) = do
3937
4038 -- If no chunk available, then there aren't enough bytes in the
4139 -- stream. Throw a ConnectionClosedByPeer
42− when (S.null bs) $ liftIO $ throwIO ConnectionClosedByPeer
40+ when (S.null bs) $ throwIO ConnectionClosedByPeer
4341
4442 let -- How many of the bytes in this chunk to send downstream
4543 toSend = min count (S.length bs)
@@ -52,7 +50,7 @@ readISource (ISource src ref) = do
5250 -- downstream, and then loop on this function for the
5351 -- next chunk.
5452 | count' > 0 -> do
55− liftIO $ I.writeIORef ref count'
53+ I.writeIORef ref count'
5654 return bs
5755
5856 -- Some of the bytes in this chunk should not be sent
warp/Network/Wai/Handler/Warp/Request.hs+2−3
@@ -10,8 +10,7 @@ module Network.Wai.Handler.Warp.Request (
1010
1111import Control.Applicative
1212import qualified Control.Concurrent as Conc (yield)
13−import Control.Exception.Lifted (throwIO)
14−import Control.Monad.IO.Class (liftIO)
13+import Control.Exception (throwIO)
1514import Data.Array ((!))
1615import Data.ByteString (ByteString)
1716import qualified Data.ByteString as S
@@ -60,7 +59,7 @@ recvRequest settings conn ii addr src = do
6059 expect = idxhdr ! idxExpect
6160 cl = idxhdr ! idxContentLength
6261 te = idxhdr ! idxTransferEncoding
63− liftIO $ handleExpect conn httpversion expect
62+ handleExpect conn httpversion expect
6463 (rbody, bodyLength) <- bodyAndSource src cl te
6564 rbody' <- timeoutBody th rbody
6665 let req = Request {
warp/Network/Wai/Handler/Warp/Run.hs−1
@@ -10,7 +10,6 @@ import Control.Concurrent (threadDelay, forkIOWithUnmask)
1010import qualified Control.Concurrent as Conc (yield)
1111import Control.Exception as E
1212import Control.Monad (forever, when, unless, void)
13−import Control.Monad.IO.Class (liftIO)
1413import Data.ByteString (ByteString)
1514import qualified Data.ByteString as S
1615import Data.Streaming.Network (bindPortTCP)
warp/warp.cabal−2
@@ -43,9 +43,7 @@ Library
4343 , case-insensitive >= 0.2
4444 , ghc-prim
4545 , http-types >= 0.7
46− , lifted-base >= 0.1
4746 , simple-sendfile >= 0.2.7 && < 0.3
48− , transformers >= 0.2.2 && < 0.4
4947 , unix-compat >= 0.2
5048 , void
5149 , wai >= 3.0 && < 3.1