From e400f972c1fe6fa4f70f8cfe559ded680e6cf740 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Jun 2024 23:20:33 +0200
Subject: Introduce `window::Id` to `Event` subscriptions

And remove `window::Id` from `Event` altogether.
---
 futures/src/subscription/tracker.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'futures/src/subscription')

diff --git a/futures/src/subscription/tracker.rs b/futures/src/subscription/tracker.rs
index 277a446b..086b0f09 100644
--- a/futures/src/subscription/tracker.rs
+++ b/futures/src/subscription/tracker.rs
@@ -1,4 +1,5 @@
 use crate::core::event::{self, Event};
+use crate::core::window;
 use crate::subscription::{Hasher, Recipe};
 use crate::{BoxFuture, MaybeSend};
 
@@ -23,7 +24,9 @@ pub struct Tracker {
 #[derive(Debug)]
 pub struct Execution {
     _cancel: futures::channel::oneshot::Sender<()>,
-    listener: Option<futures::channel::mpsc::Sender<(Event, event::Status)>>,
+    listener: Option<
+        futures::channel::mpsc::Sender<(Event, event::Status, window::Id)>,
+    >,
 }
 
 impl Tracker {
@@ -139,12 +142,19 @@ impl Tracker {
     /// currently open.
     ///
     /// [`Recipe::stream`]: crate::subscription::Recipe::stream
-    pub fn broadcast(&mut self, event: Event, status: event::Status) {
+    pub fn broadcast(
+        &mut self,
+        event: Event,
+        status: event::Status,
+        window: window::Id,
+    ) {
         self.subscriptions
             .values_mut()
             .filter_map(|connection| connection.listener.as_mut())
             .for_each(|listener| {
-                if let Err(error) = listener.try_send((event.clone(), status)) {
+                if let Err(error) =
+                    listener.try_send((event.clone(), status, window))
+                {
                     log::warn!(
                         "Error sending event to subscription: {error:?}"
                     );
-- 
cgit 


From 5d7dcf417c694853a606b8fb0a47a580277fc9c0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 11 Jun 2024 19:41:05 +0200
Subject: Introduce `subscription::Event`

... and remove `PlatformSpecific` from `Event`
---
 futures/src/subscription/tracker.rs | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'futures/src/subscription')

diff --git a/futures/src/subscription/tracker.rs b/futures/src/subscription/tracker.rs
index 086b0f09..f17e3ea3 100644
--- a/futures/src/subscription/tracker.rs
+++ b/futures/src/subscription/tracker.rs
@@ -1,6 +1,4 @@
-use crate::core::event::{self, Event};
-use crate::core::window;
-use crate::subscription::{Hasher, Recipe};
+use crate::subscription::{Event, Hasher, Recipe};
 use crate::{BoxFuture, MaybeSend};
 
 use futures::channel::mpsc;
@@ -24,9 +22,7 @@ pub struct Tracker {
 #[derive(Debug)]
 pub struct Execution {
     _cancel: futures::channel::oneshot::Sender<()>,
-    listener: Option<
-        futures::channel::mpsc::Sender<(Event, event::Status, window::Id)>,
-    >,
+    listener: Option<futures::channel::mpsc::Sender<Event>>,
 }
 
 impl Tracker {
@@ -142,19 +138,12 @@ impl Tracker {
     /// currently open.
     ///
     /// [`Recipe::stream`]: crate::subscription::Recipe::stream
-    pub fn broadcast(
-        &mut self,
-        event: Event,
-        status: event::Status,
-        window: window::Id,
-    ) {
+    pub fn broadcast(&mut self, event: Event) {
         self.subscriptions
             .values_mut()
             .filter_map(|connection| connection.listener.as_mut())
             .for_each(|listener| {
-                if let Err(error) =
-                    listener.try_send((event.clone(), status, window))
-                {
+                if let Err(error) = listener.try_send(event.clone()) {
                     log::warn!(
                         "Error sending event to subscription: {error:?}"
                     );
-- 
cgit