Skip to content

Commit 96707db

Browse files
yogeshsajanikaryogeshsajanikar
authored
Merge branch 'main' into CAD-4738-stm-monad-catch-instance
2 parents dae7d2a + 68ca988 commit 96707db

File tree

6 files changed

+27
-22
lines changed

6 files changed

+27
-22
lines changed

‎.github/workflows/haskell.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Haskell CI
22

3-
on: [push]
3+
on:
4+
pull_request:
45

56
jobs:
67
build:
@@ -74,7 +75,7 @@ jobs:
7475
7576
ghc --version
7677
cabal --version
77-
echo "::set-output name=cabal-store::$(dirname $(cabal --help | tail -1 | tr -d ' '))\\store"
78+
echo "cabal-store=$(dirname $(cabal --help | tail -1 | tr -d ' '))\\store" >> $GITHUB_OUTPUT
7879
7980
- uses: actions/checkout@v2
8081

@@ -151,7 +152,7 @@ jobs:
151152
key: cache-dependencies-${{ env.CACHE_VERSION }}
152153

153154
- name: "Install `stylish-haskell`"
154-
run: cabal install stylish-haskell-0.13.0.0
155+
run: cabal install stylish-haskell-0.14.3.0
155156

156157
- name: "`stylish-haskell` version"
157158
run: |

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
# Circa 2022.10.19 (pre release)
4+
5+
- Added `Functor` instance for `SimResult` type
6+
37
# Circa 2022.10.03 (pre release)
48

59
- Added `Semigroup` and `Monoid` instances for `STM` and `WrappedSTM` monads

‎io-classes/io-classes.cabal

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: io-classes
2-
version: 0.2.0.0
2+
version: 0.3.0.0
33
synopsis: Type classes for concurrency with STM, ST and timing
44
-- description:
55
license: Apache-2.0
@@ -29,22 +29,21 @@ library
2929

3030
-- At this experiment/prototype stage everything is exposed.
3131
-- This has to be tidied up once the design becomes clear.
32-
exposed-modules:
33-
Control.Monad.Class.MonadAsync
34-
Control.Monad.Class.MonadEventlog
35-
Control.Monad.Class.MonadFork
36-
Control.Monad.Class.MonadMVar
37-
Control.Monad.Class.MonadSay
38-
Control.Monad.Class.MonadST
39-
Control.Monad.Class.MonadSTM
40-
Control.Concurrent.Class.MonadSTM
32+
exposed-modules: Control.Concurrent.Class.MonadSTM
4133
Control.Concurrent.Class.MonadSTM.TArray
4234
Control.Concurrent.Class.MonadSTM.TBQueue
4335
Control.Concurrent.Class.MonadSTM.TChan
4436
Control.Concurrent.Class.MonadSTM.TMVar
4537
Control.Concurrent.Class.MonadSTM.TQueue
4638
Control.Concurrent.Class.MonadSTM.TSem
4739
Control.Concurrent.Class.MonadSTM.TVar
40+
Control.Monad.Class.MonadAsync
41+
Control.Monad.Class.MonadEventlog
42+
Control.Monad.Class.MonadFork
43+
Control.Monad.Class.MonadMVar
44+
Control.Monad.Class.MonadSay
45+
Control.Monad.Class.MonadST
46+
Control.Monad.Class.MonadSTM
4847
Control.Monad.Class.MonadSTM.Internal
4948
Control.Monad.Class.MonadThrow
5049
Control.Monad.Class.MonadTime

‎io-sim/io-sim.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: io-sim
3-
version: 0.2.0.0
3+
version: 0.3.0.0
44
synopsis: A pure simulator for monadic concurrency with STM
55
-- description:
66
license: Apache-2.0
@@ -50,7 +50,7 @@ library
5050
ScopedTypeVariables,
5151
TypeFamilies
5252
build-depends: base >=4.9 && <4.18,
53-
io-classes >=0.2 && <0.3,
53+
io-classes ^>=0.3,
5454
exceptions >=0.10,
5555
containers,
5656
deque,
@@ -90,7 +90,7 @@ test-suite test
9090
io-sim,
9191
parallel,
9292
QuickCheck,
93-
strict-stm,
93+
strict-stm ^>= 0.2,
9494
tasty,
9595
tasty-quickcheck,
9696
tasty-hunit,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# LANGUAGE CPP #-}
2+
{-# LANGUAGE DeriveFunctor #-}
23
{-# LANGUAGE DeriveGeneric #-}
34
{-# LANGUAGE DerivingStrategies #-}
45
{-# LANGUAGE DerivingVia #-}
@@ -694,7 +695,7 @@ data SimResult a
694695
| MainException !Time SomeException ![Labelled ThreadId]
695696
| Deadlock !Time ![Labelled ThreadId]
696697
| Loop
697-
deriving Show
698+
deriving (Show, Functor)
698699

699700

700701
type SimTrace a = Trace.Trace (SimResult a) SimEvent

‎strict-stm/strict-stm.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
cabal-version: 2.0
12
name: strict-stm
2-
version: 0.1.0.0
3+
version: 0.2.0.0
34
synopsis: Strict STM interface polymorphic over stm implementation.
45
description: The `strict-stm` package gives a strict interface to stm,
56
currently either one provided by `stm` package for the
@@ -13,7 +14,6 @@ author: Alexander Vieth, Marcin Szamotulski, Duncan Coutts
1314
maintainer:
1415
category: Control
1516
build-type: Simple
16-
cabal-version: >=1.10
1717
tested-with: GHC == 8.10.7, GHC == 9.2.4
1818

1919
source-repository head
@@ -43,10 +43,10 @@ library
4343
Control.Concurrent.Class.MonadSTM.Strict.TVar
4444
reexported-modules: Control.Concurrent.Class.MonadSTM.TSem as Control.Concurrent.Class.MonadSTM.Strict.TSem
4545
default-language: Haskell2010
46-
build-depends: base >=4.9 && <4.18,
46+
build-depends: base >= 4.9 && <4.18,
4747
array,
48-
stm >=2.5 && <2.6,
49-
io-classes
48+
stm >= 2.5 && <2.6,
49+
io-classes ^>= 0.3
5050
ghc-options: -Wall
5151
-Wno-unticked-promoted-constructors
5252
-Wcompat

0 commit comments

Comments
 (0)