acc13e0 · typeable/wai

git.iko.soy/typeable/wai

using <$> instead of fmap.

commitacc13e02c97b7636ecf2a61c968108e0c9d55ef3 authorKazu Yamamoto <kazu@iij.ad.jp> dateFri 18 Sep 2015, 12:30 (11 years ago) parentd289d1d

3 files changed+8−5

compare with master

unifiedsplit

warp/Network/Wai/Handler/Warp/Recv.hs+1−1 warp/Network/Wai/Handler/Warp/Response.hs+1−1 warp/Network/Wai/Handler/Warp/Run.hs+6−3

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

@@ -114,7 +114,7 @@ receiveBuf sock buf0 siz0 = loop buf0 siz0

114114receiveloop :: CInt -> Ptr Word8 -> CSize -> IO CInt

115115receiveloop sock ptr size = do

116116#ifdef mingw32_HOST_OS

117− bytes <- windowsThreadBlockHack $ fmap fromIntegral $ readRawBufferPtr "recv" (FD sock 1) (castPtr ptr) 0 size

117+ bytes <- windowsThreadBlockHack . fromIntegral <$> readRawBufferPtr "recv" (FD sock 1) (castPtr ptr) 0 size

118118#else

119119 bytes <- c_recv sock (castPtr ptr) size 0

120120#endif

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

@@ -184,7 +184,7 @@ sendResponse defServer conn ii req reqidxhdr src (sanitizeHeaders -> response) =

184184 ResponseRaw {} -> False

185185

186186sanitizeHeaders :: Response -> Response

187−sanitizeHeaders = mapResponseHeaders (map (fmap sanitizeHeaderValue))

187+sanitizeHeaders = mapResponseHeaders (map (sanitizeHeaderValue <$>))

188188

189189sanitizeHeaderValue :: ByteString -> ByteString

190190sanitizeHeaderValue v

warp/Network/Wai/Handler/Warp/Run.hs+6−3

@@ -6,6 +6,9 @@

77module Network.Wai.Handler.Warp.Run where

9+#if __GLASGOW_HASKELL__ < 709

10+import Control.Applicative ((<$>))

11+#endif

912import Control.Arrow (first)

1013import Control.Concurrent (threadDelay)

1114import qualified Control.Concurrent as Conc (yield)

@@ -102,7 +105,7 @@ runHTTP2Env port = runServeEnv port .: serveHTTP2

102105-- | The generalized form of 'runEnv'.

103106runServeEnv :: Port -> ServeConnection -> IO ()

104107runServeEnv p serveConn = do

105− mp <- fmap (lookup "PORT") getEnvironment

108+ mp <- lookup "PORT" <$> getEnvironment

106109

107110 maybe (runServe p serveConn) runReadPort mp

108111

@@ -210,9 +213,9 @@ runServeSettingsConnectionMaker :: Settings

210213 -> ServeConnection

211214 -> IO ()

212215runServeSettingsConnectionMaker x y =

213− runServeSettingsConnectionMakerSecure x (go y)

216+ runServeSettingsConnectionMakerSecure x (toTCP <$> y)

214217 where

215− go = fmap (first (fmap (, TCP)))

218+ toTCP = first ((, TCP) <$>)

216219

217220----------------------------------------------------------------

218221