summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hengel <sol@typeful.net>2014-04-21 11:34:38 +0800
committerHerbert Valerio Riedel <hvr@gnu.org>2014-04-21 17:18:17 +0200
commit77ea2eb0ab36d1a610269f6737b509b6f6a376fa (patch)
treee521413cd1ce50d935a316a3831385cf8dee15fe
parente2b14c70c800363db5ccb5c3032eed8b9d7d3747 (diff)
downloadhaskell-77ea2eb0ab36d1a610269f6737b509b6f6a376fa.tar.gz
Add System.Exit.die (re #9016)
The original proposal discussion can be found at http://thread.gmane.org/gmane.comp.lang.haskell.libraries/20872 Note this also updates the Haddock submodule to remove Hadock's local `die` implementation.
-rw-r--r--libraries/base/System/Exit.hs7
-rw-r--r--libraries/base/changelog.md2
m---------utils/haddock0
3 files changed, 9 insertions, 0 deletions
diff --git a/libraries/base/System/Exit.hs b/libraries/base/System/Exit.hs
index a3059fcf9b..4f6eba629c 100644
--- a/libraries/base/System/Exit.hs
+++ b/libraries/base/System/Exit.hs
@@ -20,9 +20,11 @@ module System.Exit
, exitWith
, exitFailure
, exitSuccess
+ , die
) where
import Prelude
+import System.IO
import GHC.IO
import GHC.IO.Exception
@@ -74,3 +76,8 @@ exitFailure = exitWith (ExitFailure 1)
exitSuccess :: IO a
exitSuccess = exitWith ExitSuccess
+-- | Write given error message to `stderr` and terminate with `exitFailure`.
+--
+-- /Since: 4.7.1.0/
+die :: String -> IO ()
+die err = hPutStrLn stderr err >> exitFailure
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index a72e4e6871..c561165024 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -8,6 +8,8 @@
* Add `Data.List.sortOn` sorting function
+ * Add `System.Exit.die`
+
* Weaken RealFloat constraints on some `Data.Complex` functions
## 4.7.0.0 *Apr 2014*
diff --git a/utils/haddock b/utils/haddock
-Subproject ac60bd1f98ad02644d3ea36dd4926ed6e105c78
+Subproject 08aa509ebac58bfb202ea79c7c41291ec280a1c