Collapse if-let statements

Author: bim9262

src/blocks/amd_gpu.rs

@@ -144,11 +144,9 @@ impl Device {
             let mut path = entry.path();
             path.push("device");
 
-            let Ok(uevent) = read_file(path.join("uevent")).await else {
-                continue;
-            };
-
-            if uevent.contains("PCI_ID=1002") {
+            if let Ok(uevent) = read_file(path.join("uevent")).await
+                && uevent.contains("PCI_ID=1002")
+            {
                 return Ok(Some(Self { path }));
             }
         }

src/blocks/memory.rs

@@ -357,14 +357,11 @@ impl Memstate {
             }
 
             let mut values = line.split_whitespace().map(|s| s.parse::<u64>());
-            let (Some(Ok(zram_swap_size)), Some(Ok(zram_comp_size))) =
+            if let (Some(Ok(zram_swap_size)), Some(Ok(zram_comp_size))) =
                 (values.next(), values.next())
-            else {
-                continue;
-            };
-
-            // zram initializes with small amount by default, return 0 then
-            if zram_swap_size >= 65_536 {
+                // zram initializes with small amount by default, return 0 then
+                && zram_swap_size >= 65_536
+            {
                 mem_state.zram_decompressed += zram_swap_size;
                 mem_state.zram_compressed += zram_comp_size;
             }

src/blocks/privacy/pipewire.rs

@@ -221,13 +221,10 @@ impl PrivacyMonitor for Monitor<'_> {
             ..
         } in data.links.values().sorted().dedup()
         {
-            let (Some(output_node), Some(input_node)) = (
+            if let (Some(output_node), Some(input_node)) = (
                 data.nodes.get(link_output_node),
                 data.nodes.get(link_input_node),
-            ) else {
-                continue;
-            };
-            if input_node.media_class != Some("Audio/Sink".into())
+            ) && input_node.media_class != Some("Audio/Sink".into())
                 && !self.config.exclude_output.contains(&output_node.name)
                 && !self.config.exclude_input.contains(&input_node.name)
             {

src/blocks/privacy/v4l.rs

@@ -108,13 +108,10 @@ impl PrivacyMonitor for Monitor<'_> {
                 continue;
             };
             while let Ok(Some(fd_path)) = fd_paths.next_entry().await {
-                let Ok(link_path) = fd_path.path().read_link() else {
-                    continue;
-                };
-                if self.devices.contains_key(&link_path) {
-                    let Ok(mut file) = File::open(proc_path.join("comm")).await else {
-                        continue;
-                    };
+                if let Ok(link_path) = fd_path.path().read_link()
+                    && self.devices.contains_key(&link_path)
+                    && let Ok(mut file) = File::open(proc_path.join("comm")).await
+                {
                     let mut contents = String::new();
                     if file.read_to_string(&mut contents).await.is_ok() {
                         let reader = contents.trim_end().to_string();

src/netlink.rs

@@ -166,15 +166,10 @@ impl WifiInfo {
             .error("Failed to get nl80211 interfaces")?;
 
         for interface in interfaces {
-            if let Some(index) = interface.index {
-                if index != if_index {
-                    continue;
-                }
-
-                let Ok(ap) = socket.get_station_info(index).await else {
-                    continue;
-                };
-
+            if let Some(index) = interface.index
+                && index == if_index
+                && let Ok(ap) = socket.get_station_info(index).await
+            {
                 // TODO: are there any situations when there is more than one station?
                 let Some(ap) = ap.into_iter().next() else {
                     continue;
@@ -413,11 +408,10 @@ async fn ip_payload<const BYTES: usize>(
 
         let attr_handle = msg.rtattrs.get_attr_handle();
 
-        let Some(attr) = attr_handle.get_attribute(Ifa::Local)
+        if let Some(attr) = attr_handle.get_attribute(Ifa::Local)
             .or_else(|| attr_handle.get_attribute(Ifa::Address))
-        else { continue };
-
-        if let Ok(p) = attr.rta_payload.as_ref().try_into() {
+            && let Ok(p) = attr.rta_payload.as_ref().try_into()
+        {
             payload = Some(p);
         }
     });