From 01aa84e41afa556fd4e82ef11f2f55cf443ef1aa Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 12 Aug 2024 05:12:42 +0200
Subject: Make `window::close` return and introduce `Task::discard`

---
 runtime/src/task.rs   | 11 +++++++++++
 runtime/src/window.rs |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/src/task.rs b/runtime/src/task.rs
index 4d75ddaa..ec8d7cc7 100644
--- a/runtime/src/task.rs
+++ b/runtime/src/task.rs
@@ -159,6 +159,17 @@ impl<T> Task<T> {
         }
     }
 
+    /// Creates a new [`Task`] that discards the result of the current one.
+    ///
+    /// Useful if you only care about the side effects of a [`Task`].
+    pub fn discard<O>(self) -> Task<O>
+    where
+        T: MaybeSend + 'static,
+        O: MaybeSend + 'static,
+    {
+        self.then(|_| Task::none())
+    }
+
     /// Creates a new [`Task`] that can be aborted with the returned [`Handle`].
     pub fn abortable(self) -> (Self, Handle)
     where
diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index cd27cdfe..0d280f1f 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -24,7 +24,7 @@ pub enum Action {
     Open(Id, Settings, oneshot::Sender<Id>),
 
     /// Close the window and exits the application.
-    Close(Id),
+    Close(Id, oneshot::Sender<Id>),
 
     /// Gets the [`Id`] of the oldest window.
     GetOldest(oneshot::Sender<Option<Id>>),
@@ -230,8 +230,8 @@ pub fn open(settings: Settings) -> (Id, Task<Id>) {
 }
 
 /// Closes the window with `id`.
-pub fn close<T>(id: Id) -> Task<T> {
-    task::effect(crate::Action::Window(Action::Close(id)))
+pub fn close(id: Id) -> Task<Id> {
+    task::oneshot(|channel| crate::Action::Window(Action::Close(id, channel)))
 }
 
 /// Gets the window [`Id`] of the oldest window.
-- 
cgit