From 01aa84e41afa556fd4e82ef11f2f55cf443ef1aa Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 12 Aug 2024 05:12:42 +0200 Subject: Make `window::close` return and introduce `Task::discard` --- examples/events/src/main.rs | 6 ++++-- examples/exit/src/main.rs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/events/src/main.rs b/examples/events/src/main.rs index 5bada9b5..e432eb14 100644 --- a/examples/events/src/main.rs +++ b/examples/events/src/main.rs @@ -37,7 +37,7 @@ impl Events { } Message::EventOccurred(event) => { if let Event::Window(window::Event::CloseRequested) = event { - window::get_latest().and_then(window::close) + window::get_latest().and_then(window::close).discard() } else { Task::none() } @@ -47,7 +47,9 @@ impl Events { Task::none() } - Message::Exit => window::get_latest().and_then(window::close), + Message::Exit => { + window::get_latest().and_then(window::close).discard() + } } } diff --git a/examples/exit/src/main.rs b/examples/exit/src/main.rs index 48b0864c..d8334bcc 100644 --- a/examples/exit/src/main.rs +++ b/examples/exit/src/main.rs @@ -20,7 +20,9 @@ enum Message { impl Exit { fn update(&mut self, message: Message) -> Task { match message { - Message::Confirm => window::get_latest().and_then(window::close), + Message::Confirm => { + window::get_latest().and_then(window::close).discard() + } Message::Exit => { self.show_confirm = true; -- cgit