clippy

src/daemon.rs

@@ -114,11 +114,11 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
         let (ev_tx, mut ev_rx) = mpsc::channel(1);
         let mut watcher = RecommendedWatcher::new(
             move |res: notify::Result<Event>| {
-                if let Ok(event) = res {
-                    if event.kind.is_modify() || event.kind.is_create() {
+                if let Ok(event) = res
+                    && (event.kind.is_modify() || event.kind.is_create())
+                {
                     let _ = ev_tx.blocking_send(());
                 }
-                }
             },
             NotifyConfig::default(),
         )

src/modules/backlight.rs

@@ -114,11 +114,11 @@ impl BacklightDaemon {
             let (ev_tx, ev_rx) = mpsc::channel();
             let mut watcher = RecommendedWatcher::new(
                 move |res: notify::Result<Event>| {
-                    if let Ok(event) = res {
-                        if event.kind.is_modify() {
+                    if let Ok(event) = res
+                        && event.kind.is_modify()
+                    {
                         let _ = ev_tx.send(());
                     }
-                    }
                 },
                 NotifyConfig::default(),
             )

src/modules/bt/mod.rs

@@ -137,51 +137,43 @@ 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::<bluer::Address>() {
-                                if let Ok(device) = adapter.device(addr) {
+                    if let Ok(session) = bluer::Session::new().await
+                        && let Ok(adapter) = session.default_adapter().await
+                        && let Ok(addr) = mac.parse::<bluer::Address>()
+                        && 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::<bluer::Address>() {
-                            if let Ok(device) = adapter.device(addr) {
+                if let Ok(session) = bluer::Session::new().await
+                    && let Ok(adapter) = session.default_adapter().await
+                    && let Ok(addr) = bt_state.device_address.parse::<bluer::Address>()
+                    && 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 {
+                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) {
-                                    if device.is_paired().await.unwrap_or(false) {
-                                        let alias = device
-                                            .alias()
-                                            .await
-                                            .unwrap_or_else(|_| addr.to_string());
+                        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));
                         }
                     }
                 }
-                        }
-                    }
-                }
                 return Ok(WaybarOutput {
                     text: devs.join("\n"),
                     ..Default::default()

src/modules/dnd.rs

@@ -89,16 +89,15 @@ 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) {
+                    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 });
                     }
                 }
             }
         }
-            }
-        }
 
         Err(anyhow::anyhow!("DND stream ended or daemon not found"))
     }

src/modules/keyboard.rs

@@ -76,21 +76,17 @@ impl KeyboardDaemon {
             .args(["devices", "-j"])
             .output()
             .await
+            && let Ok(json) = serde_json::from_slice::<serde_json::Value>(&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::<serde_json::Value>(&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())
-                        {
+            if let Some(layout) = main_kb.get("active_keymap").and_then(|v| v.as_str()) {
                 let _ = tx.send(KeyboardState {
                     layout: layout.to_string(),
                 });
             }
         }
-                }
-            }
-        }
 
         while let Ok(Some(line)) = lines.next_line().await {
             if let Some(payload) = line.strip_prefix("activelayout>>") {

src/modules/mpris.rs

@@ -156,16 +156,16 @@ impl MprisDaemon {
                             artist = a.to_string();
                         }
                     }
-                    if let Some(v) = metadata.get("xesam:title") {
-                        if let Ok(t) = <&str>::try_from(v) {
+                    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) {
+                    if let Some(v) = metadata.get("xesam:album")
+                        && let Ok(a) = <&str>::try_from(v)
+                    {
                         album = a.to_string();
                     }
-                    }
 
                     // Only send if changed
                     let current = tx.borrow();

src/signaler.rs

@@ -36,18 +36,18 @@ 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) {
+        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() {
+        if let Some(pid) = self.cached_pid
+            && kill(pid, None).is_ok()
+        {
             valid_pid = true;
         }
-        }
 
         if !valid_pid {
             self.cached_pid = self.find_waybar_pid();