git.iko.soy/typeable/wai
on master help sign in
removing warnings.
commitfc69c2e425d1366e4650fec787a10873cb0a0363 authorKazu Yamamoto <kazu@iij.ad.jp> dateWed 10 Jun 2015, 14:50 (11 years ago) parent592abdb
8 files changed+30−4
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/Conduit.hs+6−1 warp/Network/Wai/Handler/Warp/Counter.hs+5−1 warp/Network/Wai/Handler/Warp/Date.hs+2 warp/Network/Wai/Handler/Warp/FdCache.hs+2 warp/Network/Wai/Handler/Warp/MultiMap.hs+4 warp/Network/Wai/Handler/Warp/Recv.hs+2 warp/Network/Wai/Handler/Warp/Response.hs+6−1 warp/test/ExceptionSpec.hs+3−1
warp/Network/Wai/Handler/Warp/Conduit.hs+6−1
@@ -1,3 +1,5 @@
1+{-# LANGUAGE CPP #-}
2+
13module Network.Wai.Handler.Warp.Conduit where
24
35import Control.Exception
@@ -7,7 +9,10 @@ import Data.ByteString.Lazy.Char8 (pack)
79import qualified Data.ByteString as S
810import qualified Data.ByteString.Lazy as L
911import qualified Data.IORef as I
10−import Data.Word (Word, Word8)
12+#if __GLASGOW_HASKELL__ < 709
13+import Data.Word (Word)
14+#endif
15+import Data.Word (Word8)
1116import Network.Wai.Handler.Warp.Types
1217
1318----------------------------------------------------------------
warp/Network/Wai/Handler/Warp/Counter.hs+5−1
@@ -1,3 +1,5 @@
1+{-# LANGUAGE CPP #-}
2+
13module Network.Wai.Handler.Warp.Counter (
24 Counter
35 , newCounter
@@ -6,9 +8,11 @@ module Network.Wai.Handler.Warp.Counter (
68 , decrease
79 ) where
810
11+#if __GLASGOW_HASKELL__ < 709
12+import Control.Applicative ((<$>))
13+#endif
914import Control.Concurrent.STM
1015import Control.Monad (unless)
11−import Control.Applicative ((<$>))
1216
1317newtype Counter = Counter (TVar Int)
1418
warp/Network/Wai/Handler/Warp/Date.hs+2
@@ -7,7 +7,9 @@ module Network.Wai.Handler.Warp.Date (
77 , GMTDate
88 ) where
99
10+#if __GLASGOW_HASKELL__ < 709
1011import Control.Applicative
12+#endif
1113import Control.AutoUpdate (defaultUpdateSettings, updateAction, mkAutoUpdate)
1214import Data.ByteString.Char8
1315
warp/Network/Wai/Handler/Warp/FdCache.hs+2
@@ -22,7 +22,9 @@ module Network.Wai.Handler.Warp.FdCache (
2222 , Refresh
2323 ) where
2424
25+#if __GLASGOW_HASKELL__ < 709
2526import Control.Applicative ((<$>), (<*>))
27+#endif
2628import Control.Exception (bracket)
2729import Data.Hashable (hash)
2830import Network.Wai.Handler.Warp.IORef
warp/Network/Wai/Handler/Warp/MultiMap.hs+4
@@ -1,3 +1,5 @@
1+{-# LANGUAGE CPP #-}
2+
13module Network.Wai.Handler.Warp.MultiMap (
24 MMap
35 , Some(..)
@@ -16,7 +18,9 @@ module Network.Wai.Handler.Warp.MultiMap (
1618 , merge
1719 ) where
1820
21+#if __GLASGOW_HASKELL__ < 709
1922import Control.Applicative ((<$>))
23+#endif
2024import Data.List (foldl')
2125
2226----------------------------------------------------------------
warp/Network/Wai/Handler/Warp/Recv.hs+2
@@ -5,7 +5,9 @@ module Network.Wai.Handler.Warp.Recv (
55 receive
66 ) where
77
8+#if __GLASGOW_HASKELL__ < 709
89import Control.Applicative ((<$>))
10+#endif
911import Control.Monad (void)
1012import qualified Data.ByteString as BS (empty)
1113import Data.ByteString.Internal (ByteString(..), mallocByteString)
warp/Network/Wai/Handler/Warp/Response.hs+6−1
@@ -17,7 +17,9 @@ module Network.Wai.Handler.Warp.Response (
1717
1818import Blaze.ByteString.Builder (fromByteString, Builder, flush)
1919import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
20+#if __GLASGOW_HASKELL__ < 709
2021import Control.Applicative
22+#endif
2123import Control.Exception
2224import Data.Array ((!))
2325import Data.ByteString (ByteString)
@@ -30,7 +32,10 @@ import Data.Function (on)
3032import Data.List (deleteBy)
3133import Data.Maybe (isJust, listToMaybe)
3234#if MIN_VERSION_base(4,5,0)
33−import Data.Monoid ((<>), mempty)
35+# if __GLASGOW_HASKELL__ < 709
36+import Data.Monoid (mempty)
37+# endif
38+import Data.Monoid ((<>))
3439#else
3540import Data.Monoid (mappend, mempty)
3641#endif
warp/test/ExceptionSpec.hs+3−1
@@ -1,8 +1,10 @@
1−{-# LANGUAGE OverloadedStrings #-}
1+{-# LANGUAGE OverloadedStrings, CPP #-}
22
33module ExceptionSpec (main, spec) where
44
5+#if __GLASGOW_HASKELL__ < 709
56import Control.Applicative
7+#endif
68import Control.Monad
79import Network.HTTP
810import Network.Stream