ebb7ca9 · typeable/wai

git.iko.soy/typeable/wai

accepting hlint suggestions.

commitebb7ca988f2d6f92a75e1d4094c35d31a78f840d authorKazu Yamamoto <kazu@iij.ad.jp> dateWed 22 Nov 2017, 16:51 (9 years ago) parentabbc38e

14 files changed+14−18

compare with master

unifiedsplit

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

@@ -1,4 +1,4 @@

1−{-# LANGUAGE BangPatterns, OverloadedStrings #-}

1+{-# LANGUAGE BangPatterns #-}

33module Network.Wai.Handler.Warp.Buffer (

44 bufferSize

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

@@ -43,7 +43,7 @@ withFdCache _ action = action getFdNothing

4343withFdCache 0 action = action getFdNothing

4444withFdCache duration action = bracket (initialize duration)

4545 terminate

46− (\mfc -> action (getFd mfc))

46+ (action . getFd)

4747

4848----------------------------------------------------------------

4949

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

@@ -91,7 +91,7 @@ withFileInfoCache 0 action = action getInfoNaive

9191withFileInfoCache duration action =

9292 E.bracket (initialize duration)

9393 terminate

94− (\r -> action (getAndRegisterInfo r))

94+ (action . getAndRegisterInfo)

9595

9696initialize :: Hash -> IO FileInfoCache

9797initialize duration = mkReaper settings

warp/Network/Wai/Handler/Warp/HTTP2/EncodeFrame.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−

31module Network.Wai.Handler.Warp.HTTP2.EncodeFrame where

53import Data.ByteString (ByteString)

warp/Network/Wai/Handler/Warp/HTTP2/File.hs+1−1

@@ -1,6 +1,6 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE BangPatterns, RecordWildCards #-}

3+{-# LANGUAGE BangPatterns #-}

55module Network.Wai.Handler.Warp.HTTP2.File (

66 RspFileInfo(..)

warp/Network/Wai/Handler/Warp/HTTP2/Receiver.hs+1−1

@@ -165,7 +165,7 @@ frameReceiver ctx mkreq recvN = loop 0 `E.catch` sendGoaway

165165 when (ftyp `notElem` [FrameHeaders,FramePriority]) $

166166 E.throwIO $ ConnectionError ProtocolError "this frame is not allowed in an idel stream"

167167 csid <- readIORef clientStreamId

168− if streamId <= csid then do

168+ if streamId <= csid then

169169 if ftyp == FramePriority then

170170 return Nothing -- will be ignored

171171 else

warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+4−4

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings, CPP #-}

1+{-# LANGUAGE CPP #-}

22{-# LANGUAGE BangPatterns #-}

44module Network.Wai.Handler.Warp.HTTP2.Request (

@@ -91,7 +91,7 @@ mkRequest' ii1 settings addr ref (reqths,reqvt) (bodylen,body) = return (req,ii)

9191

9292getHTTP2DataKey :: Vault.Key (IO (Maybe HTTP2Data))

9393getHTTP2DataKey = unsafePerformIO Vault.newKey

94−{-# NOINLINE getHTTP2Data #-}

94+{-# NOINLINE getHTTP2DataKey #-}

9595

9696-- | Getting 'HTTP2Data' through vault of the request.

9797-- Warp uses this to receive 'HTTP2Data' from 'Middleware'.

@@ -104,7 +104,7 @@ getHTTP2Data req = case Vault.lookup getHTTP2DataKey (vault req) of

104104

105105setHTTP2DataKey :: Vault.Key (Maybe HTTP2Data -> IO ())

106106setHTTP2DataKey = unsafePerformIO Vault.newKey

107−{-# NOINLINE setHTTP2Data #-}

107+{-# NOINLINE setHTTP2DataKey #-}

108108

109109-- | Setting 'HTTP2Data' through vault of the request.

110110-- 'Application' or 'Middleware' should use this.

@@ -117,7 +117,7 @@ setHTTP2Data req mh2d = case Vault.lookup setHTTP2DataKey (vault req) of

117117

118118modifyHTTP2DataKey :: Vault.Key ((Maybe HTTP2Data -> Maybe HTTP2Data) -> IO ())

119119modifyHTTP2DataKey = unsafePerformIO Vault.newKey

120−{-# NOINLINE modifyHTTP2Data #-}

120+{-# NOINLINE modifyHTTP2DataKey #-}

121121

122122-- | Modifying 'HTTP2Data' through vault of the request.

123123-- 'Application' or 'Middleware' should use this.

warp/Network/Wai/Handler/Warp/HTTP2/Sender.hs+1−1

@@ -293,7 +293,7 @@ frameSender ctx@Context{outputQ,controlQ,connectionWindow,encodeDynamicTable}

293293 sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen

294294 handleEndOfBody True off0 noTrailers trailers = do

295295 off1 <- handleTrailers noTrailers off0 trailers

296− void $ tell

296+ void tell

297297 closed ctx strm Finished

298298 return off1

299299 handleEndOfBody False off0 _ _ = return off0

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

@@ -15,7 +15,7 @@ hashByteString :: ByteString -> Hash

1515hashByteString = hash

1616

1717empty :: HashMap k v

18−empty = HashMap $ I.empty

18+empty = HashMap I.empty

1919

2020null :: HashMap k v -> Bool

2121null (HashMap hm) = I.null hm

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

@@ -1,4 +1,4 @@

1−{-# LANGUAGE CPP, BangPatterns #-}

1+{-# LANGUAGE CPP #-}

33module Network.Wai.Handler.Warp.MultiMap (

44 MMap

warp/Network/Wai/Handler/Warp/RequestHeader.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21{-# LANGUAGE BangPatterns #-}

43module Network.Wai.Handler.Warp.RequestHeader (

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

@@ -1,6 +1,5 @@

11{-# LANGUAGE OverloadedStrings #-}

22{-# LANGUAGE ScopedTypeVariables #-}

3−{-# LANGUAGE TupleSections #-}

43{-# LANGUAGE RankNTypes #-}

54{-# LANGUAGE CPP #-}

65{-# LANGUAGE BangPatterns #-}

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

@@ -24,7 +24,7 @@ composeHeader !httpversion !status !responseHeaders = create len $ \ptr -> do

2424 void $ copyCRLF ptr2

2525 where

2626 !len = 17 + slen + foldl' fieldLength 0 responseHeaders

27− fieldLength !l !(k,v) = l + S.length (CI.original k) + S.length v + 4

27+ fieldLength !l (!k,!v) = l + S.length (CI.original k) + S.length v + 4

2828 !slen = S.length $ H.statusMessage status

2929

3030httpVer11 :: ByteString

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

@@ -84,7 +84,7 @@ data Waiter a

8484mkWaiter :: IO (Waiter a)

8585mkWaiter = do

8686 mvar <- newEmptyMVar

87− return $ Waiter {

87+ return Waiter {

8888 notify = putMVar mvar,

8989 waitFor = readMVar mvar

9090 }