git.iko.soy/distributed-process
on master help sign in
Merge pull request #159 from tweag/wall-police

Make distributed-process -Wall clean.

commit45f2f23473e8231f784ea95663035d818eb23942 authorTim Watson <watson.timothy@gmail.com> dateSun 30 Nov 2014, 14:42 (12 years ago) parent4119cf6426beef
5 files changed+17−20
compare with master
unifiedsplit
src/Control/Distributed/Process/Internal/Messaging.hs+1−2 src/Control/Distributed/Process/Internal/Primitives.hs+4−4 src/Control/Distributed/Process/Management.hs+3−9 src/Control/Distributed/Process/Node.hs+8−3 src/Control/Distributed/Process/UnsafePrimitives.hs+1−2
src/Control/Distributed/Process/Internal/Messaging.hs+1−2
@@ -18,7 +18,7 @@ import Control.Distributed.Process.Serializable ()
1818
1919import Control.Concurrent.Chan (writeChan)
2020import Control.Monad (unless)
21−import Control.Monad.IO.Class (MonadIO, liftIO)
21+import Control.Monad.IO.Class (liftIO)
2222import Control.Monad.Reader (ask)
2323import qualified Network.Transport as NT
2424 ( Connection
@@ -195,4 +195,3 @@ sendCtrlMsg mNid signal = do
195195 (NodeIdentifier nid)
196196 WithImplicitReconnect
197197 msg
198−
src/Control/Distributed/Process/Internal/Primitives.hs+4−4
@@ -127,7 +127,7 @@ import System.Locale (defaultTimeLocale)
127127import System.Timeout (timeout)
128128import Control.Monad (when)
129129import Control.Monad.Reader (ask)
130−import Control.Monad.IO.Class (MonadIO, liftIO)
130+import Control.Monad.IO.Class (liftIO)
131131import Control.Applicative ((<$>))
132132import Control.Exception (Exception(..), throw, throwIO, SomeException)
133133import qualified Control.Exception as Ex (catch, mask, mask_, try)
@@ -738,10 +738,10 @@ getNodeStats nid = do
738738 selfNode <- getSelfNode
739739 if nid == selfNode
740740 then Right `fmap` getLocalNodeStats -- optimisation
741− else getNodeStatsRemote nid
741+ else getNodeStatsRemote
742742 where
743− getNodeStatsRemote :: NodeId -> Process (Either DiedReason NodeStats)
744− getNodeStatsRemote nid = do
743+ getNodeStatsRemote :: Process (Either DiedReason NodeStats)
744+ getNodeStatsRemote = do
745745 sendCtrlMsg (Just nid) $ GetNodeStats nid
746746 bracket (monitorNode nid) unmonitor $ \mRef ->
747747 receiveWait [ match (\(stats :: NodeStats) -> return $ Right stats)
src/Control/Distributed/Process/Management.hs+3−9
@@ -276,8 +276,7 @@ module Control.Distributed.Process.Management
276276import Control.Applicative ((<$>))
277277import Control.Concurrent.STM (atomically)
278278import Control.Concurrent.STM.TChan
279− ( tryReadTChan
280− , readTChan
279+ ( readTChan
281280 , writeTChan
282281 , TChan
283282 )
@@ -285,7 +284,6 @@ import Control.Distributed.Process.Internal.Primitives
285284 ( newChan
286285 , nsend
287286 , receiveWait
288− , receiveTimeout
289287 , matchChan
290288 , matchAny
291289 , matchSTM
@@ -320,9 +318,7 @@ import Control.Distributed.Process.Serializable (Serializable)
320318import Control.Monad.IO.Class (liftIO)
321319import Control.Monad.Reader (ask)
322320import qualified Control.Monad.State as ST
323− ( MonadState
324− , StateT
325− , get
321+ ( get
326322 , modify
327323 , lift
328324 , runStateT
@@ -526,8 +522,7 @@ mxAgentWithFinalize mxId initState handlers dtor = do
526522-- MxAgentBecome h' -> runAgent h' c state
527523
528524 getNextInput sel chan =
529− let stmRead = atomically . readTChan
530− matches =
525+ let matches =
531526 case sel of
532527 Mailbox -> [ matchAny return
533528 , matchSTM (readTChan chan) return]
@@ -554,4 +549,3 @@ mxAgentWithFinalize mxId initState handlers dtor = do
554549 case pass of
555550 Nothing -> runPipeline msg state next
556551 Just result -> return (result, state')
557−
src/Control/Distributed/Process/Node.hs+8−3
@@ -52,7 +52,7 @@ import Data.Foldable (forM_)
5252import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
5353import Data.Typeable (Typeable)
5454import Control.Category ((>>>))
55−import Control.Applicative ((<$>))
55+import Control.Applicative (Applicative, (<$>))
5656import Control.Monad (void, when)
5757import Control.Monad.IO.Class (MonadIO, liftIO)
5858import Control.Monad.State.Strict (MonadState, StateT, evalStateT, gets)
@@ -99,7 +99,6 @@ import qualified Network.Transport as NT
9999 , address
100100 , closeEndPoint
101101 , ConnectionId
102− , Connection
103102 , close
104103 , EndPointAddress
105104 , Reliability(ReliableOrdered)
@@ -592,7 +591,13 @@ data NCState = NCState
592591 }
593592
594593newtype NC a = NC { unNC :: StateT NCState (ReaderT LocalNode IO) a }
595− deriving (Functor, Monad, MonadIO, MonadState NCState, MonadReader LocalNode)
594+ deriving ( Applicative
595+ , Functor
596+ , Monad
597+ , MonadIO
598+ , MonadState NCState
599+ , MonadReader LocalNode
600+ )
596601
597602initNCState :: NCState
598603initNCState = NCState { _links = Map.empty
src/Control/Distributed/Process/UnsafePrimitives.hs+1−2
@@ -70,7 +70,7 @@ import Control.Distributed.Process.Internal.Types
7070 )
7171import Control.Distributed.Process.Serializable (Serializable)
7272
73−import Control.Monad.IO.Class (MonadIO, liftIO)
73+import Control.Monad.IO.Class (liftIO)
7474import Control.Monad.Reader (ask)
7575
7676-- | Named send to a process in the local registry (asynchronous)
@@ -118,4 +118,3 @@ sendChan (SendPort cid) msg = do
118118-- | Create an unencoded @Message@ for any @Serializable@ type.
119119wrapMessage :: Serializable a => a -> Message
120120wrapMessage = unsafeCreateUnencodedMessage
121−