From f5f91af4a474115d6269e7a83a3396c0da01bb0b Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Tue, 31 Aug 2021 19:58:50 +0200
Subject: [PATCH] Remove redundant MonadObserve
Co-authored-by: Jan Beinke <git@janbeinke.com>
---
src/Quasar/Observable.hs | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/Quasar/Observable.hs b/src/Quasar/Observable.hs
index 7d2f82b..ea1d06d 100644
--- a/src/Quasar/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -4,7 +4,6 @@ module Quasar.Observable (
-- * Observable core types
IsRetrievable(..),
retrieveIO,
- MonadObserve,
IsObservable(..),
Observable(..),
ObservableMessage(..),
@@ -80,11 +79,9 @@ class IsRetrievable v a | a -> v where
retrieveIO :: IsRetrievable v a => a -> IO v
retrieveIO x = withOnResourceManager $ await =<< retrieve x
-type MonadObserve m = MonadResourceManager m
-
{-# DEPRECATED unsafeAsyncObserveIO "Old implementation of `observe`." #-}
class IsRetrievable v o => IsObservable v o | o -> v where
- observe :: MonadObserve m => o -> (ObservableMessage v -> m ()) -> m a
+ observe :: MonadResourceManager m => o -> (ObservableMessage v -> m ()) -> m a
observe observable callback = do
msgVar <- liftIO $ newTVarIO ObservableLoading
idVar <- liftIO $ newTVarIO (0 :: Word64)
@@ -137,7 +134,7 @@ data ObserveWhileCompleted = ObserveWhileCompleted
instance Exception ObserveWhileCompleted
-- | Observe until the callback returns `Just`.
-observeWhile :: (IsObservable v o, MonadObserve m) => o -> (ObservableMessage v -> m (Maybe a)) -> m a
+observeWhile :: (IsObservable v o, MonadResourceManager m) => o -> (ObservableMessage v -> m (Maybe a)) -> m a
observeWhile observable callback = do
resultVar <- liftIO $ newIORef impossibleCodePath
observeWhile_ observable \msg -> do
@@ -151,7 +148,7 @@ observeWhile observable callback = do
-- | Observe until the callback returns `False`.
-observeWhile_ :: (IsObservable v o, MonadObserve m) => o -> (ObservableMessage v -> m Bool) -> m ()
+observeWhile_ :: (IsObservable v o, MonadResourceManager m) => o -> (ObservableMessage v -> m Bool) -> m ()
observeWhile_ observable callback =
catch
do
--
GitLab