From fb29ef4ec5621a76cb2e3d3e285ea72bf76fade4 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@serpentine.com>
Date: Tue, 11 May 2010 19:45:36 -0700
Subject: [PATCH] Get rid of some easily nuked warnings.

---
 src/System/Event/Array.hs   |  3 +--
 src/System/Event/Manager.hs | 14 +++++++-------
 src/System/Event/Signal.hsc |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/System/Event/Array.hs b/src/System/Event/Array.hs
index 3443843..42a933e 100644
--- a/src/System/Event/Array.hs
+++ b/src/System/Event/Array.hs
@@ -24,8 +24,7 @@ module System.Event.Array
     ) where
 
 import Control.Monad (when)
-import Data.IORef (IORef, atomicModifyIORef, mkWeakIORef, newIORef, readIORef,
-                   writeIORef)
+import Data.IORef (IORef, atomicModifyIORef, newIORef, readIORef, writeIORef)
 import Foreign.C.Types (CSize)
 import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)
 import Foreign.Ptr (Ptr, nullPtr, plusPtr)
diff --git a/src/System/Event/Manager.hs b/src/System/Event/Manager.hs
index d904db1..a6977ea 100644
--- a/src/System/Event/Manager.hs
+++ b/src/System/Event/Manager.hs
@@ -187,14 +187,14 @@ newWith be = do
                when (st /= Finished) $ do
                  I.delete be
                  closeControl ctrl
-  finished <- newEmptyMVar
+  fini <- newEmptyMVar
   let mgr = EventManager { emBackend = be
                          , emFds = iofds
                          , emTimeouts = timeouts
                          , emState = state
                          , emUniqueSource = us
                          , emControl = ctrl
-                         , emFinished = finished
+                         , emFinished = fini
                          }
   _ <- registerFd_ mgr (handleControlEvent mgr) (controlReadFd ctrl) evtRead
   _ <- registerFd_ mgr (handleControlEvent mgr) (wakeupReadFd ctrl) evtRead
@@ -211,7 +211,7 @@ finished :: EventManager -> IO Bool
 finished mgr = (== Finished) `liftM` readIORef (emState mgr)
 
 cleanup :: EventManager -> IO ()
-cleanup mgr@EventManager{..} = do
+cleanup EventManager{..} = do
   writeIORef emState Finished
   I.delete emBackend
   closeControl emControl
@@ -233,7 +233,7 @@ loop mgr@EventManager{..} = do
             when running $ go q'
 
 init :: EventManager -> IO ()
-init mgr@EventManager{..} = do
+init EventManager{..} = do
   state <- atomicModifyIORef emState $ \s -> case s of
                                                Created -> (Running, s)
                                                _       -> (s, s)
@@ -241,8 +241,8 @@ init mgr@EventManager{..} = do
     error $ "System.Event.Manager.init: state is already " ++ show state
 
 step :: EventManager -> TimeoutQueue -> IO (Bool, TimeoutQueue)
-step mgr@EventManager{..} q = do
-  (timeout, q') <- mkTimeout q
+step mgr@EventManager{..} tq = do
+  (timeout, q') <- mkTimeout tq
   I.poll emBackend timeout (onFdEvent mgr)
   state <- readIORef emState
   state `seq` return (state == Running, q')
@@ -253,7 +253,7 @@ step mgr@EventManager{..} q = do
   mkTimeout :: TimeoutQueue -> IO (Timeout, TimeoutQueue)
   mkTimeout q = do
       now <- getCurrentTime
-      newTimeouts <- atomicModifyIORef emTimeouts $ \q -> ([], q)
+      newTimeouts <- atomicModifyIORef emTimeouts $ \q' -> ([], q')
       let (expired, q') = Q.atMost now (applyTimeoutEdits q newTimeouts)
       sequence_ $ map Q.value expired
       let timeout = case Q.minView q' of
diff --git a/src/System/Event/Signal.hsc b/src/System/Event/Signal.hsc
index 175b1ff..a36f775 100644
--- a/src/System/Event/Signal.hsc
+++ b/src/System/Event/Signal.hsc
@@ -70,7 +70,7 @@ blockAllSignals = do
     sigProcMask sigSetMask blocked nullPtr
   
 loop :: SignalManager -> IO ()
-loop mgr@SignalManager{..} =
+loop SignalManager{..} =
   runInBoundThread $ do
     withForeignPtr smThread c_thread_self
     alloca $ alloca . go