summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/base/Control/Applicative.hs3
-rw-r--r--libraries/base/changelog.md2
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 6cf4561225..aacc803065 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -43,6 +43,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.