git.iko.soy/distributed-process
on master help sign in
Silence compiler warnings and install `rematch' for travis-ci
39feb45Tim Watson
Makefile+1
compare with master
unifiedsplit
@@ -24,6 +24,7 @@ ci: travis-install travis-test
24
24
25.PHONY: travis-install
25.PHONY: travis-install
26travis-install: $(REPOS)
26travis-install: $(REPOS)
27+ $(CABAL) install rematch --force-reinstalls
27 $(CABAL) install --with-ghc=$(GHC) $(REPOS) --force-reinstalls
28 $(CABAL) install --with-ghc=$(GHC) $(REPOS) --force-reinstalls
28 $(CABAL) install
29 $(CABAL) install
29
30
src/Control/Distributed/Process/Internal/Primitives.hs+1−3
@@ -121,7 +121,6 @@ import Control.Distributed.Process.Internal.StrictMVar
121 , modifyMVar
121 , modifyMVar
122 , modifyMVar_
122 , modifyMVar_
123 )
123 )
124−import Control.Concurrent.Chan (writeChan)
125import Control.Concurrent.STM
124import Control.Concurrent.STM
126 ( STM
125 ( STM
127 , TVar
126 , TVar
@@ -154,7 +153,6 @@ import Control.Distributed.Process.Internal.Types
154 , Message(..)
153 , Message(..)
155 , MonitorRef(..)
154 , MonitorRef(..)
156 , SpawnRef(..)
155 , SpawnRef(..)
157− , NCMsg(..)
158 , ProcessSignal(..)
156 , ProcessSignal(..)
159 , monitorCounter
157 , monitorCounter
160 , spawnCounter
158 , spawnCounter
@@ -178,7 +176,7 @@ import Control.Distributed.Process.Internal.Types
178 , createMessage
176 , createMessage
179 , createUnencodedMessage
177 , createUnencodedMessage
180 , runLocalProcess
178 , runLocalProcess
181− , ImplicitReconnect(WithImplicitReconnect, NoImplicitReconnect)
179+ , ImplicitReconnect(NoImplicitReconnect)
182 , LocalProcessState
180 , LocalProcessState
183 , LocalSendPortId
181 , LocalSendPortId
184 , messageToPayload
182 , messageToPayload
src/Control/Distributed/Process/Internal/Trace/Tracer.hs+2−1
@@ -29,7 +29,6 @@ import Control.Distributed.Process.Internal.Primitives
29 , matchAny
29 , matchAny
30 , matchIf
30 , matchIf
31 , handleMessage
31 , handleMessage
32− , unwrapMessage
33 , matchUnknown
32 , matchUnknown
34 )
33 )
35import Control.Distributed.Process.Internal.Trace.Types
34import Control.Distributed.Process.Internal.Trace.Types
@@ -71,7 +70,9 @@ import Data.Time.Clock (getCurrentTime)
71import Data.Time.Format (formatTime)
70import Data.Time.Format (formatTime)
72import Debug.Trace (traceEventIO)
71import Debug.Trace (traceEventIO)
73
72
73+#if ! MIN_VERSION_base(4,6,0)
74import Prelude hiding (catch)
74import Prelude hiding (catch)
75+#endif
75
76
76import System.Environment (getEnv)
77import System.Environment (getEnv)
77import System.IO
78import System.IO
tests/TestStats.hs+3−1
@@ -18,7 +18,9 @@ import Control.Distributed.Process.Node
18import Data.Binary()
18import Data.Binary()
19import Data.Typeable()
19import Data.Typeable()
20import Network.Transport.TCP
20import Network.Transport.TCP
21+#if ! MIN_VERSION_base(4,6,0)
21−import Prelude hiding (catch, log)
22+import Prelude hiding (catch)
23+#endif
22import Test.Framework
24import Test.Framework
23 ( Test
25 ( Test
24 , defaultMain
26 , defaultMain
tests/TestTracing.hs+4−2
@@ -20,7 +20,9 @@ import Control.Distributed.Process.Node
20 , LocalNode)
20 , LocalNode)
21import Control.Exception as Ex (catch)
21import Control.Exception as Ex (catch)
22import Network.Transport.TCP
22import Network.Transport.TCP
23+#if ! MIN_VERSION_base(4,6,0)
23import Prelude hiding (catch, log)
24import Prelude hiding (catch, log)
25+#endif
24import Test.Framework
26import Test.Framework
25 ( Test
27 ( Test
26 , defaultMain
28 , defaultMain
@@ -275,9 +277,9 @@ testRemoteTraceRelay result =
275 -- Here we set up that relay, and then wait for a signal
277 -- Here we set up that relay, and then wait for a signal
276 -- that the tracer (on node1) has seen the expected
278 -- that the tracer (on node1) has seen the expected
277 -- TraceEvSpawned message, at which point we're finished
279 -- TraceEvSpawned message, at which point we're finished
278− (Just log) <- whereis "logger"
280+ (Just log') <- whereis "logger"
279 pid <- liftIO $ forkProcess node2 $ do
281 pid <- liftIO $ forkProcess node2 $ do
280− logRelay <- spawnLocal $ relay log
282+ logRelay <- spawnLocal $ relay log'
281 reregister "logger" logRelay
283 reregister "logger" logRelay
282 getSelfNode >>= stash mvNid >> (expect :: Process ())
284 getSelfNode >>= stash mvNid >> (expect :: Process ())
283
285