From 7dee2f6995533d08c3ea1818dd8e1a114872a22e Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 10 Jan 2025 09:08:35 +0300 Subject: Fix two manual let-else --- src/niri.rs | 11 ++++------- src/pw_utils.rs | 9 +++------ 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/niri.rs b/src/niri.rs index a64c33dc..88dbd0ee 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -1536,13 +1536,10 @@ impl State { debug!(session_id, "StartCast"); - let gbm = match self.backend.gbm_device() { - Some(gbm) => gbm, - None => { - warn!("error starting screencast: no GBM device available"); - self.niri.stop_cast(session_id); - return; - } + let Some(gbm) = self.backend.gbm_device() else { + warn!("error starting screencast: no GBM device available"); + self.niri.stop_cast(session_id); + return; }; let pw = if let Some(pw) = &self.niri.pipewire { diff --git a/src/pw_utils.rs b/src/pw_utils.rs index 38262ff0..7cc3a88e 100644 --- a/src/pw_utils.rs +++ b/src/pw_utils.rs @@ -844,12 +844,9 @@ impl Cast { return false; } - let mut buffer = match self.stream.dequeue_buffer() { - Some(buffer) => buffer, - None => { - warn!("no available buffer in pw stream, skipping frame"); - return false; - } + let Some(mut buffer) = self.stream.dequeue_buffer() else { + warn!("no available buffer in pw stream, skipping frame"); + return false; }; let fd = buffer.datas_mut()[0].as_raw().fd; -- cgit