Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compilation error with exceptions-0.9.0 #242

Merged
merged 2 commits into from
Mar 8, 2018
Merged

Fix compilation error with exceptions-0.9.0 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67400d0
Fix compilation error with exceptions-0.9.0
barrucadu Mar 8, 2018
21d76f5
Prepare dejafu release
barrucadu Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ There are a few different packages under the Déjà Fu umbrella:
| | Version | Summary |
| - | ------- | ------- |
| [concurrency][h:conc] | 1.4.0.1 | Typeclasses, functions, and data types for concurrency and STM. |
| [dejafu][h:dejafu] | 1.3.0.0 | Systematic testing for Haskell concurrency. |
| [dejafu][h:dejafu] | 1.3.0.1 | Systematic testing for Haskell concurrency. |
| [hunit-dejafu][h:hunit] | 1.1.0.1 | Deja Fu support for the HUnit test framework. |
| [tasty-dejafu][h:tasty] | 1.1.0.1 | Deja Fu support for the Tasty test framework. |

Expand Down
13 changes: 13 additions & 0 deletions dejafu/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ standard Haskell versioning scheme.

.. _PVP: https://pvp.haskell.org/

1.3.0.1 (2018-03-08)
--------------------

* Git: :tag:`dejafu-1.3.0.1`
* Hackage: :hackage:`dejafu-1.3.0.1`

Fixed
~~~~~

* (:pull:`242`) A compilation error when building with
:hackage:`exceptions-0.9.0`.


1.3.0.0 (2018-03-06)
--------------------

Expand Down
4 changes: 2 additions & 2 deletions dejafu/Test/DejaFu/Conc.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ instance Ca.MonadMask (ConcT r n) where

#if MIN_VERSION_exceptions(0,9,0)
-- from https://github.com/fpco/stackage/issues/3315#issuecomment-368583481
generalBracket acquire release cleanup use = mask $ \unmasked -> do
generalBracket acquire release cleanup use = Ca.mask $ \unmasked -> do
resource <- acquire
result <- unmasked (use resource) `catch` (\e -> cleanup resource e >> throwM e)
result <- unmasked (use resource) `Ca.catch` (\e -> cleanup resource e >> Ca.throwM e)
_ <- release resource
pure result
#endif
Expand Down
4 changes: 2 additions & 2 deletions dejafu/dejafu.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- documentation, see http://haskell.org/cabal/users-guide/

name: dejafu
version: 1.3.0.0
version: 1.3.0.1
synopsis: A library for unit-testing concurrent programs.

description:
Expand Down Expand Up @@ -33,7 +33,7 @@ source-repository head
source-repository this
type: git
location: https://github.com/barrucadu/dejafu.git
tag: dejafu-1.3.0.0
tag: dejafu-1.3.0.1

library
exposed-modules: Test.DejaFu
Expand Down
2 changes: 1 addition & 1 deletion doc/getting_started.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ There are a few different packages under the Déjà Fu umbrella:
:header: "Package", "Version", "Summary"

":hackage:`concurrency`", "1.4.0.1", "Typeclasses, functions, and data types for concurrency and STM"
":hackage:`dejafu`", "1.3.0.0", "Systematic testing for Haskell concurrency"
":hackage:`dejafu`", "1.3.0.1", "Systematic testing for Haskell concurrency"
":hackage:`hunit-dejafu`", "1.1.0.1", "Déjà Fu support for the HUnit test framework"
":hackage:`tasty-dejafu`", "1.1.0.1", "Déjà Fu support for the tasty test framework"

Expand Down