summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitsutoshiAoe <>2020-06-29 14:34:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2020-06-29 14:34:00 (GMT)
commitca198c65ac71650af534c9b182c73a837290a9fa (patch)
treec2eb72dbe7cee7ed7226fab09fd154b5d737c42a
parent852ec9ccdfb4cc476434376dd87db4171b9686d4 (diff)
version 0.10.1.10.10.1.1
-rwxr-xr-xCHANGELOG.md8
-rw-r--r--lifted-async.cabal9
-rw-r--r--src/Control/Concurrent/Async/Lifted.hs2
-rw-r--r--src/Control/Concurrent/Async/Lifted/Safe.hs2
4 files changed, 17 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f872598..a43fce4 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Revision history for lifted-async
+## v0.10.1.1 - 2020-06-29
+
+* Bump up cabal-version to 1.24
+
+## v0.10.1 - 2020-06-29
+
+* Fix typechecking errors with GHC HEAD 8.11 ([#31](https://github.com/maoe/lifted-async/pull/31))
+
## v0.10.0.6 - 2020-03-31
* Relax upper version bound for base to suppose GHC 8.10 ([#30](https://github.com/maoe/lifted-async/pull/30))
diff --git a/lifted-async.cabal b/lifted-async.cabal
index 20fefb9..4ed6776 100644
--- a/lifted-async.cabal
+++ b/lifted-async.cabal
@@ -1,5 +1,6 @@
+cabal-version: 1.24
name: lifted-async
-version: 0.10.0.6
+version: 0.10.1.1
synopsis: Run lifted IO operations asynchronously and wait for their results
homepage: https://github.com/maoe/lifted-async
bug-reports: https://github.com/maoe/lifted-async/issues
@@ -10,7 +11,6 @@ maintainer: Mitsutoshi Aoe <me@maoe.name>
copyright: Copyright (C) 2012-2020 Mitsutoshi Aoe
category: Concurrency
build-type: Simple
-cabal-version: >= 1.8
tested-with:
GHC == 8.10.1
GHC == 8.8.3
@@ -44,6 +44,7 @@ library
build-depends: constraints >= 0.2 && < 0.6
ghc-options: -Wall
hs-source-dirs: src
+ default-language: Haskell2010
test-suite test-lifted-async
type: exitcode-stdio-1.0
@@ -66,6 +67,7 @@ test-suite test-lifted-async
, tasty-expected-failure < 0.12
, tasty-hunit >= 0.9 && < 0.11
, tasty-th
+ default-language: Haskell2010
test-suite regression-tests
type: exitcode-stdio-1.0
@@ -79,6 +81,7 @@ test-suite regression-tests
, mtl
, tasty-hunit >= 0.9 && < 0.11
, tasty-th
+ default-language: Haskell2010
benchmark benchmark-lifted-async
type: exitcode-stdio-1.0
@@ -91,6 +94,7 @@ benchmark benchmark-lifted-async
, criterion
, deepseq
, lifted-async
+ default-language: Haskell2010
benchmark benchmark-lifted-async-threaded
type: exitcode-stdio-1.0
@@ -103,6 +107,7 @@ benchmark benchmark-lifted-async-threaded
, criterion
, deepseq
, lifted-async
+ default-language: Haskell2010
source-repository head
type: git
diff --git a/src/Control/Concurrent/Async/Lifted.hs b/src/Control/Concurrent/Async/Lifted.hs
index 073f533..061a0e8 100644
--- a/src/Control/Concurrent/Async/Lifted.hs
+++ b/src/Control/Concurrent/Async/Lifted.hs
@@ -448,7 +448,7 @@ instance MonadBaseControl IO m => Applicative (Concurrently m) where
Concurrently $ uncurry ($) <$> concurrently fs as
instance MonadBaseControl IO m => Alternative (Concurrently m) where
- empty = Concurrently $ liftBaseWith $ const (forever $ threadDelay maxBound)
+ empty = Concurrently $ liftBaseWith $ \_ -> forever $ threadDelay maxBound
Concurrently as <|> Concurrently bs =
Concurrently $ either id id <$> race as bs
diff --git a/src/Control/Concurrent/Async/Lifted/Safe.hs b/src/Control/Concurrent/Async/Lifted/Safe.hs
index 564f4e7..bd8bb08 100644
--- a/src/Control/Concurrent/Async/Lifted/Safe.hs
+++ b/src/Control/Concurrent/Async/Lifted/Safe.hs
@@ -432,7 +432,7 @@ instance (MonadBaseControl IO m, Forall (Pure m)) =>
instance (MonadBaseControl IO m, Forall (Pure m)) =>
Alternative (Concurrently m) where
- empty = Concurrently $ liftBaseWith $ const (forever $ threadDelay maxBound)
+ empty = Concurrently $ liftBaseWith $ \_ -> forever $ threadDelay maxBound
Concurrently (as :: m a) <|> Concurrently bs =
Concurrently (either id id <$> race as bs)
\\ (inst :: Forall (Pure m) :- Pure m a)