Skip to content

Commit

Permalink
Merge pull request #153 from edsko/edsko/more-precise-import
Browse files Browse the repository at this point in the history
Avoid importing everything from `GHC.Conc`
  • Loading branch information
simonmar authored Nov 21, 2023
2 parents 4a70b53 + 04cbe9f commit 4d490f3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Control/Concurrent/Async/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import Data.IORef

import GHC.Exts
import GHC.IO hiding (finally, onException)
import GHC.Conc
import GHC.Conc (ThreadId(..))

-- -----------------------------------------------------------------------------
-- STM Async API
Expand Down Expand Up @@ -575,7 +575,7 @@ concurrently :: IO a -> IO b -> IO (a,b)

-- | Run two @IO@ actions concurrently. If both of them end with @Right@,
-- return both results. If one of then ends with @Left@, interrupt the other
-- action and return the @Left@.
-- action and return the @Left@.
--
concurrentlyE :: IO (Either e a) -> IO (Either e b) -> IO (Either e (a, b))

Expand Down Expand Up @@ -831,7 +831,7 @@ instance Applicative (ConcurrentlyE e) where
ConcurrentlyE $ fmap (\(f, a) -> f a) <$> concurrentlyE fs eas

#if MIN_VERSION_base(4,9,0)
-- | Either the combination of the successful results, or the first failure.
-- | Either the combination of the successful results, or the first failure.
instance Semigroup a => Semigroup (ConcurrentlyE e a) where
(<>) = liftA2 (<>)

Expand Down

0 comments on commit 4d490f3

Please sign in to comment.