From 0715d6cc14f7a37f3b8c6fb989615e084483948f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 10 Jul 2009 15:25:26 +0000 Subject: [PATCH] Fix some "warn-unused-do-bind" warnings where we want to ignore the value --- Control/Concurrent.hs | 2 +- Control/Concurrent/SampleVar.hs | 2 +- GHC/IO/Handle.hs | 4 ++-- System/Environment.hs | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Control/Concurrent.hs b/Control/Concurrent.hs index 2d9cf57..7ec65f2 100644 --- a/Control/Concurrent.hs +++ b/Control/Concurrent.hs @@ -430,7 +430,7 @@ runInUnboundThread action = do if bound then do mv <- newEmptyMVar - forkIO (Exception.try action >>= putMVar mv) + _ <- forkIO (Exception.try action >>= putMVar mv) takeMVar mv >>= \ei -> case ei of Left exception -> Exception.throw (exception :: SomeException) Right result -> return result diff --git a/Control/Concurrent/SampleVar.hs b/Control/Concurrent/SampleVar.hs index bdf5eac..a76346f 100644 --- a/Control/Concurrent/SampleVar.hs +++ b/Control/Concurrent/SampleVar.hs @@ -69,7 +69,7 @@ emptySampleVar :: SampleVar a -> IO () emptySampleVar v = do (readers, var) <- takeMVar v if readers > 0 then do - takeMVar var + _ <- takeMVar var putMVar v (0,var) else putMVar v (readers,var) diff --git a/GHC/IO/Handle.hs b/GHC/IO/Handle.hs index 5becae8..1531b4a 100644 --- a/GHC/IO/Handle.hs +++ b/GHC/IO/Handle.hs @@ -147,7 +147,7 @@ hSetFileSize handle size = hIsEOF :: Handle -> IO Bool hIsEOF handle = catch - (do hLookAhead handle; return False) + (hLookAhead handle >> return False) (\e -> if isEOFError e then return True else ioError e) -- --------------------------------------------------------------------------- @@ -668,7 +668,7 @@ dupHandleTo filepath h other_side case cast devTo of Nothing -> ioe_dupHandlesNotCompatible h Just dev' -> do - IODevice.dup2 dev dev' + _ <- IODevice.dup2 dev dev' FileHandle _ m <- dupHandle_ dev' filepath other_side h_ mb_finalizer takeMVar m diff --git a/System/Environment.hs b/System/Environment.hs index 247a905..b85bc42 100644 --- a/System/Environment.hs +++ b/System/Environment.hs @@ -155,7 +155,8 @@ withArgv new_args act = do pName <- System.Environment.getProgName existing_args <- System.Environment.getArgs bracket (setArgs new_args) - (\argv -> do setArgs (pName:existing_args); freeArgv argv) + (\argv -> do _ <- setArgs (pName:existing_args) + freeArgv argv) (const act) freeArgv :: Ptr CString -> IO () -- 1.7.10.4