git.iko.soy/distributed-process
on master help sign in
Silence compiler warnings and install `rematch' for travis-ci
commit39feb451cb863574432b8166333128b0bdecee52 authorTim Watson <watson.timothy@gmail.com> dateThu 9 May 2013, 23:32 (13 years ago) parentaa42de9
5 files changed+11−7
compare with master
unifiedsplit
Makefile+1 src/Control/Distributed/Process/Internal/Primitives.hs+1−3 src/Control/Distributed/Process/Internal/Trace/Tracer.hs+2−1 tests/TestStats.hs+3−1 tests/TestTracing.hs+4−2
Makefile+1
@@ -24,6 +24,7 @@ ci: travis-install travis-test
2424
2525.PHONY: travis-install
2626travis-install: $(REPOS)
27+ $(CABAL) install rematch --force-reinstalls
2728 $(CABAL) install --with-ghc=$(GHC) $(REPOS) --force-reinstalls
2829 $(CABAL) install
2930
src/Control/Distributed/Process/Internal/Primitives.hs+1−3
@@ -121,7 +121,6 @@ import Control.Distributed.Process.Internal.StrictMVar
121121 , modifyMVar
122122 , modifyMVar_
123123 )
124−import Control.Concurrent.Chan (writeChan)
125124import Control.Concurrent.STM
126125 ( STM
127126 , TVar
@@ -154,7 +153,6 @@ import Control.Distributed.Process.Internal.Types
154153 , Message(..)
155154 , MonitorRef(..)
156155 , SpawnRef(..)
157− , NCMsg(..)
158156 , ProcessSignal(..)
159157 , monitorCounter
160158 , spawnCounter
@@ -178,7 +176,7 @@ import Control.Distributed.Process.Internal.Types
178176 , createMessage
179177 , createUnencodedMessage
180178 , runLocalProcess
181− , ImplicitReconnect(WithImplicitReconnect, NoImplicitReconnect)
179+ , ImplicitReconnect(NoImplicitReconnect)
182180 , LocalProcessState
183181 , LocalSendPortId
184182 , messageToPayload
src/Control/Distributed/Process/Internal/Trace/Tracer.hs+2−1
@@ -29,7 +29,6 @@ import Control.Distributed.Process.Internal.Primitives
2929 , matchAny
3030 , matchIf
3131 , handleMessage
32− , unwrapMessage
3332 , matchUnknown
3433 )
3534import Control.Distributed.Process.Internal.Trace.Types
@@ -71,7 +70,9 @@ import Data.Time.Clock (getCurrentTime)
7170import Data.Time.Format (formatTime)
7271import Debug.Trace (traceEventIO)
7372
73+#if ! MIN_VERSION_base(4,6,0)
7474import Prelude hiding (catch)
75+#endif
7576
7677import System.Environment (getEnv)
7778import System.IO
tests/TestStats.hs+3−1
@@ -18,7 +18,9 @@ import Control.Distributed.Process.Node
1818import Data.Binary()
1919import Data.Typeable()
2020import Network.Transport.TCP
21−import Prelude hiding (catch, log)
21+#if ! MIN_VERSION_base(4,6,0)
22+import Prelude hiding (catch)
23+#endif
2224import Test.Framework
2325 ( Test
2426 , defaultMain
tests/TestTracing.hs+4−2
@@ -20,7 +20,9 @@ import Control.Distributed.Process.Node
2020 , LocalNode)
2121import Control.Exception as Ex (catch)
2222import Network.Transport.TCP
23+#if ! MIN_VERSION_base(4,6,0)
2324import Prelude hiding (catch, log)
25+#endif
2426import Test.Framework
2527 ( Test
2628 , defaultMain
@@ -275,9 +277,9 @@ testRemoteTraceRelay result =
275277 -- Here we set up that relay, and then wait for a signal
276278 -- that the tracer (on node1) has seen the expected
277279 -- TraceEvSpawned message, at which point we're finished
278− (Just log) <- whereis "logger"
280+ (Just log') <- whereis "logger"
279281 pid <- liftIO $ forkProcess node2 $ do
280− logRelay <- spawnLocal $ relay log
282+ logRelay <- spawnLocal $ relay log'
281283 reregister "logger" logRelay
282284 getSelfNode >>= stash mvNid >> (expect :: Process ())
283285