From 40fc2a20d0c7432d3bd657036676e13be849ea7f Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Sun, 13 Mar 2022 01:16:21 +0100
Subject: [PATCH] Rename some type variables
Co-authored-by: Jan Beinke <git@janbeinke.com>
---
src/Quasar/Observable.hs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Quasar/Observable.hs b/src/Quasar/Observable.hs
index 4f50a66..2b35a69 100644
--- a/src/Quasar/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -211,19 +211,19 @@ instance Applicative Observable where
--
-newtype ConstObservable v = ConstObservable v
-instance IsRetrievable v (ConstObservable v) where
+newtype ConstObservable r = ConstObservable r
+instance IsRetrievable r (ConstObservable r) where
retrieve (ConstObservable x) = pure x
-instance IsObservable v (ConstObservable v) where
+instance IsObservable r (ConstObservable r) where
observe (ConstObservable x) callback =
ensureQuasarSTM $ callback $ ObservableValue x
pingObservable _ = pure ()
-data MappedObservable b = forall a o. IsObservable a o => MappedObservable (a -> b) o
-instance IsRetrievable v (MappedObservable v) where
+data MappedObservable r = forall r2 a. IsObservable r2 a => MappedObservable (r2 -> r) a
+instance IsRetrievable r (MappedObservable r) where
retrieve (MappedObservable f observable) = f <$> retrieve observable
-instance IsObservable v (MappedObservable v) where
+instance IsObservable r (MappedObservable r) where
observe (MappedObservable fn observable) callback = observe observable (callback . fmap fn)
mapObservable f1 (MappedObservable f2 upstream) = Observable $ MappedObservable (f1 . f2) upstream
pingObservable (MappedObservable _ observable) = pingObservable observable
--
GitLab