Merge pull request #75 from input-output-hk/erikd/ghc-9.10

Make it build with ghc-9.10

Author: jorisdral

.github/workflows/haskell.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
+        ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.4", "9.8.2", "9.10.1"]
         cabal: ["3.10.3.0"]
         os: [ubuntu-latest, windows-latest, macOS-13]
 

fs-api/CHANGELOG.md

@@ -32,6 +32,7 @@
 * Add a clarification in the documentation of `FsPath` that the user is
   responsible for picking sensible directory/file names.
 * Bump upper version bounds for `io-classes` to `1.6`
+* Make it build with `ghc-9.10`.
 
 ## 0.2.0.1 -- 2023-10-30
 

fs-api/fs-api.cabal

@@ -17,7 +17,7 @@ extra-doc-files:
   CHANGELOG.md
   README.md
 
-tested-with:     GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8
+tested-with:     GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10
 
 source-repository head
   type:     git
@@ -39,13 +39,13 @@ library
 
   default-language: Haskell2010
   build-depends:
-    , base             >=4.14 && <4.20
+    , base             >=4.14 && <4.21
     , bytestring       >=0.10 && <0.13
-    , containers       >=0.5  && <0.7
+    , containers       >=0.5  && <0.8
     , deepseq
     , digest
     , directory        >=1.3  && <1.4
-    , filepath         >=1.4  && <1.5
+    , filepath         >=1.4  && <1.6
     , io-classes       >=0.3  && <1.6
     , primitive        ^>=0.9
     , safe-wild-cards  ^>=1.0

fs-sim/CHANGELOG.md

@@ -33,6 +33,7 @@
 * The `Show Errors` instance was not printing every stream.
 * The shrinker for `Errors` was not shrinking every stream.
 * Adapt to moving of `Util` modules in `fs-api`.
+* Make it build with `ghc-9.10`.
 
 ## 0.2.1.1 -- 2023-10-30
 

fs-sim/fs-sim.cabal

@@ -17,7 +17,7 @@ extra-doc-files:
   CHANGELOG.md
   README.md
 
-tested-with:     GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8
+tested-with:     GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10
 
 source-repository head
   type:     git
@@ -36,10 +36,10 @@ library
   other-modules:    System.FS.Sim.Prim
   default-language: Haskell2010
   build-depends:
-    , base               >=4.14 && <4.20
+    , base               >=4.14 && <4.21
     , base16-bytestring
     , bytestring         >=0.10 && <0.13
-    , containers         >=0.5  && <0.7
+    , containers         >=0.5  && <0.8
     , fs-api             ^>=0.2
     , io-classes         >=0.3  && <1.6
     , mtl
@@ -86,7 +86,7 @@ test-suite fs-sim-test
     , pretty-show
     , primitive
     , QuickCheck
-    , quickcheck-state-machine  >=0.7.2 && <0.8
+    , quickcheck-state-machine  >=0.10
     , random
     , safe-wild-cards
     , strict-stm
@@ -95,7 +95,6 @@ test-suite fs-sim-test
     , tasty-quickcheck
     , temporary
     , text
-    , tree-diff
 
   ghc-options:
     -Wall -Wcompat -Wincomplete-uni-patterns

fs-sim/test/Test/System/FS/StateMachine.hs

@@ -57,6 +57,10 @@ module Test.System.FS.StateMachine (
   , tests
   ) where
 
+#if __GLASGOW_HASKELL__<910
+import           Data.Foldable (foldl')
+#endif
+
 import qualified Control.Exception as E
 import           Control.Monad
 import           Control.Monad.Primitive
@@ -69,7 +73,6 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
 import           Data.Functor.Classes
 import           Data.Int (Int64)
-import           Data.List (foldl')
 import qualified Data.List as L
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -79,14 +82,14 @@ import           Data.Proxy
 import           Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Text as Text
-import           Data.TreeDiff (ToExpr (..), defaultExprViaShow)
 import           Data.Word (Word64)
 import qualified Generics.SOP as SOP
 import           GHC.Generics
 import           GHC.Stack hiding (prettyCallStack)
 import           System.IO.Temp (withSystemTempDirectory)
 import           System.Posix.Types (ByteCount)
 import           System.Random (getStdRandom, randomR)
+import           Test.StateMachine.TreeDiff
 import           Text.Read (readMaybe)
 import           Text.Show.Pretty (ppShow)
 
@@ -842,7 +845,7 @@ mock model cmd = At <$> bitraverse (const QSM.genSym) (const QSM.genSym) resp
 
 precondition :: Model Symbolic -> Cmd :@ Symbolic -> QSM.Logic
 precondition m@Model{..} (At cmd) =
-            QSM.forall (handles cmd) (`QSM.member` RE.keys knownHandles)
+            QSM.forAll (handles cmd) (`QSM.member` RE.keys knownHandles)
     QSM.:&& QSM.Boolean (Mock.numOpenHandles mockFS < maxNumOpenHandles)
     QSM.:&& QSM.Not (knownLimitation m (At cmd))
   where
@@ -1626,7 +1629,7 @@ runCmds cmds = QC.monadicIO $ do
               hfs   = ioHasFS mount
               sm'   = sm hfs
 
-          (hist, model, res) <- QSM.runCommands' (pure sm') cmds
+          (hist, model, res) <- QSM.runCommands' sm' cmds
 
           -- Close all open handles
           forM_ (RE.keys (knownHandles model)) $ hClose hfs . QSM.concrete

fs-sim/test/Test/Util/RefEnv.hs

@@ -1,7 +1,9 @@
 {-# LANGUAGE DeriveAnyClass      #-}
 {-# LANGUAGE DeriveGeneric       #-}
+{-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE PolyKinds           #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving  #-}
 {-# LANGUAGE TupleSections       #-}
 
 -- | Environments of QSM references.
@@ -28,10 +30,10 @@ import qualified Prelude
 import           Data.Bifunctor
 import           Data.Functor.Classes
 import           Data.List (intercalate)
-import           Data.TreeDiff (ToExpr)
 import           GHC.Generics (Generic)
 import           GHC.Stack
 import           Test.StateMachine (Reference)
+import           Test.StateMachine.TreeDiff
 import qualified Test.StateMachine.Types.Rank2 as Rank2
 
 data RefEnv k a r = RefEnv { toList :: [(Reference k r, a)] }