r
/
fused-effects-exceptions
mirror of https://github.com/jrpotter/fused-effects-exceptions
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from fused-effects/ghc9 

GHC 9 support.
main
Patrick Thomson 2021-04-07 19:42:16 -04:00 committed by GitHub
parent ae2d4e9ce8 0f05a7eae6
commit 7920fa7a96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -1,6 +1,12 @@
name: Haskell CI name: Haskell CI
on: [pull_request] on:
pull_request:
branches:
- "**"
push:
branches:
- "master"
jobs: jobs:
build: build:
@ -8,14 +14,14 @@ jobs:
runs-on: ubuntu-16.04 runs-on: ubuntu-16.04
strategy: strategy:
matrix: matrix:
ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.3", "8.10.1"] ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.3", "8.10.1", "9.0.1"]
cabal: ["latest"] cabal: ["latest"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
- uses: actions/setup-haskell@v1.1.2 - uses: haskell/actions/setup@v1.1.8
name: Setup Haskell name: Setup Haskell
with: with:
ghc-version: ${{ matrix.ghc }} ghc-version: ${{ matrix.ghc }}

5
ChangeLog.md
View File

@ -1,8 +1,11 @@
# 1.1.0.1
* GHC 9 support.
# 1.1.0.0 # 1.1.0.0
* Port to fused-effects 1.1. * Port to fused-effects 1.1.
# 1.0.0.0 # 1.0.0.0
* Port to fused-effects 1.0. * Port to fused-effects 1.0.

3
fused-effects-exceptions.cabal
View File

@ -1,7 +1,7 @@
cabal-version: 2.4 cabal-version: 2.4
name: fused-effects-exceptions name: fused-effects-exceptions
version: 1.1.0.0 version: 1.1.0.1
synopsis: Handle exceptions thrown in IO with fused-effects. synopsis: Handle exceptions thrown in IO with fused-effects.
description: Provides Resource and Catch effects capable of reacting to and catching GHC's dynamic exceptions. description: Provides Resource and Catch effects capable of reacting to and catching GHC's dynamic exceptions.
homepage: https://github.com/fused-effects/fused-effects-exceptions#readme homepage: https://github.com/fused-effects/fused-effects-exceptions#readme
@ -22,6 +22,7 @@ tested-with:
GHC == 8.6.5 GHC == 8.6.5
GHC == 8.8.3 GHC == 8.8.3
GHC == 8.10.1 GHC == 8.10.1
GHC == 9.0.1
common common common common
default-language: Haskell2010 default-language: Haskell2010

4
src/Control/Effect/Exception.hs
View File

@ -166,7 +166,7 @@ mask with = liftWith $ \ run ctx -> Exc.mask $ \ restore ->
-- --
-- @since 1.0.0.0 -- @since 1.0.0.0
mask_ :: Has (Lift IO) sig m => m a -> m a mask_ :: Has (Lift IO) sig m => m a -> m a
mask_ m = mask $ const m mask_ m = mask (\_ -> m)
-- | See @"Control.Exception".'Exc.uninterruptibleMask'@. -- | See @"Control.Exception".'Exc.uninterruptibleMask'@.
-- --
@ -179,7 +179,7 @@ uninterruptibleMask with = liftWith $ \ run ctx -> Exc.uninterruptibleMask $ \ r
-- --
-- @since 1.0.0.0 -- @since 1.0.0.0
uninterruptibleMask_ :: Has (Lift IO) sig m => m a -> m a uninterruptibleMask_ :: Has (Lift IO) sig m => m a -> m a
uninterruptibleMask_ m = uninterruptibleMask $ const m uninterruptibleMask_ m = uninterruptibleMask (\_ -> m)
-- | See @"Control.Exception".'Exc.getMaskingState'@. -- | See @"Control.Exception".'Exc.getMaskingState'@.
-- --