Fix warnings and enable Werror on Windows

Author: harendra-kumar

.github/workflows/haskell.yml

@@ -240,6 +240,7 @@ jobs:
             pack_options: >-
               GHC_PATH=/c/ghcup/bin/ghc
               CABAL_PATH=/c/ghcup/bin/cabal
+              CABAL_PROJECT=cabal.project.d/master-Werror
               DISABLE_SDIST_BUILD=y
               DISABLE_SDIST_PROJECT_CHECK=y
               DISABLE_SDIST_GIT_CHECK=y

src/Streamly/Coreutils/Common.hs

@@ -1,11 +1,17 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE PatternSynonyms #-}
 
 -- | This module is deprecated. Use 'Data.Bool' and 'Bool' instead.
 module Streamly.Coreutils.Common
     {-# DEPRECATED "This module is deprecated. Please use 'Bool' from 'Data.Bool' instead." #-}
     ( Switch
+#if __GLASGOW_HASKELL__ >= 914
+    , data On
+    , data Off
+#else
     , pattern On
     , pattern Off
+#endif
     ) where
 
 -- Define Switch as a Bool alias

src/Streamly/Coreutils/FileTest.hs

@@ -68,11 +68,6 @@
 -- > test path (size (> 4096))
 -- > test path (modifyTimeComparedTo (>) "reference.txt")
 
--- $setup
--- >>> import Prelude hiding (or, and)
--- >>> import Data.Time.Clock (NominalDiffTime)
--- >>> import Data.Time.Clock.POSIX (POSIXTime)
-
 module Streamly.Coreutils.FileTest
     (
     -- * File Test Predicate Type
@@ -251,12 +246,16 @@ import qualified System.PosixCompat.Files as Files
 import qualified Streamly.Coreutils.FileTest.Posix as FileTest
 #else
 import qualified Streamly.Coreutils.FileTest.Windows as FileTest
-import System.Win32.Types
 #endif
 
 import Streamly.Coreutils.FileTest.Common
 import Prelude hiding (and, or)
 
+-- $setup
+-- >>> import Prelude hiding (or, and)
+-- >>> import Data.Time.Clock (NominalDiffTime)
+-- >>> import Data.Time.Clock.POSIX (POSIXTime)
+
 -------------------------------------------------------------------------------
 -- User and group ownerships
 -------------------------------------------------------------------------------
@@ -334,7 +333,7 @@ isOwnedByCurrentGroup = FileTest.isOwnedByCurrentGroup
 -------------------------------------------------------------------------------
 
 hasPermissions :: (FileMode, FileMode, FileMode) -> FileTest
-hasPermissions (user, group, other) = withStateM $ \fp st -> do
+hasPermissions (user, _group, _other) = withStateM $ \fp st -> do
     isOwner <- testWithStatus fp st isOwnedByCurrentUser
     let checkMode = testWithStatus fp st . hasMode
     if isOwner
@@ -344,8 +343,8 @@ hasPermissions (user, group, other) = withStateM $ \fp st -> do
         -- XXX need to check access via other group memberships as well
         isGroup <- testWithStatus fp st FileTest.isOwnedByCurrentGroup
         if isGroup
-        then checkMode group
-        else checkMode other
+        then checkMode _group
+        else checkMode _other
 #else
     else return False
 #endif

src/Streamly/Coreutils/FileTest/Windows.hsc

@@ -3,11 +3,11 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Streamly.Coreutils.FileTest.Windows
-    ( Uid
-    , Gid
-    , sameFileAs
+    ( sameFileAs
     , isTerminalFd
     {-
+    , Uid
+    , Gid
     , isOwnedByUserId
     , isOwnedByGroupId
     -}
@@ -35,10 +35,7 @@ import Control.Exception
     , throwIO
     )
 
-import Data.Bits (shiftL, (.|.), (.&.))
-import Data.Word (Word64)
 import Foreign.C.Types (CInt(..))
-import Foreign.Ptr (nullPtr)
 import System.PosixCompat.Files (FileStatus, isSymbolicLink, ownerWriteMode)
 import System.Posix.Types (Fd(..))
 import System.Win32.Console (getConsoleMode)
@@ -68,7 +65,6 @@ import System.Win32.File
     )
 import System.Win32.Security
     ( PSID
-    , SID
     , dACL_SECURITY_INFORMATION
     , oWNER_SECURITY_INFORMATION
     )
@@ -91,12 +87,12 @@ import Streamly.Coreutils.FileTest.Common
 -- Types
 -------------------------------------------------------------------------------
 
+{-
 -- | Wraps a Windows SID pointer representing a user identity.
 newtype Uid = Uid PSID
 -- | Wraps a Windows SID pointer representing a group identity.
 newtype Gid = Gid PSID
 
-{-
 isOwnedByUserId :: Uid -> FileTest
 isOwnedByUserId (Uid uid) = withPathM $ \fp -> undefined
 
@@ -269,7 +265,7 @@ fileId path =
     withFileHandle path $ \h -> do
         info <- getFileInformationByHandle h
         let vol = bhfiVolumeSerialNumber info
-            idx = fromIntegral (bhfiFileIndex info) :: Word64
+            idx = bhfiFileIndex info
         pure (vol, idx)
 
 -- | True if both paths refer to the same underlying file or directory,
@@ -306,7 +302,7 @@ isConsoleHandle h =
 isTerminalFd :: Fd -> FileTest
 isTerminalFd (Fd fd) =
     withPathM $ \_ -> do
-        h <- c_get_osfhandle (fromIntegral fd)
+        h <- c_get_osfhandle fd
         if h == iNVALID_HANDLE_VALUE
         then pure False
         else do
@@ -576,9 +572,6 @@ isExecutable = withPathM pathIsExecutable
 fILE_ATTRIBUTE_DIRECTORY    :: DWORD
 fILE_ATTRIBUTE_DIRECTORY    = 0x10
 
-fILE_ATTRIBUTE_REPARSE_POINT :: DWORD
-fILE_ATTRIBUTE_REPARSE_POINT = 0x400
-
 -- | True iff the path is a reparse point (symlink or junction) that the OS
 -- also marks as a directory object.
 isPathDirSymLink :: FilePath -> FileStatus -> IO Bool

src/Streamly/Coreutils/Rm.hs

@@ -87,14 +87,16 @@ where
 import Control.Monad (forM_, when)
 import Streamly.Coreutils.FileTest
     (doesItExist, test, testl, isDir, isWritableByMode)
-#if defined(mingw32_HOST_OS)
+#if defined(CABAL_OS_WINDOWS)
 import Streamly.Coreutils.FileTest.Windows (isDirSymLink)
 #endif
 import System.Directory
     ( getPermissions
     , removeFile
     , removeDirectory
+#if !defined(CABAL_OS_WINDOWS)
     , removeDirectoryRecursive
+#endif
     , removePathForcibly
     , setPermissions
     , listDirectory
@@ -175,7 +177,7 @@ rmdir options path =
             case rmForce options of
                 FullForce -> removePathForcibly path
                 Force ->
-#if defined(mingw32_HOST_OS)
+#if defined(CABAL_OS_WINDOWS)
                     -- On Unix removePathForcibly makes directories writable to
                     -- facilitate removal of files in them, but on Windows
                     -- directory attributes do not affect file deletion, it
@@ -212,7 +214,7 @@ rmfile options path =
         FullForce -> removePathForcibly path
         NoForce   -> withWriteProtectionCheck path removeFile "regular file"
         Force     -> do
-#if defined(mingw32_HOST_OS)
+#if defined(CABAL_OS_WINDOWS)
             -- On Windows, file deletability is tied to the file's own
             -- read-only attribute (unlike POSIX where only parent-dir write
             -- matters). Force must clear it before unlinking.
@@ -227,7 +229,7 @@ performRm options path = do
     if dir
     then rmdir options path
     else do
-#if defined(mingw32_HOST_OS)
+#if defined(CABAL_OS_WINDOWS)
         dirSymLink <- testl path isDirSymLink
         if dirSymLink
         then do

test/Streamly/Test/Coreutils/Rm.hs

@@ -143,7 +143,7 @@ mode___ = nullFileMode
 -- the action is run but its result is ignored.
 parentDirPermCheck :: IO () -> IO ()
 parentDirPermCheck =
-#if defined(mingw32_HOST_OS)
+#if defined(CABAL_OS_WINDOWS)
     -- On Windows, we do not check parent dir permission as they are controlled
     -- by ACLs, not permission modes.
     id