[commit: base] master: Remove block and unblock (deprecated since GHC 7.0) (93b7ead)
Ian Lynagh
igloo at earth.li
Tue Feb 19 22:06:36 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/packages/base
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/93b7eade59db584ffc275049d6039bebef48a1b0
>---------------------------------------------------------------
commit 93b7eade59db584ffc275049d6039bebef48a1b0
Author: Ian Lynagh <ian at well-typed.com>
Date: Tue Feb 19 17:50:11 2013 +0000
Remove block and unblock (deprecated since GHC 7.0)
>---------------------------------------------------------------
Control/Exception.hs | 2 --
Control/Exception/Base.hs | 6 ------
GHC/IO.hs | 8 +-------
3 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/Control/Exception.hs b/Control/Exception.hs
index 35f1e8a..7a5f8d3 100644
--- a/Control/Exception.hs
+++ b/Control/Exception.hs
@@ -117,8 +117,6 @@ module Control.Exception (
-- ** (deprecated) Asynchronous exception control
- block,
- unblock,
blocked,
-- *** Applying @mask@ to an exception handler
diff --git a/Control/Exception/Base.hs b/Control/Exception/Base.hs
index 0f16bdd..266b74b 100644
--- a/Control/Exception/Base.hs
+++ b/Control/Exception/Base.hs
@@ -92,8 +92,6 @@ module Control.Exception.Base (
-- ** (deprecated) Asynchronous exception control
- block,
- unblock,
blocked,
-- * Assertions
@@ -241,10 +239,6 @@ throwIO e = Hugs.Exception.throwIO (toException e)
#ifndef __GLASGOW_HASKELL__
-- Dummy definitions for implementations lacking asynchonous exceptions
-block :: IO a -> IO a
-block = id
-unblock :: IO a -> IO a
-unblock = id
blocked :: IO Bool
blocked = return False
#endif
diff --git a/GHC/IO.hs b/GHC/IO.hs
index c5239a4..a073d7b 100644
--- a/GHC/IO.hs
+++ b/GHC/IO.hs
@@ -37,7 +37,7 @@ module GHC.IO (
catchException, catchAny, throwIO,
mask, mask_, uninterruptibleMask, uninterruptibleMask_,
MaskingState(..), getMaskingState,
- block, unblock, blocked, unsafeUnmask,
+ blocked, unsafeUnmask,
onException, bracket, finally, evaluate
) where
@@ -302,9 +302,6 @@ throwIO e = IO (raiseIO# (toException e))
-- -----------------------------------------------------------------------------
-- Controlling asynchronous exception delivery
-{-# DEPRECATED block "use Control.Exception.mask instead" #-} -- deprecated in 7.0
--- | Note: this function is deprecated, please use 'mask' instead.
>---------------------------------------------------------------
-- Applying 'block' to a computation will
-- execute that computation with asynchronous exceptions
-- /blocked/. That is, any thread which
@@ -322,9 +319,6 @@ throwIO e = IO (raiseIO# (toException e))
block :: IO a -> IO a
block (IO io) = IO $ maskAsyncExceptions# io
-{-# DEPRECATED unblock "use Control.Exception.mask instead" #-} -- deprecated in 7.0
--- | Note: this function is deprecated, please use 'mask' instead.
>---------------------------------------------------------------
-- To re-enable asynchronous exceptions inside the scope of
-- 'block', 'unblock' can be
-- used. It scopes in exactly the same way, so on exit from
More information about the ghc-commits
mailing list