From 58d4d0c6e66319a2754ace504829dae68de53162 Mon Sep 17 00:00:00 2001 From: Jens Nolte <git@queezle.net> Date: Sun, 24 Apr 2022 17:53:37 +0200 Subject: [PATCH] Reorder definitions in Disposer module --- src/Quasar/Resources/Disposer.hs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Quasar/Resources/Disposer.hs b/src/Quasar/Resources/Disposer.hs index a29ae24..9d44e42 100644 --- a/src/Quasar/Resources/Disposer.hs +++ b/src/Quasar/Resources/Disposer.hs @@ -44,6 +44,16 @@ class Resource a where isDisposing r = isDisposing (toDisposer r) + +newtype Disposer = Disposer [DisposerElement] + deriving newtype (Semigroup, Monoid) + +instance Resource Disposer where + toDisposer = id + isDisposed (Disposer ds) = foldMap isDisposed ds + isDisposing (Disposer ds) = awaitAny $ isDisposing <$> ds + + type DisposerState = TOnce DisposeFn (Future ()) data DisposerElement @@ -60,15 +70,6 @@ instance Resource DisposerElement where isDisposing (ResourceManagerDisposer resourceManager) = resourceManagerIsDisposing resourceManager -newtype Disposer = Disposer [DisposerElement] - deriving newtype (Semigroup, Monoid) - -instance Resource Disposer where - toDisposer = id - isDisposed (Disposer ds) = foldMap isDisposed ds - isDisposing (Disposer ds) = awaitAny $ isDisposing <$> ds - - type DisposeFn = ShortIO (Future ()) -- GitLab