From 80b9c54e7c68df51c664fa5104c66d4f5709857b Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Thu, 4 Nov 2021 01:41:51 +0100
Subject: [PATCH] Change the generic variant of withScopedResourceManager to be
the default variant
---
src/Quasar/Observable.hs | 2 +-
src/Quasar/ResourceManager.hs | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/Quasar/Observable.hs b/src/Quasar/Observable.hs
index 2ca45e6..0971917 100644
--- a/src/Quasar/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -106,7 +106,7 @@ class IsRetrievable v o => IsObservable v o | o -> v where
observeBlocking :: (IsObservable v o, MonadResourceManager m) => o -> (ObservableMessage v -> m ()) -> m a
observeBlocking observable handler = do
-- `withScopedResourceManager` removes the `observe` callback when the `handler` fails.
- genericWithScopedResourceManager do
+ withScopedResourceManager do
var <- liftIO newEmptyTMVarIO
observe observable \msg -> liftIO $ atomically do
void $ tryTakeTMVar var
diff --git a/src/Quasar/ResourceManager.hs b/src/Quasar/ResourceManager.hs
index 1a9a1ea..672ded6 100644
--- a/src/Quasar/ResourceManager.hs
+++ b/src/Quasar/ResourceManager.hs
@@ -9,7 +9,6 @@ module Quasar.ResourceManager (
registerDisposable,
registerDisposeAction,
withScopedResourceManager,
- genericWithScopedResourceManager,
onResourceManager,
captureDisposable,
captureDisposable_,
@@ -156,12 +155,8 @@ registerNewResource action = mask_ $ lockResourceManager do
registerNewResource_ :: (IsDisposable a, MonadResourceManager m) => m a -> m ()
registerNewResource_ action = void $ registerNewResource action
-withScopedResourceManager :: MonadResourceManager m => ResourceManagerIO a -> m a
+withScopedResourceManager :: MonadResourceManager m => m a -> m a
withScopedResourceManager action =
- bracket newResourceManager dispose \scope -> onResourceManager scope action
-
-genericWithScopedResourceManager :: MonadResourceManager m => m a -> m a
-genericWithScopedResourceManager action =
bracket newResourceManager dispose \scope -> localResourceManager scope action
--
GitLab