Support ghc9.4

ZHaskell · Dec 29, 2023 · cf16c91 · cf16c91
1 parent 77a3c26
commit cf16c91
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/ubuntuCI.yml b/.github/workflows/ubuntuCI.yml
@@ -2,10 +2,10 @@ on: [push, pull_request]
 name: ubuntu-ci
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ghc: ['9.2']
+        ghc: ['9.2', '9.4']
         cabal: ['3.6']
         avx_flag: ['', '--constraint="Z-Data +use-avx2"']
     name: Haskell GHC ${{ matrix.ghc }}

diff --git a/Z/IO/FileSystem/FilePath.hsc b/Z/IO/FileSystem/FilePath.hsc
@@ -38,20 +38,22 @@ module Z.IO.FileSystem.FilePath
  ) where
 
 import           Control.Monad      hiding (join)
-import           Data.Word
 import           Data.Bits
-import qualified Data.List as List
+import qualified Data.List          as List
+import           Data.Word
+import           GHC.Exts
 import           GHC.Generics
+import           Prelude            hiding (concat)
 import qualified Z.Data.CBytes      as CB
-import           Z.Data.CBytes      (CBytes(CB), allocCBytesUnsafe, withCBytesUnsafe, withCBytesListUnsafe)
+import           Z.Data.CBytes      (CBytes (CB), allocCBytesUnsafe,
+                                     withCBytesListUnsafe, withCBytesUnsafe)
 import           Z.Data.JSON        (JSON)
 import qualified Z.Data.Text        as T
-import qualified Z.Data.Vector.Base as V
 import qualified Z.Data.Vector      as V
+import qualified Z.Data.Vector.Base as V
 import           Z.Foreign
 import           Z.IO.Environment   (getEnv')
 import           Z.IO.Exception
-import Prelude hiding (concat)
 
 #include "hs_cwalk.h"
 -- \

diff --git a/Z/IO/UV/FFI.hsc b/Z/IO/UV/FFI.hsc
@@ -15,20 +15,21 @@ module Z.IO.UV.FFI where
 
 import           Data.Bits
 import           Data.Int
+import           Data.Primitive.Types    (Prim)
 import           Data.Word
-import           Data.Primitive.Types   (Prim)
 import           Foreign.C.String
 import           Foreign.C.Types
 import           Foreign.Ptr
 import           Foreign.Storable
+import           GHC.Exts
+import           GHC.Generics
+import           System.Posix.Types      (CSsize (..))
 import           Z.Data.Array.Unaligned
-import           Z.Data.Text.Print   (Print(..))
-import           Z.Data.JSON         (JSON)
-import           Z.Data.CBytes as CBytes
+import           Z.Data.CBytes           as CBytes
+import           Z.Data.JSON             (JSON)
+import           Z.Data.Text.Print       (Print (..))
 import           Z.Foreign
-import           Z.IO.Network.SocketAddr    (SocketAddr)
-import           System.Posix.Types (CSsize (..))
-import           GHC.Generics
+import           Z.IO.Network.SocketAddr (SocketAddr)
 
 #include "hs_uv.h"
 #if HAVE_UNISTD_H