diff options
author | Oleg Grenrus <oleg.grenrus@iki.fi> | 2021-03-24 09:46:53 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2021-10-26 08:20:30 -0400 |
commit | 1dfd908d03686c2cf35f4b21485cc1d19ef4e808 (patch) | |
tree | fc1616585f1c40d9d0de37fcfafd65e4b49baaf6 | |
parent | 8e84370ee847f821ea857e47c10b202a1b607cd5 (diff) | |
download | haskell-1dfd908d03686c2cf35f4b21485cc1d19ef4e808.tar.gz |
Additionally export asum from Control.Applicative
Fixes #19575
(cherry picked from commit 470839c5feb65cf745b5fe624aece5884c8e53d2)
-rw-r--r-- | libraries/base/Control/Applicative.hs | 3 | ||||
-rw-r--r-- | libraries/base/changelog.md | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libraries/base/Control/Applicative.hs b/libraries/base/Control/Applicative.hs index 93022cb29c..ebfb00d3c1 100644 --- a/libraries/base/Control/Applicative.hs +++ b/libraries/base/Control/Applicative.hs @@ -45,6 +45,7 @@ module Control.Applicative ( (<$>), (<$), (<**>), liftA, liftA3, optional, + asum, ) where import Control.Category hiding ((.), id) @@ -53,7 +54,7 @@ import Data.Maybe import Data.Tuple import Data.Eq import Data.Ord -import Data.Foldable (Foldable(..)) +import Data.Foldable (Foldable(..), asum) import Data.Functor ((<$>)) import Data.Functor.Const (Const(..)) diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index d5bc336cec..3d8b208700 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -47,6 +47,8 @@ * Under POSIX, `System.IO.openFile` will no longer leak a file descriptor if it is interrupted by an asynchronous exception (#19114, #19115). + * Additionally export `asum` from `Control.Applicative` + * `fromInteger :: Integer -> Float/Double` now consistently round to the nearest value, with ties to even. |