fix(ci): fix MSRV Windows import and Linux collapsible_if clippy warnings

barkleesanders · claude · barkleesanders · commit 1e1ce7171680 · 2026-03-07T19:05:03.000-08:00
- Add etcetera::BaseStrategy import behind cfg(windows) for data_dir()
- Collapse nested if statements in check_zypper_needs_reboot and needrestart check

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/frequency.rs b/src/frequency.rs
@@ -9,6 +9,8 @@ use std::fs;
 use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
 
+#[cfg(windows)]
+use etcetera::base_strategy::BaseStrategy;
 use tracing::debug;
 
 use crate::config::StepFrequency;
diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs
@@ -357,14 +357,14 @@ fn check_zypper_needs_reboot(ctx: &ExecutionContext) {
     if let Some(zypper) = which("zypper") {
         #[allow(clippy::disallowed_methods)]
         let status = std::process::Command::new(&zypper).arg("needs-rebooting").status();
-        if let Ok(s) = status {
-            if s.success() {
-                println!("{}", t!("System needs a reboot after updates."));
-                if let Ok(true) = prompt_yesno(&t!("Reboot now?")) {
-                    if let Err(e) = super::unix::reboot(ctx) {
-                        warn!("Failed to reboot: {e}");
-                    }
-                }
+        if let Ok(s) = status
+            && s.success()
+        {
+            println!("{}", t!("System needs a reboot after updates."));
+            if let Ok(true) = prompt_yesno(&t!("Reboot now?"))
+                && let Err(e) = super::unix::reboot(ctx)
+            {
+                warn!("Failed to reboot: {e}");
             }
         }
     }
@@ -931,10 +931,10 @@ fn should_skip_needrestart(ctx: &ExecutionContext) -> Result<()> {
             }
         }
         Distribution::Arch => {
-            if let Some(manager) = get_arch_package_manager(ctx) {
-                if manager.package_installed("needrestart", ctx)? {
-                    return Err(SkipStep(String::from(msg)).into());
-                }
+            if let Some(manager) = get_arch_package_manager(ctx)
+                && manager.package_installed("needrestart", ctx)?
+            {
+                return Err(SkipStep(String::from(msg)).into());
             }
         }
         _ => {}

Original file line number	Diff line number	Diff line change
`@@ -357,14 +357,14 @@ fn check_zypper_needs_reboot(ctx: &ExecutionContext) {`
`357`	`357`	`if let Some(zypper) = which("zypper") {`
`358`	`358`	`#[allow(clippy::disallowed_methods)]`
`359`	`359`	`let status = std::process::Command::new(&zypper).arg("needs-rebooting").status();`
`360`		`- if let Ok(s) = status {`
`361`		`- if s.success() {`
`362`		`- println!("{}", t!("System needs a reboot after updates."));`
`363`		`- if let Ok(true) = prompt_yesno(&t!("Reboot now?")) {`
`364`		`- if let Err(e) = super::unix::reboot(ctx) {`
`365`		`- warn!("Failed to reboot: {e}");`
`366`		`- }`
`367`		`- }`
	`360`	`+ if let Ok(s) = status`
	`361`	`+ && s.success()`
	`362`	`+ {`
	`363`	`+ println!("{}", t!("System needs a reboot after updates."));`
	`364`	`+ if let Ok(true) = prompt_yesno(&t!("Reboot now?"))`
	`365`	`+ && let Err(e) = super::unix::reboot(ctx)`
	`366`	`+ {`
	`367`	`+ warn!("Failed to reboot: {e}");`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`	`}`
`@@ -931,10 +931,10 @@ fn should_skip_needrestart(ctx: &ExecutionContext) -> Result<()> {`
`931`	`931`	`}`
`932`	`932`	`}`
`933`	`933`	`Distribution::Arch => {`
`934`		`- if let Some(manager) = get_arch_package_manager(ctx) {`
`935`		`- if manager.package_installed("needrestart", ctx)? {`
`936`		`- return Err(SkipStep(String::from(msg)).into());`
`937`		`- }`
	`934`	`+ if let Some(manager) = get_arch_package_manager(ctx)`
	`935`	`+ && manager.package_installed("needrestart", ctx)?`
	`936`	`+ {`
	`937`	`+ return Err(SkipStep(String::from(msg)).into());`
`938`	`938`	`}`
`939`	`939`	`}`
`940`	`940`	`_ => {}`