5a7bd88 · typeable/wai

warp/Network/Wai/Handler/Warp/Conduit.hs−3

compare with master

unifiedsplit

@@ -7,9 +7,6 @@ import Control.Monad (when, unless)

7import Data.ByteString (ByteString)

8import qualified Data.ByteString as S

9import qualified Data.IORef as I

10−#if __GLASGOW_HASKELL__ < 709

11−import Data.Word (Word)

12−#endif

13import Data.Word (Word8)

10import Data.Word (Word8)

14import Network.Wai.Handler.Warp.Types

11import Network.Wai.Handler.Warp.Types

15

12

warp/Network/Wai/Handler/Warp/Counter.hs−3

@@ -8,9 +8,6 @@ module Network.Wai.Handler.Warp.Counter (

8 , decrease

9 ) where

10

11−#if __GLASGOW_HASKELL__ < 709

12−import Control.Applicative ((<$>))

13−#endif

14import Control.Concurrent.STM

11import Control.Concurrent.STM

15import Control.Monad (unless)

12import Control.Monad (unless)

16

13

warp/Network/Wai/Handler/Warp/Date.hs−3

@@ -5,9 +5,6 @@ module Network.Wai.Handler.Warp.Date (

5 , GMTDate

6 ) where

7

8−#if __GLASGOW_HASKELL__ < 709

9−import Control.Applicative

10−#endif

11import Control.AutoUpdate (defaultUpdateSettings, updateAction, mkAutoUpdate)

8import Control.AutoUpdate (defaultUpdateSettings, updateAction, mkAutoUpdate)

12import Data.ByteString.Char8

9import Data.ByteString.Char8

13import Network.HTTP.Date

10import Network.HTTP.Date

warp/Network/Wai/Handler/Warp/FdCache.hs−3

@@ -14,9 +14,6 @@ module Network.Wai.Handler.Warp.FdCache (

14 ) where

15

16#ifndef WINDOWS

17−#if __GLASGOW_HASKELL__ < 709

18−import Control.Applicative ((<$>), (<*>))

19−#endif

20import Control.Exception (bracket)

17import Control.Exception (bracket)

21import Control.Reaper

18import Control.Reaper

22import Data.IORef

19import Data.IORef

warp/Network/Wai/Handler/Warp/HTTP2/Manager.hs−3

@@ -13,9 +13,6 @@ module Network.Wai.Handler.Warp.HTTP2.Manager (

13 , deleteMyId

14 ) where

15

16−#if __GLASGOW_HASKELL__ < 709

17−import Control.Applicative

18−#endif

19import Control.Concurrent

16import Control.Concurrent

20import Control.Concurrent.STM

17import Control.Concurrent.STM

21import Control.Monad (void)

18import Control.Monad (void)

warp/Network/Wai/Handler/Warp/HTTP2/Receiver.hs−3

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

6

7module Network.Wai.Handler.Warp.HTTP2.Receiver (frameReceiver) where

8

9−#if __GLASGOW_HASKELL__ < 709

10−import Control.Applicative

11−#endif

12import Control.Concurrent

9import Control.Concurrent

13import Control.Concurrent.STM

10import Control.Concurrent.STM

14import qualified Control.Exception as E

11import qualified Control.Exception as E

warp/Network/Wai/Handler/Warp/HTTP2/Sender.hs−3

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

4

5module Network.Wai.Handler.Warp.HTTP2.Sender (frameSender) where

6

7−#if __GLASGOW_HASKELL__ < 709

8−import Control.Applicative

9−#endif

10import Control.Concurrent.STM

7import Control.Concurrent.STM

11import qualified Control.Exception as E

8import qualified Control.Exception as E

12import Control.Monad (void, when)

9import Control.Monad (void, when)

warp/Network/Wai/Handler/Warp/HTTP2/Types.hs−3

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

4

5module Network.Wai.Handler.Warp.HTTP2.Types where

6

7−#if __GLASGOW_HASKELL__ < 709

8−import Control.Applicative ((<$>),(<*>))

9−#endif

10import Control.Concurrent (forkIO)

7import Control.Concurrent (forkIO)

11import Control.Concurrent.STM

8import Control.Concurrent.STM

12import Control.Exception (SomeException, bracket)

9import Control.Exception (SomeException, bracket)

warp/Network/Wai/Handler/Warp/HTTP2/Worker.hs−4

@@ -11,10 +11,6 @@ module Network.Wai.Handler.Warp.HTTP2.Worker (

11 , worker

12 ) where

13

14−#if __GLASGOW_HASKELL__ < 709

15−import Control.Applicative

16−import Data.Monoid (mempty)

17−#endif

18import Control.Applicative ((<|>))

14import Control.Applicative ((<|>))

19import Control.Concurrent.STM

15import Control.Concurrent.STM

20import Control.Exception (SomeException(..), AsyncException(..))

16import Control.Exception (SomeException(..), AsyncException(..))

warp/Network/Wai/Handler/Warp/MultiMap.hs−3

@@ -13,9 +13,6 @@ module Network.Wai.Handler.Warp.MultiMap (

13 , merge

14 ) where

15

16−#if __GLASGOW_HASKELL__ < 709

17−import Control.Applicative ((<$>))

18−#endif

19import Data.IntMap.Strict (IntMap)

16import Data.IntMap.Strict (IntMap)

20import qualified Data.IntMap.Strict as I

17import qualified Data.IntMap.Strict as I

21import qualified Network.Wai.Handler.Warp.Some as S

18import qualified Network.Wai.Handler.Warp.Some as S

warp/Network/Wai/Handler/Warp/Recv.hs−3

@@ -9,9 +9,6 @@ module Network.Wai.Handler.Warp.Recv (

9 , spell

10 ) where

11

12−#if __GLASGOW_HASKELL__ < 709

13−import Control.Applicative ((<$>))

14−#endif

15import qualified Control.Exception as E

12import qualified Control.Exception as E

16import qualified Data.ByteString as BS

13import qualified Data.ByteString as BS

17import Data.ByteString.Internal (ByteString(..))

14import Data.ByteString.Internal (ByteString(..))

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

@@ -19,9 +19,6 @@ module Network.Wai.Handler.Warp.Response (

19#endif

20

21import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)

22−#if __GLASGOW_HASKELL__ < 709

23−import Control.Applicative

24−#endif

25import qualified Control.Exception as E

22import qualified Control.Exception as E

26import Control.Monad (unless, when)

23import Control.Monad (unless, when)

27import Data.Array ((!))

24import Data.Array ((!))

warp/Network/Wai/Handler/Warp/Run.hs−8

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

9

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

11

12−#if __GLASGOW_HASKELL__ < 709

13−import Control.Applicative ((<$>))

14−#endif

15import Control.Arrow (first)

12import Control.Arrow (first)

16import qualified Control.Concurrent as Conc (yield)

13import qualified Control.Concurrent as Conc (yield)

17import Control.Exception as E

14import Control.Exception as E

@@ -71,11 +68,6 @@ socketConnection s = do

71 , connBufferSize = bufferSize

68 , connBufferSize = bufferSize

72 }

69 }

73

70

74−#if __GLASGOW_HASKELL__ < 702

75−allowInterrupt :: IO ()

76−allowInterrupt = unblock $ return ()

77−#endif

78−

79-- | Run an 'Application' on the given port.

71-- | Run an 'Application' on the given port.

80-- This calls 'runSettings' with 'defaultSettings'.

72-- This calls 'runSettings' with 'defaultSettings'.

81run :: Port -> Application -> IO ()

73run :: Port -> Application -> IO ()

warp/Network/Wai/Handler/Warp/Settings.hs−3

@@ -10,9 +10,6 @@ import Control.Monad (when, void)

10import Data.ByteString (ByteString)

11import qualified Data.ByteString.Char8 as S8

12import Data.ByteString.Builder (byteString)

13−#if __GLASGOW_HASKELL__ < 709

14−import Data.Monoid (mappend)

15−#endif

16import Data.Streaming.Network (HostPreference)

13import Data.Streaming.Network (HostPreference)

17import qualified Data.Text as T

14import qualified Data.Text as T

18import qualified Data.Text.IO as TIO

15import qualified Data.Text.IO as TIO