From 25ecde96fa15ad1ffd8dcbb7dafae1d6ea66b194 Mon Sep 17 00:00:00 2001 From: Nils Pukropp Date: Fri, 3 Apr 2026 15:01:23 +0200 Subject: [PATCH] clippy --- src/daemon.rs | 8 +++---- src/modules/backlight.rs | 8 +++---- src/modules/bt/mod.rs | 52 +++++++++++++++++----------------------- src/modules/dnd.rs | 11 ++++----- src/modules/keyboard.rs | 20 +++++++--------- src/modules/mpris.rs | 16 ++++++------- src/signaler.rs | 16 ++++++------- 7 files changed, 59 insertions(+), 72 deletions(-) diff --git a/src/daemon.rs b/src/daemon.rs index 111d6a2..062a80c 100644 --- a/src/daemon.rs +++ b/src/daemon.rs @@ -114,10 +114,10 @@ pub async fn run_daemon(config_path: Option) -> Result<()> { let (ev_tx, mut ev_rx) = mpsc::channel(1); let mut watcher = RecommendedWatcher::new( move |res: notify::Result| { - if let Ok(event) = res { - if event.kind.is_modify() || event.kind.is_create() { - let _ = ev_tx.blocking_send(()); - } + if let Ok(event) = res + && (event.kind.is_modify() || event.kind.is_create()) + { + let _ = ev_tx.blocking_send(()); } }, NotifyConfig::default(), diff --git a/src/modules/backlight.rs b/src/modules/backlight.rs index c482879..5c66ac6 100644 --- a/src/modules/backlight.rs +++ b/src/modules/backlight.rs @@ -114,10 +114,10 @@ impl BacklightDaemon { let (ev_tx, ev_rx) = mpsc::channel(); let mut watcher = RecommendedWatcher::new( move |res: notify::Result| { - if let Ok(event) = res { - if event.kind.is_modify() { - let _ = ev_tx.send(()); - } + if let Ok(event) = res + && event.kind.is_modify() + { + let _ = ev_tx.send(()); } }, NotifyConfig::default(), diff --git a/src/modules/bt/mod.rs b/src/modules/bt/mod.rs index 333bbdd..382c5bd 100644 --- a/src/modules/bt/mod.rs +++ b/src/modules/bt/mod.rs @@ -137,48 +137,40 @@ impl WaybarModule for BtModule { match action.as_str() { "connect" => { if let Some(mac) = args.get(1) { - if let Ok(session) = bluer::Session::new().await { - if let Ok(adapter) = session.default_adapter().await { - if let Ok(addr) = mac.parse::() { - if let Ok(device) = adapter.device(addr) { - let _ = device.connect().await; - } - } - } + if let Ok(session) = bluer::Session::new().await + && let Ok(adapter) = session.default_adapter().await + && let Ok(addr) = mac.parse::() + && let Ok(device) = adapter.device(addr) + { + let _ = device.connect().await; } trigger_robust_poll(state.clone()); } return Ok(WaybarOutput::default()); } "disconnect" if bt_state.connected => { - if let Ok(session) = bluer::Session::new().await { - if let Ok(adapter) = session.default_adapter().await { - if let Ok(addr) = bt_state.device_address.parse::() { - if let Ok(device) = adapter.device(addr) { - let _ = device.disconnect().await; - } - } - } + if let Ok(session) = bluer::Session::new().await + && let Ok(adapter) = session.default_adapter().await + && let Ok(addr) = bt_state.device_address.parse::() + && let Ok(device) = adapter.device(addr) + { + let _ = device.disconnect().await; } trigger_robust_poll(state.clone()); return Ok(WaybarOutput::default()); } "menu_data" => { let mut devs = Vec::new(); - if let Ok(session) = bluer::Session::new().await { - if let Ok(adapter) = session.default_adapter().await { - if let Ok(addresses) = adapter.device_addresses().await { - for addr in addresses { - if let Ok(device) = adapter.device(addr) { - if device.is_paired().await.unwrap_or(false) { - let alias = device - .alias() - .await - .unwrap_or_else(|_| addr.to_string()); - devs.push(format!("{} ({})", alias, addr)); - } - } - } + if let Ok(session) = bluer::Session::new().await + && let Ok(adapter) = session.default_adapter().await + && let Ok(addresses) = adapter.device_addresses().await + { + for addr in addresses { + if let Ok(device) = adapter.device(addr) + && device.is_paired().await.unwrap_or(false) + { + let alias = device.alias().await.unwrap_or_else(|_| addr.to_string()); + devs.push(format!("{} ({})", alias, addr)); } } } diff --git a/src/modules/dnd.rs b/src/modules/dnd.rs index e342f8c..fa25c48 100644 --- a/src/modules/dnd.rs +++ b/src/modules/dnd.rs @@ -89,12 +89,11 @@ impl DndDaemon { let mut stream = props_proxy.receive_properties_changed().await?; while let Some(signal) = stream.next().await { let args = signal.args()?; - if args.interface_name == "org.erikreider.swaync.control" { - if let Some(val) = args.changed_properties.get("dnd") { - if let Ok(is_dnd) = bool::try_from(val) { - let _ = tx.send(DndState { is_dnd }); - } - } + if args.interface_name == "org.erikreider.swaync.control" + && let Some(val) = args.changed_properties.get("dnd") + && let Ok(is_dnd) = bool::try_from(val) + { + let _ = tx.send(DndState { is_dnd }); } } } diff --git a/src/modules/keyboard.rs b/src/modules/keyboard.rs index 8c08c42..d25c4eb 100644 --- a/src/modules/keyboard.rs +++ b/src/modules/keyboard.rs @@ -76,19 +76,15 @@ impl KeyboardDaemon { .args(["devices", "-j"]) .output() .await + && let Ok(json) = serde_json::from_slice::(&output.stdout) + && let Some(keyboards) = json.get("keyboards").and_then(|v| v.as_array()) + && let Some(main_kb) = keyboards.last() { - if let Ok(json) = serde_json::from_slice::(&output.stdout) { - if let Some(keyboards) = json.get("keyboards").and_then(|v| v.as_array()) { - if let Some(main_kb) = keyboards.last() { - // The last active one is usually the main one - if let Some(layout) = main_kb.get("active_keymap").and_then(|v| v.as_str()) - { - let _ = tx.send(KeyboardState { - layout: layout.to_string(), - }); - } - } - } + // The last active one is usually the main one + if let Some(layout) = main_kb.get("active_keymap").and_then(|v| v.as_str()) { + let _ = tx.send(KeyboardState { + layout: layout.to_string(), + }); } } diff --git a/src/modules/mpris.rs b/src/modules/mpris.rs index 43448fc..d63e1ca 100644 --- a/src/modules/mpris.rs +++ b/src/modules/mpris.rs @@ -156,15 +156,15 @@ impl MprisDaemon { artist = a.to_string(); } } - if let Some(v) = metadata.get("xesam:title") { - if let Ok(t) = <&str>::try_from(v) { - title = t.to_string(); - } + if let Some(v) = metadata.get("xesam:title") + && let Ok(t) = <&str>::try_from(v) + { + title = t.to_string(); } - if let Some(v) = metadata.get("xesam:album") { - if let Ok(a) = <&str>::try_from(v) { - album = a.to_string(); - } + if let Some(v) = metadata.get("xesam:album") + && let Ok(a) = <&str>::try_from(v) + { + album = a.to_string(); } // Only send if changed diff --git a/src/signaler.rs b/src/signaler.rs index 1ebca82..0ea9f86 100644 --- a/src/signaler.rs +++ b/src/signaler.rs @@ -36,17 +36,17 @@ impl WaybarSignaler { } fn send_signal(&mut self, signal_num: i32) { - if let Some(last) = self.last_signal_sent.get(&signal_num) { - if last.elapsed() < Duration::from_millis(50) { - return; - } + if let Some(last) = self.last_signal_sent.get(&signal_num) + && last.elapsed() < Duration::from_millis(50) + { + return; } let mut valid_pid = false; - if let Some(pid) = self.cached_pid { - if kill(pid, None).is_ok() { - valid_pid = true; - } + if let Some(pid) = self.cached_pid + && kill(pid, None).is_ok() + { + valid_pid = true; } if !valid_pid {