diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2015-04-25 09:13:49 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-04-25 11:05:07 +0200 |
| commit | b324fac4e9769c963620ccfc645e0ee2890da5b7 (patch) | |
| tree | 805bb942c934115c2d854553b86955c88db49c39 | |
| parent | ab6cce5e967812ab8fb6ebb7bc2297e360916e9f (diff) | |
| download | haskell-b324fac4e9769c963620ccfc645e0ee2890da5b7.tar.gz | |
base: Export GHC.Event(.Internal).Lifetime
This was an unfortunate oversight in the original event manager rework
patch. Fixes #10308
Differential Revision: https://phabricator.haskell.org/D845
(cherry picked from commit 9a0c17950fdfd0c89c672da9d8b25a419f66c1f8)
| -rw-r--r-- | libraries/base/GHC/Event.hs | 1 | ||||
| -rw-r--r-- | libraries/base/GHC/Event/Internal.hs | 2 | ||||
| -rw-r--r-- | libraries/base/changelog.md | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libraries/base/GHC/Event.hs b/libraries/base/GHC/Event.hs index 436914cf8a..9f1d3dfd73 100644 --- a/libraries/base/GHC/Event.hs +++ b/libraries/base/GHC/Event.hs @@ -25,6 +25,7 @@ module GHC.Event , evtWrite , IOCallback , FdKey(keyFd) + , Lifetime(..) , registerFd , unregisterFd , unregisterFd_ diff --git a/libraries/base/GHC/Event/Internal.hs b/libraries/base/GHC/Event/Internal.hs index c18bd7f394..3b75c8bb40 100644 --- a/libraries/base/GHC/Event/Internal.hs +++ b/libraries/base/GHC/Event/Internal.hs @@ -84,6 +84,8 @@ evtConcat = foldl' evtCombine evtNothing {-# INLINE evtConcat #-} -- | The lifetime of a registration. +-- +-- @since 4.8.1.0 data Lifetime = OneShot | MultiShot deriving (Show, Eq) diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index 4facf0cc7d..f7f1b5b2e9 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -1,5 +1,11 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) +## 4.8.1.0 *TBA* + + * Bundled with GHC 7.10.2 + + * `Lifetime` is now exported from `GHC.Event` + ## 4.8.0.0 *Mar 2015* * Bundled with GHC 7.10.1 |