ce2426d · streamly · git.iko.soy

git.iko.soy/streamly

on master help sign in

Fix CI build issues

ce2426dRanjeet Ranjan6 years ago

src/Streamly/Internal/FileSystem/Event/Linux.hs+4

compare with master

unifiedsplit

@@ -156,6 +156,10 @@ import Data.Functor.Identity (runIdentity)

156import Data.IntMap.Lazy (IntMap)

157import Data.IORef (IORef, newIORef, readIORef, writeIORef, modifyIORef)

158import Data.List.NonEmpty (NonEmpty)

159+

160+#if __GLASGOW_HASKELL__ < 808

161+import Data.Semigroup (Semigroup(..))

162+#endif

159import Data.Word (Word8, Word32)

163import Data.Word (Word8, Word32)

160import Foreign.C.Error (throwErrnoIfMinus1)

164import Foreign.C.Error (throwErrnoIfMinus1)

161import Foreign.C.String (CString)

165import Foreign.C.String (CString)

test/Streamly/Test/FileSystem/Event.hs+6−2

@@ -10,7 +10,9 @@ module Main (main) where

11import Control.Concurrent (MVar, newEmptyMVar, putMVar, takeMVar, threadDelay)

12import Control.Monad.IO.Class (MonadIO)

13+#if !defined(CABAL_OS_WINDOWS)

13import Data.Char (ord)

14import Data.Char (ord)

15+#endif

14import Data.Maybe (fromJust)

16import Data.Maybe (fromJust)

15import Data.Word (Word8)

17import Data.Word (Word8)

16import System.Directory

18import System.Directory

@@ -24,7 +26,9 @@ import System.Directory

24import System.FilePath ((</>))

26import System.FilePath ((</>))

25import System.IO (BufferMode(..), hSetBuffering, stdout)

27import System.IO (BufferMode(..), hSetBuffering, stdout)

26import System.IO.Temp (withSystemTempDirectory)

28import System.IO.Temp (withSystemTempDirectory)

29+#if !defined(CABAL_OS_WINDOWS)

27import System.IO.Unsafe (unsafePerformIO)

30import System.IO.Unsafe (unsafePerformIO)

31+#endif

28import Streamly.Internal.Data.Array.Storable.Foreign (Array)

32import Streamly.Internal.Data.Array.Storable.Foreign (Array)

30import Test.Hspec

34import Test.Hspec

@@ -160,8 +164,8 @@ renameFileNestedDirEvents =

160 ]

164 ]

161

165

162-- | Convert an 'Event' record to a short representation for unit test.

166-- | Convert an 'Event' record to a short representation for unit test.

163−showEventShort :: Event -> String

167+showEventShort :: Event.Event -> String

164−showEventShort ev@Event{..} = getRelPath ev ++ "_" ++ show eventFlags

168+showEventShort ev@Event.Event{..} = Event.getRelPath ev ++ "_" ++ show eventFlags

165

169

166#else

170#else

167

171