From 6dabfc0c6c48e9b370dfb23f07d1459d06e1b59b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 3 Aug 2008 11:41:04 +0000 Subject: [PATCH] Use onException rather than catchAny --- Control/Concurrent/MVar.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Control/Concurrent/MVar.hs b/Control/Concurrent/MVar.hs index 6afdc97..d4a1a48 100644 --- a/Control/Concurrent/MVar.hs +++ b/Control/Concurrent/MVar.hs @@ -85,8 +85,7 @@ withMVar :: MVar a -> (a -> IO b) -> IO b withMVar m io = block $ do a <- takeMVar m - b <- catchAny (unblock (io a)) - (\e -> do putMVar m a; throw e) + b <- unblock (io a) `onException` putMVar m a putMVar m a return b @@ -100,8 +99,7 @@ modifyMVar_ :: MVar a -> (a -> IO a) -> IO () modifyMVar_ m io = block $ do a <- takeMVar m - a' <- catchAny (unblock (io a)) - (\e -> do putMVar m a; throw e) + a' <- unblock (io a) `onException` putMVar m a putMVar m a' {-| @@ -113,7 +111,6 @@ modifyMVar :: MVar a -> (a -> IO (a,b)) -> IO b modifyMVar m io = block $ do a <- takeMVar m - (a',b) <- catchAny (unblock (io a)) - (\e -> do putMVar m a; throw e) + (a',b) <- unblock (io a) `onException` putMVar m a putMVar m a' return b -- 1.7.10.4