De-tuple if-let statements

Author: bim9262

build.rs

@@ -11,7 +11,9 @@ fn main() {
         .env("GIT_CONFIG_GLOBAL", "/dev/null")
         .output()
         .map(|o| String::from_utf8(o.stdout).unwrap());
-    if let (Ok(hash), Ok(date)) = (hash, date) {
+    if let Ok(hash) = hash
+        && let Ok(date) = date
+    {
         let ver = format!(
             "{} (commit {} {})",
             env!("CARGO_PKG_VERSION"),

src/blocks/calendar.rs

@@ -360,7 +360,8 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
         }
 
         if let Some(event) = next_events.current().cloned()
-            && let (Some(start_date), Some(end_date)) = (event.start_at, event.end_at)
+            && let Some(start_date) = event.start_at
+            && let Some(end_date) = event.end_at
         {
             let warn_datetime = start_date - warning_threshold;
             if warn_datetime < Utc::now() && Utc::now() < start_date {

src/blocks/memory.rs

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

src/blocks/privacy/pipewire.rs

@@ -48,14 +48,13 @@ struct Link {
 
 impl Link {
     fn new(global_props: &DictRef) -> Option<Self> {
-        if let (Some(link_output_node), Some(link_input_node)) = (
-            global_props
-                .get(&keys::LINK_OUTPUT_NODE)
-                .and_then(|s| s.parse().ok()),
-            global_props
+        if let Some(link_output_node) = global_props
+            .get(&keys::LINK_OUTPUT_NODE)
+            .and_then(|s| s.parse().ok())
+            && let Some(link_input_node) = global_props
                 .get(&keys::LINK_INPUT_NODE)
-                .and_then(|s| s.parse().ok()),
-        ) {
+                .and_then(|s| s.parse().ok())
+        {
             Some(Self {
                 link_output_node,
                 link_input_node,
@@ -221,10 +220,9 @@ impl PrivacyMonitor for Monitor<'_> {
             ..
         } in data.links.values().sorted().dedup()
         {
-            if let (Some(output_node), Some(input_node)) = (
-                data.nodes.get(link_output_node),
-                data.nodes.get(link_input_node),
-            ) && input_node.media_class != Some("Audio/Sink".into())
+            if let Some(output_node) = data.nodes.get(link_output_node)
+                && let Some(input_node) = data.nodes.get(link_input_node)
+                && 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,26 +108,25 @@ impl PrivacyMonitor for Monitor<'_> {
                 continue;
             };
             while let Ok(Some(fd_path)) = fd_paths.next_entry().await {
+                let mut contents = String::new();
                 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
+                    && file.read_to_string(&mut contents).await.is_ok()
                 {
-                    let mut contents = String::new();
-                    if file.read_to_string(&mut contents).await.is_ok() {
-                        let reader = contents.trim_end().to_string();
-                        if self.config.exclude_consumer.contains(&reader) {
-                            continue;
-                        }
-                        debug!("{} {:?}", reader, link_path);
-                        *mapping
-                            .entry(Type::Webcam)
-                            .or_default()
-                            .entry(link_path.to_string_lossy().to_string())
-                            .or_default()
-                            .entry(reader)
-                            .or_default() += 1;
-                        debug!("{:?}", mapping);
+                    let reader = contents.trim_end().to_string();
+                    if self.config.exclude_consumer.contains(&reader) {
+                        continue;
                     }
+                    debug!("{} {:?}", reader, link_path);
+                    *mapping
+                        .entry(Type::Webcam)
+                        .or_default()
+                        .entry(link_path.to_string_lossy().to_string())
+                        .or_default()
+                        .entry(reader)
+                        .or_default() += 1;
+                    debug!("{:?}", mapping);
                 }
             }
         }

src/blocks/weather.rs

@@ -375,7 +375,9 @@ impl Forecast {
                 humidity_count += 1.0;
             }
 
-            if let (Some(wind), Some(wind_kmh)) = (val.wind, val.wind_kmh) {
+            if let Some(wind) = val.wind
+                && let Some(wind_kmh) = val.wind_kmh
+            {
                 if let Some(degrees) = val.wind_direction {
                     let (sin, cos) = degrees.to_radians().sin_cos();
                     wind_north_avg += wind * cos;

src/blocks/weather/met_no.rs

@@ -113,11 +113,10 @@ impl ForecastTimeStep {
     fn to_aggregate(&self) -> ForecastAggregateSegment {
         let instant = &self.data.instant.details;
 
-        let apparent = if let (Some(air_temperature), Some(relative_humidity), Some(wind_speed)) = (
-            instant.air_temperature,
-            instant.relative_humidity,
-            instant.wind_speed,
-        ) {
+        let apparent = if let Some(air_temperature) = instant.air_temperature
+            && let Some(relative_humidity) = instant.relative_humidity
+            && let Some(wind_speed) = instant.wind_speed
+        {
             Some(australian_apparent_temp(
                 air_temperature,
                 relative_humidity,

src/blocks/xrandr.rs

@@ -170,7 +170,9 @@ async fn get_monitors() -> Result<Vec<Monitor>> {
 
     let mut it = monitors_info.lines().filter(|line| regex.is_match(line));
 
-    while let (Some(line1), Some(line2)) = (it.next(), it.next()) {
+    while let Some(line1) = it.next()
+        && let Some(line2) = it.next()
+    {
         let mut tokens = line1.split_ascii_whitespace().peekable();
         let name = tokens.next().error("Failed to parse xrandr output")?.into();
         let _ = tokens.next();