From 9528a45a4559a8aaf8f331fa0e555a5735a4c420 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Sun, 27 Feb 2022 01:54:19 +0100
Subject: [PATCH] Move module to Quasar.Future

Co-authored-by: Jan Beinke <git@janbeinke.com>
---
 quasar.cabal                                     | 2 +-
 src/Quasar.hs                                    | 4 ++--
 src/Quasar/Async.hs                              | 2 +-
 src/Quasar/Async/Fork.hs                         | 2 +-
 src/Quasar/Async/STMHelper.hs                    | 2 +-
 src/Quasar/{Awaitable.hs => Future.hs}           | 2 +-
 src/Quasar/MonadQuasar.hs                        | 2 +-
 src/Quasar/MonadQuasar/Misc.hs                   | 2 +-
 src/Quasar/Observable.hs                         | 2 +-
 src/Quasar/Resources.hs                          | 2 +-
 src/Quasar/Resources/Disposer.hs                 | 2 +-
 src/Quasar/Timer.hs                              | 2 +-
 src/Quasar/Timer/TimerFd.hs                      | 2 +-
 src/Quasar/Utils/ShortIO.hs                      | 2 +-
 src/Quasar/Utils/TOnce.hs                        | 2 +-
 test/Quasar/AsyncSpec.hs                         | 2 +-
 test/Quasar/AwaitableSpec.hs                     | 2 +-
 test/Quasar/Observable/ObservableHashMapSpec.hs  | 2 +-
 test/Quasar/Observable/ObservablePrioritySpec.hs | 2 +-
 test/Quasar/ObservableSpec.hs                    | 2 +-
 test/Quasar/ResourcesSpec.hs                     | 2 +-
 21 files changed, 22 insertions(+), 22 deletions(-)
 rename src/Quasar/{Awaitable.hs => Future.hs} (99%)

diff --git a/quasar.cabal b/quasar.cabal
index 2b23db3..83d3a79 100644
--- a/quasar.cabal
+++ b/quasar.cabal
@@ -89,9 +89,9 @@ library
     Quasar.Async.Fork
     Quasar.Async.STMHelper
     Quasar.Async
-    Quasar.Awaitable
     Quasar.Exceptions
     Quasar.Exceptions.ExceptionSink
+    Quasar.Future
     Quasar.MonadQuasar
     Quasar.MonadQuasar.Misc
     Quasar.Observable
diff --git a/src/Quasar.hs b/src/Quasar.hs
index 354eb63..2d2936d 100644
--- a/src/Quasar.hs
+++ b/src/Quasar.hs
@@ -1,13 +1,13 @@
 module Quasar (
   module Quasar.Async,
-  module Quasar.Awaitable,
+  module Quasar.Future,
   module Quasar.MonadQuasar,
   module Quasar.Observable,
   module Quasar.Resources,
 ) where
 
 import Quasar.Async
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Observable
 import Quasar.Resources
diff --git a/src/Quasar/Async.hs b/src/Quasar/Async.hs
index 91e4513..76fd348 100644
--- a/src/Quasar/Async.hs
+++ b/src/Quasar/Async.hs
@@ -21,7 +21,7 @@ import Control.Concurrent (ThreadId)
 import Control.Concurrent.STM
 import Control.Monad.Catch
 import Quasar.Async.Fork
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.MonadQuasar
 import Quasar.Prelude
diff --git a/src/Quasar/Async/Fork.hs b/src/Quasar/Async/Fork.hs
index 3530ab2..17afe6f 100644
--- a/src/Quasar/Async/Fork.hs
+++ b/src/Quasar/Async/Fork.hs
@@ -19,7 +19,7 @@ import Control.Concurrent (ThreadId)
 import Control.Concurrent.STM
 import Control.Monad.Catch
 import Quasar.Async.STMHelper
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Utils.ShortIO
diff --git a/src/Quasar/Async/STMHelper.hs b/src/Quasar/Async/STMHelper.hs
index 404fb74..aa5560f 100644
--- a/src/Quasar/Async/STMHelper.hs
+++ b/src/Quasar/Async/STMHelper.hs
@@ -10,7 +10,7 @@ import Control.Concurrent (forkIO)
 import Control.Concurrent.STM
 import Control.Exception (BlockedIndefinitelyOnSTM)
 import Control.Monad.Catch
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Utils.ShortIO
diff --git a/src/Quasar/Awaitable.hs b/src/Quasar/Future.hs
similarity index 99%
rename from src/Quasar/Awaitable.hs
rename to src/Quasar/Future.hs
index 47dd6b7..3e1675d 100644
--- a/src/Quasar/Awaitable.hs
+++ b/src/Quasar/Future.hs
@@ -1,4 +1,4 @@
-module Quasar.Awaitable (
+module Quasar.Future (
   -- * MonadAwaitable
   MonadAwait(..),
   peekAwaitable,
diff --git a/src/Quasar/MonadQuasar.hs b/src/Quasar/MonadQuasar.hs
index e522ca6..372eadf 100644
--- a/src/Quasar/MonadQuasar.hs
+++ b/src/Quasar/MonadQuasar.hs
@@ -35,7 +35,7 @@ import Control.Monad.Catch
 import Control.Monad.Reader
 import GHC.Records (HasField(..))
 import Quasar.Async.STMHelper
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Resources.Disposer
diff --git a/src/Quasar/MonadQuasar/Misc.hs b/src/Quasar/MonadQuasar/Misc.hs
index 63b82a9..a01341f 100644
--- a/src/Quasar/MonadQuasar/Misc.hs
+++ b/src/Quasar/MonadQuasar/Misc.hs
@@ -15,7 +15,7 @@ import Control.Concurrent.STM
 import Control.Monad.Catch
 import Control.Monad.Reader
 import Data.List.NonEmpty
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Async
 import Quasar.Async.STMHelper
 import Quasar.Exceptions.ExceptionSink
diff --git a/src/Quasar/Observable.hs b/src/Quasar/Observable.hs
index ef29c6b..85b05df 100644
--- a/src/Quasar/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -35,7 +35,7 @@ module Quasar.Observable (
 --import Data.HashMap.Strict qualified as HM
 --import Data.IORef
 --import Data.Unique
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Disposable
 --import Quasar.Prelude
 --import Quasar.ResourceManager
diff --git a/src/Quasar/Resources.hs b/src/Quasar/Resources.hs
index e1bf6ba..9125adf 100644
--- a/src/Quasar/Resources.hs
+++ b/src/Quasar/Resources.hs
@@ -36,7 +36,7 @@ module Quasar.Resources (
 
 import Control.Concurrent.STM
 import Control.Monad.Catch
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Async.Fork
 import Quasar.Async.STMHelper
 import Quasar.Exceptions
diff --git a/src/Quasar/Resources/Disposer.hs b/src/Quasar/Resources/Disposer.hs
index 63c84fa..6d3a9ba 100644
--- a/src/Quasar/Resources/Disposer.hs
+++ b/src/Quasar/Resources/Disposer.hs
@@ -26,7 +26,7 @@ import Data.HashMap.Strict qualified as HM
 import Data.HashSet (HashSet)
 import Data.HashSet qualified as HashSet
 import Quasar.Async.STMHelper
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Utils.ShortIO
diff --git a/src/Quasar/Timer.hs b/src/Quasar/Timer.hs
index fd189cc..338f4d6 100644
--- a/src/Quasar/Timer.hs
+++ b/src/Quasar/Timer.hs
@@ -23,7 +23,7 @@ import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime)
 import Data.Foldable (toList)
 import Quasar.Async.STMHelper
 import Quasar.Async
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.MonadQuasar
 import Quasar.Prelude
diff --git a/src/Quasar/Timer/TimerFd.hs b/src/Quasar/Timer/TimerFd.hs
index 8768d11..a1847d5 100644
--- a/src/Quasar/Timer/TimerFd.hs
+++ b/src/Quasar/Timer/TimerFd.hs
@@ -12,7 +12,7 @@ import Control.Concurrent
 import Control.Monad.Catch
 import Foreign
 import Foreign.C
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Async
 import Quasar.MonadQuasar
 import Quasar.Prelude
diff --git a/src/Quasar/Utils/ShortIO.hs b/src/Quasar/Utils/ShortIO.hs
index 1e5fb1b..22b8ad7 100644
--- a/src/Quasar/Utils/ShortIO.hs
+++ b/src/Quasar/Utils/ShortIO.hs
@@ -15,7 +15,7 @@ module Quasar.Utils.ShortIO (
 ) where
 
 import Control.Monad.Catch
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Prelude
 import Control.Concurrent
 
diff --git a/src/Quasar/Utils/TOnce.hs b/src/Quasar/Utils/TOnce.hs
index 9401315..5850e72 100644
--- a/src/Quasar/Utils/TOnce.hs
+++ b/src/Quasar/Utils/TOnce.hs
@@ -9,7 +9,7 @@ module Quasar.Utils.TOnce (
 ) where
 
 import Control.Concurrent.STM
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Prelude
 
 data TOnceAlreadyFinalized = TOnceAlreadyFinalized
diff --git a/test/Quasar/AsyncSpec.hs b/test/Quasar/AsyncSpec.hs
index eb4374c..43a1d60 100644
--- a/test/Quasar/AsyncSpec.hs
+++ b/test/Quasar/AsyncSpec.hs
@@ -6,7 +6,7 @@ module Quasar.AsyncSpec (spec) where
 import Prelude
 import Test.Hspec
 --import Quasar.Async
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.ResourceManager
 --import System.Timeout
 
diff --git a/test/Quasar/AwaitableSpec.hs b/test/Quasar/AwaitableSpec.hs
index 4f88899..6038667 100644
--- a/test/Quasar/AwaitableSpec.hs
+++ b/test/Quasar/AwaitableSpec.hs
@@ -5,7 +5,7 @@ import Control.Concurrent.STM
 import Control.Monad.Catch
 import GHC.Conc (unsafeIOToSTM)
 import Test.Hspec
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Prelude
 
 data TestException = TestException
diff --git a/test/Quasar/Observable/ObservableHashMapSpec.hs b/test/Quasar/Observable/ObservableHashMapSpec.hs
index 041ac64..39808ad 100644
--- a/test/Quasar/Observable/ObservableHashMapSpec.hs
+++ b/test/Quasar/Observable/ObservableHashMapSpec.hs
@@ -4,7 +4,7 @@ module Quasar.Observable.ObservableHashMapSpec (spec) where
 --import Control.Monad (void)
 --import Data.HashMap.Strict qualified as HM
 --import Data.IORef
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Disposable
 --import Quasar.Observable
 --import Quasar.Observable.Delta
diff --git a/test/Quasar/Observable/ObservablePrioritySpec.hs b/test/Quasar/Observable/ObservablePrioritySpec.hs
index e6456d0..c4c4950 100644
--- a/test/Quasar/Observable/ObservablePrioritySpec.hs
+++ b/test/Quasar/Observable/ObservablePrioritySpec.hs
@@ -2,7 +2,7 @@ module Quasar.Observable.ObservablePrioritySpec (spec) where
 
 --import Control.Monad (void)
 --import Data.IORef
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Disposable
 --import Quasar.Observable
 --import Quasar.Observable.ObservablePriority (ObservablePriority)
diff --git a/test/Quasar/ObservableSpec.hs b/test/Quasar/ObservableSpec.hs
index 38d2a61..75074ae 100644
--- a/test/Quasar/ObservableSpec.hs
+++ b/test/Quasar/ObservableSpec.hs
@@ -2,7 +2,7 @@ module Quasar.ObservableSpec (spec) where
 
 --import Data.IORef
 import Quasar.Prelude
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Observable
 --import Quasar.ResourceManager
 import Test.Hspec
diff --git a/test/Quasar/ResourcesSpec.hs b/test/Quasar/ResourcesSpec.hs
index 8a38d2f..7ccd673 100644
--- a/test/Quasar/ResourcesSpec.hs
+++ b/test/Quasar/ResourcesSpec.hs
@@ -6,7 +6,7 @@ import Control.Exception
 import Control.Monad.Catch
 import Quasar.Prelude
 import Test.Hspec
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Resources
 import Quasar.MonadQuasar
 
-- 
GitLab