git.iko.soy/distributed-process
on master help sign in
Merge pull request #316 from haskell-distributed/gh-315

Support latest exceptions package.

commitd91a88f70c2cb6a6511283c5720bd9950fc3c55a authorFacundo Domínguez <facundominguez@gmail.com> dateMon 30 Apr 2018, 13:19 (8 years ago) parent347b2e4df911bf
4 files changed+13−12
compare with master
unifiedsplit
ChangeLog+5 src/Control/Distributed/Process/Internal/Types.hs+8 src/Control/Distributed/Process/Management/Internal/Trace/Types.hs−10 src/Control/Distributed/Process/Node.hs−2
ChangeLog+5
@@ -1,3 +1,8 @@
1+[Unreliazed]
2+
3+# Added
4+* Added support for exceptions >= 0.10
5+
162017-08-31 Facundo Domínguez <facundo.dominguez@tweag.io> 0.7.3
27
38* Drop support for ghc-7.8.* and earlier.
src/Control/Distributed/Process/Internal/Types.hs+8
@@ -366,6 +366,14 @@ instance MonadCatch Process where
366366 lproc <- ask
367367 liftIO $ catch (runLocalProcess lproc p) (runLocalProcess lproc . h)
368368instance MonadMask Process where
369+#if MIN_VERSION_exceptions(0,10,0)
370+ generalBracket acquire release inner = do
371+ lproc <- ask
372+ liftIO $
373+ generalBracket (runLocalProcess lproc acquire)
374+ (\a e -> runLocalProcess lproc $ release a e)
375+ (runLocalProcess lproc . inner)
376+#endif
369377 mask p = do
370378 lproc <- ask
371379 liftIO $ mask $ \restore ->
src/Control/Distributed/Process/Management/Internal/Trace/Types.hs−10
@@ -43,7 +43,6 @@ import Control.Distributed.Process.Serializable
4343import Data.Binary
4444import Data.List (intersperse)
4545import Data.Set (Set)
46−import qualified Data.Set as Set (fromList)
4746import Data.Typeable
4847import GHC.Generics
4948
@@ -158,12 +157,3 @@ getTraceFlags t s = publishEvent t (unsafeCreateUnencodedMessage s)
158157
159158getCurrentTraceClient :: MxEventBus -> SendPort (Maybe ProcessId) -> IO ()
160159getCurrentTraceClient t s = publishEvent t (unsafeCreateUnencodedMessage s)
161−
162−class Traceable a where
163− uod :: [a] -> TraceSubject
164−
165−instance Traceable ProcessId where
166− uod = TraceProcs . Set.fromList
167−
168−instance Traceable String where
169− uod = TraceNames . Set.fromList
src/Control/Distributed/Process/Node.hs−2
@@ -37,7 +37,6 @@ import qualified Data.Map as Map
3737 , filterWithKey
3838 , foldlWithKey
3939 )
40−import qualified Data.Set as Set
4140import Data.Time.Format (formatTime)
4241#if MIN_VERSION_time(1,5,0)
4342import Data.Time.Format (defaultTimeLocale)
@@ -55,7 +54,6 @@ import qualified Data.Set as Set
5554 , union
5655 )
5756import Data.Foldable (forM_)
58−import Data.List (foldl')
5957import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
6058import Data.Typeable (Typeable)
6159import Control.Category ((>>>))