Simulation and QSM tests for HasBufFS

.github/workflows/haskell.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
         cabal: ["3.10.3.0"]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-13]
 
     timeout-minutes: 60
 

cabal.project

@@ -12,9 +12,9 @@ repository cardano-haskell-packages
 
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2024-02-22T20:53:27Z
+  , hackage.haskell.org 2024-05-01T04:59:38Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2024-02-23T09:45:19Z
+  , cardano-haskell-packages 2024-04-30T19:46:33Z
 
 packages:
   fs-api

fs-api/src/System/FS/IO.hs

@@ -1,3 +1,6 @@
+{-# LANGUAGE TypeFamilies  #-}
+{-# LANGUAGE TypeOperators #-}
+
 -- | IO implementation of the 'HasFS' class
 module System.FS.IO (
     -- * IO implementation & monad
@@ -9,7 +12,7 @@ module System.FS.IO (
 import           Control.Concurrent.MVar
 import qualified Control.Exception as E
 import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Primitive (PrimBase)
+import           Control.Monad.Primitive (PrimMonad (..))
 import qualified Data.ByteString.Unsafe as BS
 import           Data.Primitive (withMutableByteArrayContents)
 import qualified Data.Set as Set
@@ -103,19 +106,22 @@ _rethrowFsError mount fp action = do
   HasBufFS
 -------------------------------------------------------------------------------}
 
-ioHasBufFS :: (MonadIO m, PrimBase m) => MountPoint -> HasBufFS m HandleIO
+ioHasBufFS ::
+     (MonadIO m, PrimState IO ~ PrimState m)
+  => MountPoint
+  -> HasBufFS m HandleIO
 ioHasBufFS mount = HasBufFS {
-      hGetBufSome = \(Handle h fp) buf bufOff c ->
-        withMutableByteArrayContents buf $ \ptr -> liftIO $ rethrowFsError fp $
+      hGetBufSome = \(Handle h fp) buf bufOff c ->  liftIO $ rethrowFsError fp $
+        withMutableByteArrayContents buf $ \ptr ->
           F.readBuf h (ptr `Foreign.plusPtr` unBufferOffset bufOff) c
-    , hGetBufSomeAt = \(Handle h fp) buf bufOff c off ->
-        withMutableByteArrayContents buf $ \ptr -> liftIO $ rethrowFsError fp $
+    , hGetBufSomeAt = \(Handle h fp) buf bufOff c off -> liftIO $ rethrowFsError fp $
+        withMutableByteArrayContents buf $ \ptr ->
           F.preadBuf h (ptr `Foreign.plusPtr` unBufferOffset bufOff) c (fromIntegral $ unAbsOffset off)
-    , hPutBufSome = \(Handle h fp) buf bufOff c ->
-        withMutableByteArrayContents buf $ \ptr -> liftIO $ rethrowFsError fp $
+    , hPutBufSome = \(Handle h fp) buf bufOff c -> liftIO $ rethrowFsError fp $
+        withMutableByteArrayContents buf $ \ptr ->
           F.writeBuf h (ptr `Foreign.plusPtr` unBufferOffset bufOff) c
-    , hPutBufSomeAt = \(Handle h fp) buf bufOff c off ->
-        withMutableByteArrayContents buf $ \ptr -> liftIO $ rethrowFsError fp $
+    , hPutBufSomeAt = \(Handle h fp) buf bufOff c off -> liftIO $ rethrowFsError fp $
+        withMutableByteArrayContents buf $ \ptr ->
           F.pwriteBuf h (ptr `Foreign.plusPtr` unBufferOffset bufOff) c (fromIntegral $ unAbsOffset off)
     }
   where

fs-sim/CHANGELOG.md

@@ -1,8 +1,11 @@
 # Revision history for fs-sim
 
-## next release -- ????-??-??
+## next version -- ????-??-??
+
+### Breaking
 
 * Orphan `Show` instance for `Foreign.C.Error.Errno` removed by `fs-api`.
+* New `primitive ^>=0.9` dependency
 
 ## 0.2.1.1 -- 2023-10-30
 

fs-sim/fs-sim.cabal

@@ -34,6 +34,7 @@ library
     System.FS.Sim.STM
     System.FS.Sim.Stream
 
+  other-modules:    System.FS.Sim.Prim
   default-language: Haskell2010
   build-depends:
     , base               >=4.14 && <4.20
@@ -43,6 +44,7 @@ library
     , fs-api             ^>=0.2
     , io-classes         >=0.3  && <1.5
     , mtl
+    , primitive          ^>=0.9
     , QuickCheck
     , strict-stm         >=0.3  && <1.5
     , text               >=1.2  && <2.2
@@ -54,23 +56,28 @@ library
 
 test-suite fs-sim-test
   type:             exitcode-stdio-1.0
-  hs-source-dirs:   test
+  hs-source-dirs:   test src
   main-is:          Main.hs
   other-modules:
+    System.FS.Sim.FsTree
+    System.FS.Sim.MockFS
+    System.FS.Sim.Prim
     Test.System.FS.Sim.FsTree
     Test.System.FS.StateMachine
     Test.Util.RefEnv
 
   default-language: Haskell2010
   build-depends:
     , base
+    , base16-bytestring
     , bifunctors
     , bytestring
     , containers
     , fs-api
-    , fs-sim
     , generics-sop
+    , mtl
     , pretty-show
+    , primitive
     , QuickCheck
     , quickcheck-state-machine  >=0.7.2 && <0.8
     , random