From ad98bb6d90c771c30684d442772619bb6d6540ef Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Mon, 16 Feb 2015 02:50:20 +0000 Subject: [PATCH] Fix a => typo (why did that ever compile and run!?) --- Control/Monad/Conc/Class.hs | 4 ++-- Test/DejaFu/Deterministic.hs | 2 +- Test/DejaFu/Deterministic/IO.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Control/Monad/Conc/Class.hs b/Control/Monad/Conc/Class.hs index f9a819d..e3f592e 100755 --- a/Control/Monad/Conc/Class.hs +++ b/Control/Monad/Conc/Class.hs @@ -131,7 +131,7 @@ class ( Monad m, MonadCatch m, MonadThrow m, MonadMask m -- | Throw an exception to the target thread. This blocks until the -- exception is delivered, and it is just as if the target thread -- had raised it with 'throw'. This can interrupt a blocked action. - throwTo :: Exception e => ThreadId m => e -> m () + throwTo :: Exception e => ThreadId m -> e -> m () -- | Executes a computation with asynchronous exceptions -- /masked/. That is, any thread which attempts to raise an @@ -223,5 +223,5 @@ forkFinally action and_then = -- | Raise the 'ThreadKilled' exception in the target thread. Note -- that if the thread is prepared to catch this exception, it won't -- actually kill it. -killThread :: MonadConc m => ThreadId m => m () +killThread :: MonadConc m => ThreadId m -> m () killThread tid = throwTo tid ThreadKilled diff --git a/Test/DejaFu/Deterministic.hs b/Test/DejaFu/Deterministic.hs index 772242d..d43ebe2 100755 --- a/Test/DejaFu/Deterministic.hs +++ b/Test/DejaFu/Deterministic.hs @@ -174,7 +174,7 @@ throwTo tid e = C $ cont $ \c -> AThrowTo tid (SomeException e) $ c () -- | Raise the 'ThreadKilled' exception in the target thread. Note -- that if the thread is prepared to catch this exception, it won't -- actually kill it. -killThread :: ThreadId => Conc t () +killThread :: ThreadId -> Conc t () killThread = C.killThread -- | Catch an exception raised by 'throw'. This __cannot__ catch diff --git a/Test/DejaFu/Deterministic/IO.hs b/Test/DejaFu/Deterministic/IO.hs index 1a08ffe..d8680ac 100644 --- a/Test/DejaFu/Deterministic/IO.hs +++ b/Test/DejaFu/Deterministic/IO.hs @@ -179,7 +179,7 @@ throwTo tid e = C $ cont $ \c -> AThrowTo tid (SomeException e) $ c () -- | Raise the 'ThreadKilled' exception in the target thread. Note -- that if the thread is prepared to catch this exception, it won't -- actually kill it. -killThread :: ThreadId => ConcIO t () +killThread :: ThreadId -> ConcIO t () killThread = C.killThread -- | Catch an exception raised by 'throw'. This __cannot__ catch