on master help sign in
Re-export MonadIO and MonadUnliftIO
commit115aa0a48654fb8568eb0380f348edc340104c55 authorAndrzej Rybczak <andrzej@rybczak.net> dateSat 31 Jul 2021, 16:48 (5 years ago) parentf3c7e00
9 files changed+14−9
effectful-core/src/Effectful/Monad.hs+7 effectful/bench/Concurrency.hs−1 effectful/bench/Unlift.hs+3−3 effectful/examples/FileSystem.hs−1 effectful/src/Effectful.hs+4 effectful/tests/AsyncTests.hs−1 effectful/tests/ConcurrencyTests.hs−1 effectful/tests/ErrorTests.hs−1 effectful/tests/Utils.hs−1
effectful-core/src/Effectful/Monad.hs+7
@@ -18,7 +18,14 @@ module Effectful.Monad
1818 , unliftStrategy
1919 , withUnliftStrategy
2020 , withEffToIO
21+
22+ -- * Re-exports
23+ , MonadIO(..)
24+ , MonadUnliftIO(..)
2125 ) where
2226
27+import Control.Monad.IO.Class
28+import Control.Monad.IO.Unlift
29+
2330import Effectful.Internal.Effect
2431import Effectful.Internal.Monad
effectful/bench/Concurrency.hs−1
@@ -11,7 +11,6 @@ import Test.Tasty.Bench hiding (env)
1111
1212import Control.Concurrent.Async
1313import Control.Monad
14−import Control.Monad.IO.Class
1514import qualified Effectful.Async as A
1615
1716import Effectful
effectful/bench/Unlift.hs+3−3
@@ -9,7 +9,7 @@ import Criterion
99import Test.Tasty.Bench
1010#endif
1111
12−import UnliftIO
12+import qualified UnliftIO as U
1313
1414import Effectful
1515import Effectful.State.Dynamic
@@ -92,10 +92,10 @@ benchDummy :: MonadUnliftIO m => m ()
9292benchDummy = withRunInIO $ \runIO -> runIO $ pure ()
9393
9494benchAsync :: MonadUnliftIO m => m ()
95−benchAsync = withAsync (pure ()) wait
95+benchAsync = U.withAsync (pure ()) U.wait
9696
9797benchConcurrently :: MonadUnliftIO m => m ()
98−benchConcurrently = concurrently_ (pure ()) (pure ())
98+benchConcurrently = U.concurrently_ (pure ()) (pure ())
9999
100100benchDummyE :: Eff es ()
101101benchDummyE = pure ()
effectful/examples/FileSystem.hs−1
@@ -9,7 +9,6 @@ module FileSystem
99
1010import Control.Exception (IOException)
1111import Control.Monad.Catch
12−import Control.Monad.IO.Class
1312import Prelude hiding (readFile, writeFile)
1413import qualified Data.Map.Strict as M
1514import qualified System.IO as IO
effectful/src/Effectful.hs+4
@@ -48,6 +48,10 @@ module Effectful
4848 -- *** Bidirectional lifts
4949 , localLiftUnlift
5050 , localLiftUnliftIO
51+
52+ -- * Re-exports
53+ , MonadIO(..)
54+ , MonadUnliftIO(..)
5155 ) where
5256
5357import Effectful.Handler
effectful/tests/AsyncTests.hs−1
@@ -2,7 +2,6 @@ module AsyncTests (asyncTests) where
22
33import Control.Concurrent (threadDelay)
44import Control.Monad
5−import Control.Monad.IO.Class
65import Test.Tasty
76import Test.Tasty.HUnit
87import qualified Data.Set as S
effectful/tests/ConcurrencyTests.hs−1
@@ -2,7 +2,6 @@ module ConcurrencyTests (concurrencyTests) where
22
33import Control.Concurrent (threadDelay)
44import Control.Monad
5−import Control.Monad.IO.Class
65import Test.Tasty
76import Test.Tasty.HUnit
87import UnliftIO
effectful/tests/ErrorTests.hs−1
@@ -1,6 +1,5 @@
11module ErrorTests (errorTests) where
22
3−import Control.Monad.IO.Class
43import Test.Tasty
54import Test.Tasty.HUnit
65
effectful/tests/Utils.hs−1
@@ -6,7 +6,6 @@ module Utils
66 ) where
77
88import Control.Exception
9−import Control.Monad.IO.Class
109import GHC.Stack
1110import qualified Test.Tasty.HUnit as T
1211