Skip to content

Commit f9be3ef

Browse files
committed
Thread def cleanup
1 parent 04f9696 commit f9be3ef

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/Control/Monad/Aff.purs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import Control.Monad.Rec.Class (class MonadRec, Step(..))
3434
import Control.MonadPlus (class MonadPlus)
3535
import Control.MonadZero (class MonadZero)
3636
import Control.Parallel (parSequence_)
37-
import Control.Parallel.Class (class Parallel, parallel, sequential)
37+
import Control.Parallel.Class (class Parallel)
3838
import Control.Plus (class Plus, empty)
3939
import Data.Either (Either(..), isLeft)
4040
import Data.Function.Uncurried as Fn
@@ -197,11 +197,8 @@ instance functorThread ∷ Functor (Thread eff) where
197197

198198
instance applyThreadApply (Thread eff) where
199199
apply t1 t2 = Thread
200-
{ kill: \err → sequential $ parallel (killThread err t1) *> parallel (killThread err t2)
201-
, join: memoAff do
202-
f ← joinThread t1
203-
a ← joinThread t2
204-
pure (f a)
200+
{ kill: \err → parSequence_ [ killThread err t1, killThread err t2 ]
201+
, join: memoAff (joinThread t1 <*> joinThread t2)
205202
}
206203

207204
instance applicativeThreadApplicative (Thread eff) where

0 commit comments

Comments
 (0)