quasar: Rename Resource modules to Disposer

queezle42 · Jun 13, 2024 · 15985f7 · 15985f7
1 parent 70f58e3
commit 15985f7
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 35 deletions.
diff --git a/quasar-network/src/Quasar/Network/Runtime/Observable.hs b/quasar-network/src/Quasar/Network/Runtime/Observable.hs
@@ -9,6 +9,7 @@ import Control.Monad.Catch
 import Data.Binary (Binary)
 import Data.Map.Strict (Map)
 import Quasar.Async
+import Quasar.Disposer
 import Quasar.Exceptions
 import Quasar.MonadQuasar
 import Quasar.MonadQuasar.Misc
@@ -22,7 +23,6 @@ import Quasar.Observable.Map
 import Quasar.Observable.Subject
 import Quasar.Observable.Traversable
 import Quasar.Prelude
-import Quasar.Resources
 
 
 -- * ObservableT instance

diff --git a/quasar-timer/src/Quasar/Timer.hs b/quasar-timer/src/Quasar/Timer.hs
@@ -19,11 +19,11 @@ import Control.Monad.Catch
 import Data.Heap
 import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime)
 import Quasar.Async
+import Quasar.Disposer
 import Quasar.Exceptions
 import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Prelude
-import Quasar.Resources
 
 
 data TimerCancelled = TimerCancelled

diff --git a/quasar-timer/src/Quasar/Timer/PosixTimer.hsc b/quasar-timer/src/Quasar/Timer/PosixTimer.hsc
@@ -16,9 +16,9 @@ module Quasar.Timer.PosixTimer (
 import Control.Concurrent
 import Foreign
 import Foreign.C
-import Quasar.Prelude
+import Quasar.Disposer
 import Quasar.MonadQuasar
-import Quasar.Resources
+import Quasar.Prelude
 import System.Posix.Types
 
 #include <signal.h>

diff --git a/quasar-timer/src/Quasar/Timer/TimerFd.hs b/quasar-timer/src/Quasar/Timer/TimerFd.hs
@@ -12,11 +12,11 @@ import Control.Concurrent
 import Control.Monad.Catch
 import Foreign
 import Foreign.C
-import Quasar.Future
 import Quasar.Async
+import Quasar.Disposer
+import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Timer.PosixTimer
 import System.Posix.Types
 

diff --git a/quasar-web/src/Quasar/Web.hs b/quasar-web/src/Quasar/Web.hs
@@ -30,6 +30,7 @@ import Data.Sequence (Seq)
 import Data.Sequence qualified as Seq
 import Data.String (IsString(..))
 import Data.Text (Text)
+import Quasar.Disposer (TDisposer, isTrivialTDisposer, disposeTDisposer)
 import Quasar.Observable.AccumulatingObserver
 import Quasar.Observable.Core
 import Quasar.Observable.List (ListOperation(..), ObservableList, updateToOperations)
@@ -38,7 +39,6 @@ import Quasar.Observable.Map (ObservableMap)
 import Quasar.Observable.Map qualified as ObservableMap
 import Quasar.Observable.Traversable
 import Quasar.Prelude
-import Quasar.Resources (TDisposer, isTrivialTDisposer, disposeTDisposer)
 
 type ComponentRef = Word64
 

diff --git a/quasar/quasar.cabal b/quasar/quasar.cabal
@@ -64,6 +64,9 @@ library
     Quasar
     Quasar.Async
     Quasar.Async.Fork
+    Quasar.Disposer
+    Quasar.Disposer.DisposableVar
+    Quasar.Disposer.Rc
     Quasar.Exceptions
     Quasar.Exceptions.ExceptionSink
     Quasar.Future
@@ -85,9 +88,6 @@ library
     Quasar.Pool
     Quasar.Prelude
     Quasar.PreludeExtras
-    Quasar.Resources
-    Quasar.Resources.DisposableVar
-    Quasar.Resources.Rc
     Quasar.Utils.CallbackRegistry
     Quasar.Utils.Exceptions
     Quasar.Utils.ExtraT
@@ -98,7 +98,7 @@ library
     Quasar.Utils.TOnce
   other-modules:
     Quasar.Disposer.Core
-    Quasar.Resources.FutureDisposer
+    Quasar.Disposer.FutureDisposer
   hs-source-dirs:
     src
 
@@ -120,13 +120,13 @@ test-suite quasar-test
   main-is: Spec.hs
   other-modules:
     Quasar.AsyncSpec
+    Quasar.DisposerSpec
     Quasar.FutureSpec
     Quasar.Observable.BindSpec
     Quasar.Observable.LiftSpec
     Quasar.Observable.ListSpec
     Quasar.Observable.ObservableVarSpec
     Quasar.ObservableSpec
-    Quasar.ResourcesSpec
     Quasar.Utils.ReaderLockSpec
   hs-source-dirs:
     test
diff --git a/quasar/src/Quasar.hs b/quasar/src/Quasar.hs
@@ -1,17 +1,17 @@
 module Quasar (
   module Quasar.Async,
+  module Quasar.Disposer,
   module Quasar.Future,
   module Quasar.Logger,
   module Quasar.MonadQuasar,
   module Quasar.MonadQuasar.Misc,
   --module Quasar.Observable,
-  module Quasar.Resources,
 ) where
 
 import Quasar.Async
+import Quasar.Disposer
 import Quasar.Future
 import Quasar.Logger
 import Quasar.MonadQuasar
 import Quasar.MonadQuasar.Misc
 --import Quasar.Observable
-import Quasar.Resources
diff --git a/quasar/src/Quasar/Async.hs b/quasar/src/Quasar/Async.hs
@@ -34,11 +34,11 @@ import Control.Exception (throwTo)
 import Control.Monad.Catch
 import GHC.Stack (withFrozenCallStack)
 import Quasar.Async.Fork
+import Quasar.Disposer
 import Quasar.Exceptions
 import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Utils.Fix
 
 

diff --git a/quasar/src/Quasar/Resources.hs → quasar/src/Quasar/Disposer.hs b/quasar/src/Quasar/Resources.hs → quasar/src/Quasar/Disposer.hs
@@ -1,4 +1,4 @@
-module Quasar.Resources (
+module Quasar.Disposer (
   -- * Resources
   Disposable(..),
   dispose,
@@ -76,7 +76,7 @@ import Quasar.Exceptions
 import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Prelude
-import Quasar.Resources.FutureDisposer
+import Quasar.Disposer.FutureDisposer
 
 
 registerDisposeAction :: HasCallStack => (MonadQuasar m, MonadSTMc NoRetry '[FailedToAttachResource] m) => IO () -> m Disposer

diff --git a/quasar/src/Quasar/Resources/DisposableVar.hs → quasar/src/Quasar/Disposer/DisposableVar.hs b/quasar/src/Quasar/Resources/DisposableVar.hs → quasar/src/Quasar/Disposer/DisposableVar.hs
@@ -1,4 +1,4 @@
-module Quasar.Resources.DisposableVar (
+module Quasar.Disposer.DisposableVar (
   DisposableVar,
   newDisposableVar,
   newDisposableVarIO,

diff --git a/...ar/src/Quasar/Resources/FutureDisposer.hs → quasar/src/Quasar/Disposer/FutureDisposer.hs b/...ar/src/Quasar/Resources/FutureDisposer.hs → quasar/src/Quasar/Disposer/FutureDisposer.hs
@@ -1,4 +1,4 @@
-module Quasar.Resources.FutureDisposer (
+module Quasar.Disposer.FutureDisposer (
   futureDisposer,
   futureDisposerGeneric,
 ) where

diff --git a/quasar/src/Quasar/Resources/Rc.hs → quasar/src/Quasar/Disposer/Rc.hs b/quasar/src/Quasar/Resources/Rc.hs → quasar/src/Quasar/Disposer/Rc.hs
@@ -1,4 +1,4 @@
-module Quasar.Resources.Rc (
+module Quasar.Disposer.Rc (
   Rc,
   newRc,
   newRcIO,
@@ -13,8 +13,8 @@ module Quasar.Resources.Rc (
 ) where
 
 import Quasar.Prelude
-import Quasar.Resources
-import Quasar.Resources.DisposableVar
+import Quasar.Disposer
+import Quasar.Disposer.DisposableVar
 import Quasar.Exceptions (mkDisposedException, DisposedException(..))
 import Control.Exception (finally)
 

diff --git a/quasar/src/Quasar/MonadQuasar/Misc.hs b/quasar/src/Quasar/MonadQuasar/Misc.hs
@@ -16,13 +16,13 @@ module Quasar.MonadQuasar.Misc (
 import Control.Monad.Catch
 import Control.Monad.Reader
 import Data.List.NonEmpty
-import Quasar.Future
 import Quasar.Async
+import Quasar.Disposer
 import Quasar.Exceptions
 import Quasar.Exceptions.ExceptionSink
+import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Utils.Exceptions
 import System.Exit
 

diff --git a/quasar/src/Quasar/Observable/AccumulatingObserver.hs b/quasar/src/Quasar/Observable/AccumulatingObserver.hs
@@ -5,9 +5,9 @@ module Quasar.Observable.AccumulatingObserver (
   disposeAccumulatingObserver,
 ) where
 
+import Quasar.Disposer
 import Quasar.Observable.Core
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Utils.Fix (mfixTVar)
 
 data AccumulatingObserver canLoad exceptions c v =

diff --git a/quasar/src/Quasar/Observable/Cache.hs b/quasar/src/Quasar/Observable/Cache.hs
@@ -14,9 +14,9 @@ module Quasar.Observable.Cache (
 
 import Control.Applicative
 import Data.Functor.Identity
+import Quasar.Disposer
 import Quasar.Observable.Core
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Utils.CallbackRegistry
 
 -- * Cache

diff --git a/quasar/src/Quasar/Observable/Core.hs b/quasar/src/Quasar/Observable/Core.hs
@@ -124,9 +124,9 @@ import Data.Binary (Binary)
 import Data.String (IsString(..))
 import Data.Type.Equality ((:~:)(Refl))
 import GHC.Records (HasField(..))
+import Quasar.Disposer
 import Quasar.Future
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Utils.Fix
 
 -- * Generalized observables

diff --git a/quasar/src/Quasar/Observable/List.hs b/quasar/src/Quasar/Observable/List.hs
@@ -58,12 +58,12 @@ import Data.FingerTree qualified as FT
 import Data.Sequence (Seq(Empty))
 import Data.Sequence qualified as Seq
 import Data.Traversable qualified as Traversable
+import Quasar.Disposer (TDisposer)
 import Quasar.Observable.Cache
 import Quasar.Observable.Core
 import Quasar.Observable.Subject
 import Quasar.Observable.Traversable
 import Quasar.Prelude hiding (traverse)
-import Quasar.Resources (TDisposer)
 
 
 newtype ListDelta v

diff --git a/quasar/src/Quasar/Observable/Map.hs b/quasar/src/Quasar/Observable/Map.hs
@@ -84,6 +84,7 @@ import Data.Sequence (Seq)
 import Data.Sequence qualified as Seq
 import Data.Traversable qualified as Traversable
 import GHC.Records (HasField (..))
+import Quasar.Disposer
 import Quasar.Observable.Cache
 import Quasar.Observable.Core
 import Quasar.Observable.Lift
@@ -92,7 +93,6 @@ import Quasar.Observable.List qualified as ObservableList
 import Quasar.Observable.Subject
 import Quasar.Observable.Traversable
 import Quasar.Prelude hiding (filter, lookup, traverse)
-import Quasar.Resources
 import Quasar.Utils.Map qualified as MapUtils
 
 

diff --git a/quasar/src/Quasar/Observable/Traversable.hs b/quasar/src/Quasar/Observable/Traversable.hs
@@ -17,11 +17,11 @@ module Quasar.Observable.Traversable (
 ) where
 
 import Control.Applicative hiding (empty)
+import Data.Traversable (for)
+import Quasar.Disposer
 import Quasar.Observable.Core
 import Quasar.Prelude hiding (filter, lookup)
-import Quasar.Resources
 import Quasar.Utils.Fix
-import Data.Traversable (for)
 
 
 -- * Selecting removals from a delta

diff --git a/quasar/src/Quasar/Pool.hs b/quasar/src/Quasar/Pool.hs
@@ -8,13 +8,13 @@ module Quasar.Pool (
 
 import Control.Monad.Catch (handleAll, mask_)
 import Quasar.Async (unmanagedAsync)
+import Quasar.Disposer
 import Quasar.Exceptions (ExceptionSink, throwToExceptionSinkIO)
 import Quasar.Observable.Core
 import Quasar.Observable.List (ObservableList)
 import Quasar.Observable.Map (ObservableMapVar, toObservableMap)
 import Quasar.Observable.Map qualified as ObservableMap
 import Quasar.Prelude
-import Quasar.Resources
 
 
 -- TODO rename

diff --git a/quasar/test/Quasar/ResourcesSpec.hs → quasar/test/Quasar/DisposerSpec.hs b/quasar/test/Quasar/ResourcesSpec.hs → quasar/test/Quasar/DisposerSpec.hs
@@ -1,13 +1,13 @@
-module Quasar.ResourcesSpec (spec) where
+module Quasar.DisposerSpec (spec) where
 
 import Control.Concurrent
 import Control.Exception
 import Control.Monad.Catch
+import Quasar.Disposer
 import Quasar.Exceptions
 import Quasar.Exceptions.ExceptionSink
 import Quasar.Future
 import Quasar.Prelude
-import Quasar.Resources
 import Quasar.Utils.Exceptions
 import Test.Hspec
 

diff --git a/quasar/test/Quasar/Observable/BindSpec.hs b/quasar/test/Quasar/Observable/BindSpec.hs
@@ -1,9 +1,9 @@
 module Quasar.Observable.BindSpec (spec) where
 
+import Quasar.Disposer (dispose)
 import Quasar.Observable.Core
 import Quasar.Observable.ObservableVar
 import Quasar.Prelude
-import Quasar.Resources (dispose)
 import Test.Hspec
 
 spec :: Spec