9034b2d · streamly · git.iko.soy

git.iko.soy/streamly

Merge pull request #408 from SanchayanMaity/hlint_cleanup_1

Hlint cleanup for Data, FileSystem and Memory directory

commit9034b2d37008ffc649073cdbebd82b733414e943 authorHarendra Kumar <harendra.kumar@gmail.com> dateMon 17 Feb 2020, 15:28 (7 years ago) parent61eb4eb bbfffe8

10 files changed+15−51

compare with master

unifiedsplit

src/Streamly/Data/Unfold.hs−3 src/Streamly/FileSystem/FD.hs+4−8 src/Streamly/FileSystem/FDIO.hs−3 src/Streamly/FileSystem/Handle.hs−4 src/Streamly/Internal/Mutable/Prim/Var.hs−2 src/Streamly/Internal/Network/Inet/TCP.hs+3−8 src/Streamly/Internal/Network/Socket.hs+4−11 src/Streamly/Memory/Array.hs−4 src/Streamly/Memory/Malloc.hs+2−6 src/Streamly/Memory/Ring.hs+2−2

src/Streamly/Data/Unfold.hs−3

@@ -1,12 +1,9 @@

1−{-# LANGUAGE BangPatterns #-}

21{-# LANGUAGE CPP #-}

32{-# LANGUAGE ExistentialQuantification #-}

43{-# LANGUAGE FlexibleContexts #-}

54{-# LANGUAGE PatternSynonyms #-}

65{-# LANGUAGE RankNTypes #-}

7−{-# LANGUAGE RecordWildCards #-}

86{-# LANGUAGE ScopedTypeVariables #-}

9−{-# LANGUAGE TupleSections #-}

107

118#include "inline.hs"

129

src/Streamly/FileSystem/FD.hs+4−8

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

11{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

3−{-# LANGUAGE MagicHash #-}

4−{-# LANGUAGE RecordWildCards #-}

5−{-# LANGUAGE UnboxedTuples #-}

73#include "inline.hs"

@@ -204,7 +200,7 @@ stderr = Handle FD.stderr

204200-- the same absolute path name and neither has been renamed, for example.

205201--

206202openFile :: FilePath -> IOMode -> IO Handle

207−openFile path mode = fmap (Handle . fst) $ FD.openFile path mode True

203+openFile path mode = Handle . fst <$> FD.openFile path mode True

208204

209205-------------------------------------------------------------------------------

210206-- Array IO (Input)

@@ -241,7 +237,7 @@ readArrayUpto size (Handle fd) = do

241237{-# INLINABLE writeArray #-}

242238writeArray :: Storable a => Handle -> Array a -> IO ()

243239writeArray _ arr | A.length arr == 0 = return ()

244−writeArray (Handle fd) arr = withForeignPtr (aStart arr) $ \p -> do

240+writeArray (Handle fd) arr = withForeignPtr (aStart arr) $ \p ->

245241 -- RawIO.writeAll fd (castPtr p) aLen

246242 RawIO.write fd (castPtr p) aLen

247243 {-

@@ -349,7 +345,7 @@ read = AS.concat . readArrays

349345-- @since 0.7.0

350346{-# INLINE writeArrays #-}

351347writeArrays :: (MonadIO m, Storable a) => Handle -> SerialT m (Array a) -> m ()

352−writeArrays h m = S.mapM_ (liftIO . writeArray h) m

348+writeArrays h = S.mapM_ (liftIO . writeArray h)

353349

354350-- | Write a stream of arrays to a handle after coalescing them in chunks of

355351-- specified size. The chunk size is only a maximum and the actual writes could

@@ -369,7 +365,7 @@ writeArraysPackedUpto n h xs = writeArrays h $ AS.compact n xs

369365-- @since 0.7.0

370366{-# INLINE writev #-}

371367writev :: MonadIO m => Handle -> SerialT m (Array RawIO.IOVec) -> m ()

372−writev h m = S.mapM_ (liftIO . writeIOVec h) m

368+writev h = S.mapM_ (liftIO . writeIOVec h)

373369

374370-- XXX this is incomplete

375371-- | Write a stream of arrays to a handle after grouping them in 'IOVec' arrays

src/Streamly/FileSystem/FDIO.hs−3

@@ -1,8 +1,5 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE BangPatterns #-}

3−{-# LANGUAGE MagicHash #-}

4−{-# LANGUAGE RecordWildCards #-}

5−{-# LANGUAGE UnboxedTuples #-}

74#include "inline.hs"

src/Streamly/FileSystem/Handle.hs−4

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

11{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

3−{-# LANGUAGE MagicHash #-}

4−{-# LANGUAGE RecordWildCards #-}

5−{-# LANGUAGE UnboxedTuples #-}

73#include "inline.hs"

src/Streamly/Internal/Mutable/Prim/Var.hs−2

@@ -1,9 +1,7 @@

1−{-# LANGUAGE BangPatterns #-}

21{-# LANGUAGE ConstraintKinds #-}

32{-# LANGUAGE CPP #-}

43{-# LANGUAGE ExistentialQuantification #-}

54{-# LANGUAGE MagicHash #-}

6−{-# LANGUAGE RecordWildCards #-}

75{-# LANGUAGE UnboxedTuples #-}

86{-# LANGUAGE ScopedTypeVariables #-}

src/Streamly/Internal/Network/Inet/TCP.hs+3−8

@@ -1,9 +1,5 @@

11{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

32{-# LANGUAGE FlexibleContexts #-}

4−{-# LANGUAGE MagicHash #-}

5−{-# LANGUAGE RecordWildCards #-}

6−{-# LANGUAGE UnboxedTuples #-}

84#include "inline.hs"

@@ -359,13 +355,12 @@ writeChunks addr port = Fold step initial extract

359355 where

360356 initial = do

361357 skt <- liftIO (connect addr port)

362− fld <- FL.initialize (SK.writeChunks skt)

363− `MC.onException` (liftIO $ Net.close skt)

358+ fld <- FL.initialize (SK.writeChunks skt) `MC.onException` liftIO (Net.close skt)

364359 return (fld, skt)

365360 step (fld, skt) x = do

366− r <- FL.runStep fld x `MC.onException` (liftIO $ Net.close skt)

361+ r <- FL.runStep fld x `MC.onException` liftIO (Net.close skt)

367362 return (r, skt)

368− extract ((Fold _ initial1 extract1), skt) = do

363+ extract (Fold _ initial1 extract1, skt) = do

369364 liftIO $ Net.close skt

370365 initial1 >>= extract1

371366

src/Streamly/Internal/Network/Socket.hs+4−11

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

11{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

32{-# LANGUAGE FlexibleContexts #-}

4−{-# LANGUAGE MagicHash #-}

53{-# LANGUAGE RecordWildCards #-}

6−{-# LANGUAGE UnboxedTuples #-}

85#include "inline.hs"

@@ -78,11 +75,10 @@ import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

7875import Foreign.Ptr (minusPtr, plusPtr, Ptr, castPtr)

7976import Foreign.Storable (Storable(..))

8077import GHC.ForeignPtr (mallocPlainForeignPtrBytes)

81−import Network.Socket (sendBuf, recvBuf)

8278import Network.Socket

8379 (Socket, SocketOption(..), Family(..), SockAddr(..),

8480 ProtocolNumber, withSocketsDo, SocketType(..), socket, bind,

85− setSocketOption)

81+ setSocketOption, sendBuf, recvBuf)

8682#if MIN_VERSION_network(3,1,0)

8783import Network.Socket (withFdSocket)

8884#else

@@ -160,9 +156,7 @@ listenTuples :: MonadIO m

160156 => Unfold m (Int, SockSpec, SockAddr) (Socket, SockAddr)

161157listenTuples = Unfold step inject

162158 where

163− inject (listenQLen, spec, addr) = do

164− listener <- liftIO $ initListener listenQLen spec addr

165− return listener

159+ inject (listenQLen, spec, addr) = liftIO $ initListener listenQLen spec addr

166160

167161 step listener = do

168162 r <- liftIO $ Net.accept listener

@@ -208,8 +202,7 @@ recvConnectionTuplesWith tcpListenQ spec addr = S.unfoldrM step Nothing

208202-- /Internal/

209203{-# INLINE connections #-}

210204connections :: MonadAsync m => Int -> SockSpec -> SockAddr -> SerialT m Socket

211−connections tcpListenQ spec addr = fmap fst $

212− recvConnectionTuplesWith tcpListenQ spec addr

205+connections tcpListenQ spec addr = fst <$> recvConnectionTuplesWith tcpListenQ spec addr

213206

214207-------------------------------------------------------------------------------

215208-- Array IO (Input)

@@ -416,7 +409,7 @@ read = UF.supplyFirst readWithBufferOf A.defaultChunkSize

416409{-# INLINE fromChunks #-}

417410fromChunks :: (MonadIO m, Storable a)

418411 => Socket -> SerialT m (Array a) -> m ()

419−fromChunks h m = S.mapM_ (liftIO . writeChunk h) m

412+fromChunks h = S.mapM_ (liftIO . writeChunk h)

420413

421414-- | Write a stream of arrays to a socket. Each array in the stream is written

422415-- to the socket as a separate IO request.

src/Streamly/Memory/Array.hs−4

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

1−{-# LANGUAGE BangPatterns #-}

21{-# LANGUAGE CPP #-}

3−{-# LANGUAGE MagicHash #-}

4−{-# LANGUAGE RecordWildCards #-}

5−{-# LANGUAGE UnboxedTuples #-}

62{-# LANGUAGE ScopedTypeVariables #-}

84#include "inline.hs"

src/Streamly/Memory/Malloc.hs+2−6

@@ -1,11 +1,7 @@

11{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

32{-# LANGUAGE ExistentialQuantification #-}

4−{-# LANGUAGE MagicHash #-}

5−{-# LANGUAGE RecordWildCards #-}

63{-# LANGUAGE ScopedTypeVariables #-}

74{-# LANGUAGE TypeFamilies #-}

8−{-# LANGUAGE UnboxedTuples #-}

95{-# LANGUAGE FlexibleContexts #-}

106

117#include "inline.hs"

@@ -40,8 +36,8 @@ import qualified GHC.ForeignPtr as GHC

4036{-# INLINE mallocForeignPtrAlignedBytes #-}

4137mallocForeignPtrAlignedBytes :: Int -> Int -> IO (GHC.ForeignPtr a)

4238#ifdef USE_GHC_MALLOC

43−mallocForeignPtrAlignedBytes size alignment = do

44− GHC.mallocPlainForeignPtrAlignedBytes size alignment

39+mallocForeignPtrAlignedBytes =

40+ GHC.mallocPlainForeignPtrAlignedBytes

4541#else

4642mallocForeignPtrAlignedBytes size _alignment = do

4743 p <- mallocBytes size

src/Streamly/Memory/Ring.hs+2−2

@@ -69,7 +69,7 @@ new count = do

6969 let size = count * sizeOf (undefined :: a)

7070 fptr <- mallocPlainForeignPtrAlignedBytes size (alignment (undefined :: a))

7171 let p = unsafeForeignPtrToPtr fptr

72− return $ (Ring

72+ return (Ring

7373 { ringStart = fptr

7474 , ringBound = p `plusPtr` size

7575 }, p)

@@ -105,7 +105,7 @@ unsafeEqArrayN :: Ring a -> Ptr a -> A.Array a -> Int -> Bool

105105unsafeEqArrayN Ring{..} rh A.Array{..} n =

106106 let !res = A.unsafeInlineIO $ do

107107 let rs = unsafeForeignPtrToPtr ringStart

108− let as = unsafeForeignPtrToPtr aStart

108+ as = unsafeForeignPtrToPtr aStart

109109 assert (aBound `minusPtr` as >= ringBound `minusPtr` rs) (return ())

110110 let len = ringBound `minusPtr` rh

111111 r1 <- A.memcmp (castPtr rh) (castPtr as) (min len n)