Commit 8147fa32 authored by Ryan Scott's avatar Ryan Scott Committed by Ben Gamari

Correct FixIOException's @since annotation retroactively

Summary:
In D4113, a `FixIOException` data type was added with a
`@since TODO` annotation, but it seems that `TODO` made it out into
`base-4.11` itself. I've (retroactively) fixed this and added an
entry to the `base-4.11` entry in the `changelog`.

Test Plan: Read it

Reviewers: dfeuer, hvr, bgamari

Reviewed By: dfeuer

Subscribers: thomie, carter

GHC Trac Issues: #14356, #15025

Differential Revision: https://phabricator.haskell.org/D4578

(cherry picked from commit ce27c7d5)
parent ab458df6
...@@ -269,12 +269,15 @@ instance Show ArrayException where ...@@ -269,12 +269,15 @@ instance Show ArrayException where
. (if not (null s) then showString ": " . showString s . (if not (null s) then showString ": " . showString s
else id) else id)
-- | @since TODO -- | The exception thrown when an infinite cycle is detected in 'fixIO'.
--
-- @since 4.11.0.0
data FixIOException = FixIOException data FixIOException = FixIOException
-- | @since TODO -- | @since 4.11.0.0
instance Exception FixIOException instance Exception FixIOException
-- | @since 4.11.0.0
instance Show FixIOException where instance Show FixIOException where
showsPrec _ FixIOException = showString "cyclic evaluation in fixIO" showsPrec _ FixIOException = showString "cyclic evaluation in fixIO"
......
...@@ -85,6 +85,10 @@ ...@@ -85,6 +85,10 @@
* Deprecated STM invariant checking primitives (`checkInv`, `always`, and * Deprecated STM invariant checking primitives (`checkInv`, `always`, and
`alwaysSucceeds`) in `GHC.Conc.Sync` (#14324). `alwaysSucceeds`) in `GHC.Conc.Sync` (#14324).
* Add a `FixIOException` data type to `Control.Exception.Base`, and change
`fixIO` to throw that instead of a `BlockedIndefinitelyOnMVar` exception
(#14356).
## 4.10.1.0 *November 2017* ## 4.10.1.0 *November 2017*
* Bundled with GHC 8.2.2 * Bundled with GHC 8.2.2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment