Merge pull request #316 from haskell-distributed/gh-315

Support latest exceptions package.

Author: facundominguez

ChangeLog

@@ -1,3 +1,8 @@
+[Unreliazed]
+
+# Added
+* Added support for exceptions >= 0.10
+
 2017-08-31 Facundo Domínguez <facundo.dominguez@tweag.io> 0.7.3
 
 * Drop support for ghc-7.8.* and earlier.

src/Control/Distributed/Process/Internal/Types.hs

@@ -366,6 +366,14 @@ instance MonadCatch Process where
     lproc <- ask
     liftIO $ catch (runLocalProcess lproc p) (runLocalProcess lproc . h)
 instance MonadMask Process where
+#if MIN_VERSION_exceptions(0,10,0)
+  generalBracket acquire release inner = do
+    lproc <- ask
+    liftIO $
+      generalBracket (runLocalProcess lproc acquire)
+                     (\a e -> runLocalProcess lproc $ release a e)
+                     (runLocalProcess lproc . inner)
+#endif
   mask p = do
       lproc <- ask
       liftIO $ mask $ \restore ->

src/Control/Distributed/Process/Management/Internal/Trace/Types.hs

@@ -43,7 +43,6 @@ import Control.Distributed.Process.Serializable
 import Data.Binary
 import Data.List (intersperse)
 import Data.Set (Set)
-import qualified Data.Set as Set (fromList)
 import Data.Typeable
 import GHC.Generics
 
@@ -158,12 +157,3 @@ getTraceFlags t s = publishEvent t (unsafeCreateUnencodedMessage s)
 
 getCurrentTraceClient :: MxEventBus -> SendPort (Maybe ProcessId) -> IO ()
 getCurrentTraceClient t s = publishEvent t (unsafeCreateUnencodedMessage s)
-
-class Traceable a where
-  uod :: [a] -> TraceSubject
-
-instance Traceable ProcessId where
-  uod = TraceProcs . Set.fromList
-
-instance Traceable String where
-  uod = TraceNames . Set.fromList

src/Control/Distributed/Process/Node.hs

@@ -37,7 +37,6 @@ import qualified Data.Map as Map
   , filterWithKey
   , foldlWithKey
   )
-import qualified Data.Set as Set
 import Data.Time.Format (formatTime)
 #if MIN_VERSION_time(1,5,0)
 import Data.Time.Format (defaultTimeLocale)
@@ -55,7 +54,6 @@ import qualified Data.Set as Set
   , union
   )
 import Data.Foldable (forM_)
-import Data.List (foldl')
 import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
 import Data.Typeable (Typeable)
 import Control.Category ((>>>))