Merge branch 'main' into CAD-4738-stm-monad-catch-instance

Author: yogeshsajanikar

.github/workflows/haskell.yml

@@ -1,6 +1,7 @@
 name: Haskell CI
 
-on: [push]
+on:
+  pull_request:
 
 jobs:
   build:
@@ -74,7 +75,7 @@ jobs:
 
         ghc --version
         cabal --version
-        echo "::set-output name=cabal-store::$(dirname $(cabal --help | tail -1 | tr -d ' '))\\store"
+        echo "cabal-store=$(dirname $(cabal --help | tail -1 | tr -d ' '))\\store" >> $GITHUB_OUTPUT
 
     - uses: actions/checkout@v2
 
@@ -151,7 +152,7 @@ jobs:
         key: cache-dependencies-${{ env.CACHE_VERSION }}
 
     - name: "Install `stylish-haskell`"
-      run: cabal install stylish-haskell-0.13.0.0
+      run: cabal install stylish-haskell-0.14.3.0
 
     - name: "`stylish-haskell` version"
       run: |

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+# Circa 2022.10.19 (pre release)
+
+- Added `Functor` instance for `SimResult` type
+
 # Circa 2022.10.03 (pre release)
 
 - Added `Semigroup` and `Monoid` instances for `STM` and `WrappedSTM` monads

io-classes/io-classes.cabal

@@ -1,5 +1,5 @@
 name:                io-classes
-version:             0.2.0.0
+version:             0.3.0.0
 synopsis:            Type classes for concurrency with STM, ST and timing
 -- description:
 license:             Apache-2.0
@@ -29,22 +29,21 @@ library
 
   -- At this experiment/prototype stage everything is exposed.
   -- This has to be tidied up once the design becomes clear.
-  exposed-modules:
-                       Control.Monad.Class.MonadAsync
-                       Control.Monad.Class.MonadEventlog
-                       Control.Monad.Class.MonadFork
-                       Control.Monad.Class.MonadMVar
-                       Control.Monad.Class.MonadSay
-                       Control.Monad.Class.MonadST
-                       Control.Monad.Class.MonadSTM
-                       Control.Concurrent.Class.MonadSTM
+  exposed-modules:     Control.Concurrent.Class.MonadSTM
                        Control.Concurrent.Class.MonadSTM.TArray
                        Control.Concurrent.Class.MonadSTM.TBQueue
                        Control.Concurrent.Class.MonadSTM.TChan
                        Control.Concurrent.Class.MonadSTM.TMVar
                        Control.Concurrent.Class.MonadSTM.TQueue
                        Control.Concurrent.Class.MonadSTM.TSem
                        Control.Concurrent.Class.MonadSTM.TVar
+                       Control.Monad.Class.MonadAsync
+                       Control.Monad.Class.MonadEventlog
+                       Control.Monad.Class.MonadFork
+                       Control.Monad.Class.MonadMVar
+                       Control.Monad.Class.MonadSay
+                       Control.Monad.Class.MonadST
+                       Control.Monad.Class.MonadSTM
                        Control.Monad.Class.MonadSTM.Internal
                        Control.Monad.Class.MonadThrow
                        Control.Monad.Class.MonadTime

io-sim/io-sim.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                io-sim
-version:             0.2.0.0
+version:             0.3.0.0
 synopsis:            A pure simulator for monadic concurrency with STM
 -- description:
 license:             Apache-2.0
@@ -50,7 +50,7 @@ library
                        ScopedTypeVariables,
                        TypeFamilies
   build-depends:       base              >=4.9 && <4.18,
-                       io-classes        >=0.2 && <0.3,
+                       io-classes        ^>=0.3,
                        exceptions        >=0.10,
                        containers,
                        deque,
@@ -90,7 +90,7 @@ test-suite test
                        io-sim,
                        parallel,
                        QuickCheck,
-                       strict-stm,
+                       strict-stm ^>= 0.2,
                        tasty,
                        tasty-quickcheck,
                        tasty-hunit,

io-sim/src/Control/Monad/IOSim/Types.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP                        #-}
+{-# LANGUAGE DeriveFunctor              #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE DerivingStrategies         #-}
 {-# LANGUAGE DerivingVia                #-}
@@ -694,7 +695,7 @@ data SimResult a
     | MainException !Time SomeException ![Labelled ThreadId]
     | Deadlock      !Time               ![Labelled ThreadId]
     | Loop
-    deriving Show
+    deriving (Show, Functor)
 
 
 type SimTrace a = Trace.Trace (SimResult a) SimEvent

strict-stm/strict-stm.cabal

@@ -1,5 +1,6 @@
+cabal-version:       2.0
 name:                strict-stm
-version:             0.1.0.0
+version:             0.2.0.0
 synopsis:            Strict STM interface polymorphic over stm implementation.
 description:         The `strict-stm` package gives a strict interface to stm,
                      currently either one provided by `stm` package for the
@@ -13,7 +14,6 @@ author:              Alexander Vieth, Marcin Szamotulski, Duncan Coutts
 maintainer:
 category:            Control
 build-type:          Simple
-cabal-version:       >=1.10
 tested-with:         GHC == 8.10.7, GHC == 9.2.4
 
 source-repository head
@@ -43,10 +43,10 @@ library
                        Control.Concurrent.Class.MonadSTM.Strict.TVar
   reexported-modules: Control.Concurrent.Class.MonadSTM.TSem as Control.Concurrent.Class.MonadSTM.Strict.TSem
   default-language:    Haskell2010
-  build-depends:       base  >=4.9 && <4.18,
+  build-depends:       base        >= 4.9 && <4.18,
                        array,
-                       stm   >=2.5 && <2.6,
-                       io-classes
+                       stm         >= 2.5 && <2.6,
+                       io-classes ^>= 0.3
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors
                        -Wcompat