git.iko.soy/typeable/wai
on master help sign in
hlint suggestions.
commit5eefe02ad6dd72c7f840383737afeddc669b3cf8 authorKazu Yamamoto <kazu@iij.ad.jp> dateThu 14 Aug 2014, 16:02 (12 years ago) parentf70da8d
5 files changed+14−14
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/Conduit.hs+3−3 warp/Network/Wai/Handler/Warp/FdCache.hs+1−1 warp/Network/Wai/Handler/Warp/RequestHeader.hs+3−3 warp/Network/Wai/Handler/Warp/Run.hs+5−4 warp/Network/Wai/Handler/Warp/Timeout.hs+2−3
warp/Network/Wai/Handler/Warp/Conduit.hs+3−3
@@ -152,9 +152,9 @@ readCSource (CSource src ref) = do
152152 (x, y)
153153 | S.null y -> do
154154 bs2 <- readSource' src
155− if S.null bs2
156− then return (x, y)
157− else return $ S.breakByte 10 $ bs `S.append` bs2
155+ return $ if S.null bs2
156+ then (x, y)
157+ else S.breakByte 10 $ bs `S.append` bs2
158158 | otherwise -> return (x, y)
159159 let w =
160160 S.foldl' (\i c -> i * 16 + fromIntegral (hexToWord c)) 0
warp/Network/Wai/Handler/Warp/FdCache.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE BangPatterns, FlexibleInstances, CPP #-}
1+{-# LANGUAGE BangPatterns, CPP #-}
22
33-- | File descriptor cache to avoid locks in kernel.
44
warp/Network/Wai/Handler/Warp/RequestHeader.hs+3−3
@@ -103,10 +103,10 @@ parseRequestLine requestLine@(PS fptr off len) = withForeignPtr fptr $ \ptr -> d
103103 httpVersion httpptr = do
104104 major <- peek $ httpptr `plusPtr` 5
105105 minor <- peek $ httpptr `plusPtr` 7
106− if major == (49 :: Word8) && minor == (49 :: Word8) then
107− return H.http11
106+ return $ if major == (49 :: Word8) && minor == (49 :: Word8) then
107+ H.http11
108108 else
109− return H.http10
109+ H.http10
110110 bs ptr p0 p1 = PS fptr o l
111111 where
112112 o = p0 `minusPtr` ptr
warp/Network/Wai/Handler/Warp/Run.hs+5−4
@@ -6,21 +6,22 @@
66
77module Network.Wai.Handler.Warp.Run where
88
9+import Control.Arrow (first)
910import Control.Concurrent (threadDelay, forkIOWithUnmask)
1011import qualified Control.Concurrent as Conc (yield)
1112import Control.Exception as E
1213import Control.Monad (forever, when, unless, void)
1314import Data.ByteString (ByteString)
1415import qualified Data.ByteString as S
16+import Data.IORef (IORef, newIORef, readIORef, writeIORef)
1517import Data.Streaming.Network (bindPortTCP)
1618import Network (sClose, Socket)
1719import Network.Socket (accept, withSocketsDo, SockAddr)
1820import qualified Network.Socket.ByteString as Sock
1921import Network.Wai
20−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
22+import Network.Wai.Handler.Warp.Buffer
2123import qualified Network.Wai.Handler.Warp.Date as D
2224import qualified Network.Wai.Handler.Warp.FdCache as F
23−import Network.Wai.Handler.Warp.Buffer
2425import Network.Wai.Handler.Warp.Header
2526import Network.Wai.Handler.Warp.Recv
2627import Network.Wai.Handler.Warp.Request
@@ -29,7 +30,7 @@ import Network.Wai.Handler.Warp.SendFile
2930import Network.Wai.Handler.Warp.Settings
3031import qualified Network.Wai.Handler.Warp.Timeout as T
3132import Network.Wai.Handler.Warp.Types
32−import Data.IORef (IORef, newIORef, readIORef, writeIORef)
33+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
3334
3435#if WINDOWS
3536import Network.Wai.Handler.Warp.Windows
@@ -112,7 +113,7 @@ runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Applic
112113runSettingsConnectionMaker x y =
113114 runSettingsConnectionMakerSecure x (go y)
114115 where
115− go = fmap (\(a, b) -> (fmap (, False) a, b))
116+ go = fmap (first (fmap (, False)))
116117
117118-- | Allows you to provide a function which will return a function
118119-- which will return 'Connection'.
warp/Network/Wai/Handler/Warp/Timeout.hs+2−3
@@ -1,7 +1,6 @@
11{-# LANGUAGE CPP #-}
2−{-# LANGUAGE BangPatterns #-}
32{-# LANGUAGE DeriveDataTypeable #-}
4−{-# LANGUAGE UnboxedTuples, MagicHash #-}
3+{-# LANGUAGE MagicHash #-}
54
65-- |
76--
@@ -133,7 +132,7 @@ registerKillThread m = do
133132-- deRefWeak checks if ThreadId referenced by the weak reference
134133-- exists. If exists, it means that the thread is alive.
135134killIfExist :: Weak ThreadId -> TimeoutAction
136−killIfExist wtid = deRefWeak wtid >>= maybe (return ()) (flip E.throwTo TimeoutThread)
135+killIfExist wtid = deRefWeak wtid >>= maybe (return ()) (`E.throwTo` TimeoutThread)
137136
138137data TimeoutThread = TimeoutThread
139138 deriving Typeable