git.iko.soy/distributed-process
on master help sign in
Merge pull request #280 from haskell-distributed/fix-warnings

Fix compilation warnings.

commit0a7488c002a54c1f96220666980a36b9143cecef authorFacundo Domínguez <facundominguez@gmail.com> dateThu 10 Mar 2016, 21:19 (11 years ago) parente54dcf186c2366
5 files changed+15−25
compare with master
unifiedsplit
src/Control/Distributed/Process/Debug.hs+3−7 src/Control/Distributed/Process/Management.hs+3−2 src/Control/Distributed/Process/Management/Internal/Agent.hs+2−1 src/Control/Distributed/Process/Management/Internal/Trace/Primitives.hs+2−1 src/Control/Distributed/Process/Node.hs+5−14
src/Control/Distributed/Process/Debug.hs+3−7
@@ -141,17 +141,14 @@ module Control.Distributed.Process.Debug
141141 )
142142 where
143143
144−import Control.Applicative ((<$>))
144+import Control.Applicative
145145import Control.Distributed.Process.Internal.Primitives
146146 ( proxy
147− , finally
148147 , die
149148 , whereis
150149 , send
151150 , receiveWait
152151 , matchIf
153− , finally
154− , try
155152 , monitor
156153 )
157154import Control.Distributed.Process.Internal.Types
@@ -196,12 +193,11 @@ import Control.Exception (SomeException)
196193
197194import Control.Monad.IO.Class (liftIO)
198195import Control.Monad.Reader (ask)
196+import Control.Monad.Catch (finally, try)
199197
200198import Data.Binary()
201199
202−#if ! MIN_VERSION_base(4,6,0)
203−import Prelude hiding (catch)
204−#endif
200+import Prelude
205201
206202--------------------------------------------------------------------------------
207203-- Debugging/Tracing API --
src/Control/Distributed/Process/Management.hs+3−2
@@ -242,7 +242,7 @@ module Control.Distributed.Process.Management
242242 , liftMX
243243 ) where
244244
245−import Control.Applicative ((<$>))
245+import Control.Applicative
246246import Control.Concurrent.STM (atomically)
247247import Control.Concurrent.STM.TChan
248248 ( readTChan
@@ -254,7 +254,6 @@ import Control.Distributed.Process.Internal.Primitives
254254 , matchAny
255255 , matchSTM
256256 , unwrapMessage
257− , onException
258257 , register
259258 , whereis
260259 , die
@@ -281,12 +280,14 @@ import Control.Distributed.Process.Management.Internal.Types
281280import Control.Distributed.Process.Serializable (Serializable)
282281import Control.Monad.IO.Class (liftIO)
283282import Control.Monad.Reader (ask)
283+import Control.Monad.Catch (onException)
284284import qualified Control.Monad.State as ST
285285 ( get
286286 , modify
287287 , lift
288288 , runStateT
289289 )
290+import Prelude
290291
291292-- | Publishes an arbitrary @Serializable@ message to the management event bus.
292293-- Note that /no attempt is made to force the argument/, therefore it is very
src/Control/Distributed/Process/Management/Internal/Agent.hs+2−1
@@ -3,7 +3,7 @@
33
44module Control.Distributed.Process.Management.Internal.Agent where
55
6−import Control.Applicative ((<$>))
6+import Control.Applicative
77import Control.Concurrent (forkIO)
88import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, takeMVar)
99import Control.Concurrent.STM (atomically)
@@ -44,6 +44,7 @@ import Control.Monad (void)
4444import Control.Monad.IO.Class (liftIO)
4545import Control.Monad.Reader (ask)
4646import GHC.Weak (Weak, deRefWeak)
47+import Prelude
4748
4849--------------------------------------------------------------------------------
4950-- Agent Controller Implementation --
src/Control/Distributed/Process/Management/Internal/Trace/Primitives.hs+2−1
@@ -28,7 +28,7 @@ module Control.Distributed.Process.Management.Internal.Trace.Primitives
2828 , withRegisteredTracer
2929 ) where
3030
31−import Control.Applicative ((<$>))
31+import Control.Applicative
3232import Control.Distributed.Process.Internal.Primitives
3333 ( whereis
3434 , newChan
@@ -67,6 +67,7 @@ import Control.Monad.IO.Class (liftIO)
6767import Control.Monad.Reader (ask)
6868
6969import qualified Data.Set as Set (fromList)
70+import Prelude
7071
7172--------------------------------------------------------------------------------
7273-- Main API --
src/Control/Distributed/Process/Node.hs+5−14
@@ -20,10 +20,6 @@ module Control.Distributed.Process.Node
2020
2121-- TODO: Calls to 'sendBinary' and co (by the NC) may stall the node controller.
2222
23−#if ! MIN_VERSION_base(4,6,0)
24−import Prelude hiding (catch)
25−#endif
26−
2723import System.IO (fixIO, hPutStrLn, stderr)
2824import System.Mem.Weak (Weak, deRefWeak)
2925import qualified Data.ByteString.Lazy as BSL (fromChunks)
@@ -52,7 +48,7 @@ import Data.Foldable (forM_)
5248import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
5349import Data.Typeable (Typeable)
5450import Control.Category ((>>>))
55−import Control.Applicative (Applicative, (<$>))
51+import Control.Applicative
5652import Control.Monad (void, when, join)
5753import Control.Monad.IO.Class (MonadIO, liftIO)
5854import Control.Monad.State.Strict (MonadState, StateT, evalStateT, gets)
@@ -60,7 +56,6 @@ import qualified Control.Monad.State.Strict as StateT (get, put)
6056import Control.Monad.Reader (MonadReader, ReaderT, runReaderT, ask)
6157import Control.Exception
6258 ( throwIO
63− , AsyncException(ThreadKilled)
6459 , SomeException
6560 , Exception
6661 , throwTo
@@ -72,12 +67,11 @@ import qualified Control.Exception as Exception
7267 , catches
7368 , finally
7469 )
75−import Control.Concurrent (forkIO, forkIOWithUnmask, killThread, myThreadId)
70+import Control.Concurrent (forkIO, forkIOWithUnmask, killThread)
7671import Control.Distributed.Process.Internal.StrictMVar
7772 ( newMVar
7873 , withMVar
7974 , modifyMVarMasked
80− , modifyMVar_
8175 , modifyMVar
8276 , newEmptyMVar
8377 , putMVar
@@ -167,12 +161,11 @@ import Control.Distributed.Process.Internal.Types
167161 , RegisterReply(..)
168162 , WhereIsReply(..)
169163 , payloadToMessage
170− , messageToPayload
171164 , createUnencodedMessage
172165 , unsafeCreateUnencodedMessage
173166 , runLocalProcess
174167 , firstNonReservedProcessId
175− , ImplicitReconnect(WithImplicitReconnect,NoImplicitReconnect)
168+ , ImplicitReconnect(WithImplicitReconnect)
176169 )
177170import Control.Distributed.Process.Management.Internal.Agent
178171 ( mxAgentController
@@ -195,7 +188,6 @@ import Control.Distributed.Process.Management.Internal.Types
195188import Control.Distributed.Process.Serializable (Serializable)
196189import Control.Distributed.Process.Internal.Messaging
197190 ( sendBinary
198− , sendPayload
199191 , closeImplicitReconnections
200192 , impliesDeathOf
201193 )
@@ -204,7 +196,6 @@ import Control.Distributed.Process.Internal.Primitives
204196 , receiveWait
205197 , match
206198 , sendChan
207− , try
208199 , unwrapMessage
209200 )
210201import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
@@ -214,7 +205,9 @@ import qualified Control.Distributed.Process.Internal.StrictContainerAccessors a
214205 ( mapMaybe
215206 , mapDefault
216207 )
208+import Control.Monad.Catch (try)
217209import Unsafe.Coerce
210+import Prelude
218211
219212--------------------------------------------------------------------------------
220213-- Initialization --
@@ -308,8 +301,6 @@ startServiceProcesses node = do
308301 -- process which uses 'send' or other primitives which are traced.
309302 register "trace.logger" logger
310303 where
311− fork = forkProcess node
312−
313304 loop = do
314305 receiveWait
315306 [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do