Fix all clippy warnings

ranfdev · Copilot · ranfdev · commit 4306d2b7085f · 2026-02-28T21:09:40.000+01:00
Resolve strict clippy warnings across touched modules and restore cached known distro map initialization performance behavior.

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/backends/distrobox/distrobox.rs b/src/backends/distrobox/distrobox.rs
@@ -103,6 +103,8 @@ pub struct Distrobox {
     cmd_factory: CmdFactory,
 }
 
+type CommandResponse = (Command, Rc<dyn Fn() -> io::Result<String>>);
+
 #[derive(Clone, Debug, PartialEq, Hash)]
 pub enum Status {
     Up(String),
@@ -530,11 +532,11 @@ impl DistroboxCommandRunnerResponse {
         commands
     }
 
-    fn wrap_err_fn(output: (Command, String)) -> (Command, Rc<dyn Fn() -> io::Result<String>>) {
+    fn wrap_err_fn(output: (Command, String)) -> CommandResponse {
         (output.0, Rc::new(move || Ok(output.1.clone())))
     }
 
-    pub fn to_commands(self) -> Vec<(Command, Rc<dyn Fn() -> Result<String, io::Error>>)> {
+    pub fn into_commands(self) -> Vec<CommandResponse> {
         match self {
             Self::Version => {
                 let working_response = Self::build_version_response();
@@ -575,7 +577,7 @@ impl Distrobox {
     pub fn null_command_runner(responses: &[DistroboxCommandRunnerResponse]) -> CommandRunner {
         let mut builder = NullCommandRunnerBuilder::new();
         for res in responses {
-            for (cmd, out) in res.clone().to_commands() {
+            for (cmd, out) in res.clone().into_commands() {
                 builder.cmd_full(cmd, move || out());
             }
         }
@@ -1427,7 +1429,7 @@ Categories=Utility;Security;";
 
     #[test]
     fn stub_responses() {
-        let cmd_outputs = DistroboxCommandRunnerResponse::new_list_common_distros().to_commands();
+        let cmd_outputs = DistroboxCommandRunnerResponse::new_list_common_distros().into_commands();
         assert_eq!(
             cmd_outputs[0].1().unwrap(),
             "ID           | NAME                 | STATUS             | IMAGE  
@@ -1452,14 +1454,17 @@ Categories=Utility;Security;";
     fn stub_exported_apps_generates_valid_toml() {
         // Verify that new_common_exported_apps generates valid TOML that can be parsed
         let exported_apps = DistroboxCommandRunnerResponse::new_common_exported_apps();
-        let commands = exported_apps.to_commands();
+        let commands = exported_apps.into_commands();
 
         // Find the command that should contain TOML output (distrobox enter ... sh -c ...)
         let toml_command = commands
             .iter()
             .find(|(cmd, _)| {
                 cmd.program.to_string_lossy().contains("distrobox")
-                    && cmd.args.iter().any(|arg| arg.to_string_lossy() == "enter")
+                    && cmd
+                        .args
+                        .iter()
+                        .any(|arg: &std::ffi::OsString| arg.to_string_lossy() == "enter")
             })
             .expect("Should have a TOML-generating command");
 
diff --git a/src/backends/distrobox/mod.rs b/src/backends/distrobox/mod.rs
@@ -1,4 +1,5 @@
 pub mod command;
+#[allow(clippy::module_inception)]
 mod distrobox;
 
 pub use distrobox::*;
diff --git a/src/backends/supported_terminals.rs b/src/backends/supported_terminals.rs
@@ -215,10 +215,10 @@ impl TerminalRepository {
         let mut found_terminals = Vec::new();
         for terminal in FLATPAK_TERMINAL_CANDIDATES.iter() {
             // Extract app_id from extra_args (e.g., ["run", "org.gnome.Console"])
-            if let Some(app_id) = terminal.extra_args.get(1) {
-                if installed_apps.contains(app_id.as_str()) {
-                    found_terminals.push(terminal.clone());
-                }
+            if let Some(app_id) = terminal.extra_args.get(1)
+                && installed_apps.contains(app_id.as_str())
+            {
+                found_terminals.push(terminal.clone());
             }
         }
 
diff --git a/src/dialogs/create_distrobox_dialog.rs b/src/dialogs/create_distrobox_dialog.rs
@@ -972,7 +972,7 @@ impl CreateDistroboxDialog {
         )));
 
         let add_volume_button = adw::ButtonRow::builder()
-            .title(&gettext("Add Volume"))
+            .title(gettext("Add Volume"))
             .build();
         add_volume_button.connect_activated(clone!(
             #[weak(rename_to=this)]
diff --git a/src/dialogs/create_distrobox_helpers.rs b/src/dialogs/create_distrobox_helpers.rs
@@ -27,22 +27,22 @@ fn compare_version_vec(a: &[u64], b: &[u64]) -> std::cmp::Ordering {
 pub fn split_repo_tag_digest(s: &str) -> (&str, Option<&str>, Option<&str>) {
     // Return (repo, tag_opt, digest_opt)
     let last_slash = s.rfind('/');
-    if let Some(at_pos) = s.rfind('@') {
-        if last_slash.map_or(true, |ls| at_pos > ls) {
-            // If there is a tag before the @ (colon after last slash), strip it from repo
-            let before_at = &s[..at_pos];
-            if let Some(col_pos) = before_at.rfind(':') {
-                if last_slash.map_or(true, |ls| col_pos > ls) {
-                    return (&before_at[..col_pos], None, Some(&s[at_pos + 1..]));
-                }
-            }
-            return (before_at, None, Some(&s[at_pos + 1..]));
+    if let Some(at_pos) = s.rfind('@')
+        && last_slash.is_none_or(|ls| at_pos > ls)
+    {
+        // If there is a tag before the @ (colon after last slash), strip it from repo
+        let before_at = &s[..at_pos];
+        if let Some(col_pos) = before_at.rfind(':')
+            && last_slash.is_none_or(|ls| col_pos > ls)
+        {
+            return (&before_at[..col_pos], None, Some(&s[at_pos + 1..]));
         }
+        return (before_at, None, Some(&s[at_pos + 1..]));
     }
-    if let Some(col_pos) = s.rfind(':') {
-        if last_slash.map_or(true, |ls| col_pos > ls) {
-            return (&s[..col_pos], Some(&s[col_pos + 1..]), None);
-        }
+    if let Some(col_pos) = s.rfind(':')
+        && last_slash.is_none_or(|ls| col_pos > ls)
+    {
+        return (&s[..col_pos], Some(&s[col_pos + 1..]), None);
     }
     (s, None, None)
 }
@@ -157,10 +157,10 @@ pub fn derive_image_prefill(
             // 1) try to find latest (case-insensitive)
             for img in &matching {
                 let (_repo, tag_opt, _digest) = split_repo_tag_digest(img.as_str());
-                if let Some(tag) = tag_opt {
-                    if tag.eq_ignore_ascii_case("latest") {
-                        return (filter, Some((*img).clone()));
-                    }
+                if let Some(tag) = tag_opt
+                    && tag.eq_ignore_ascii_case("latest")
+                {
+                    return (filter, Some((*img).clone()));
                 }
             }
 
@@ -185,7 +185,7 @@ pub fn derive_image_prefill(
                     if let Some(cap) = VERSION_RE.captures(&tag_l) {
                         let ver = &cap["ver"];
                         let nums: Vec<u64> = ver
-                            .split(|c| c == '.' || c == '_' || c == '-')
+                            .split(['.', '_', '-'])
                             .filter_map(|p| p.parse::<u64>().ok())
                             .collect();
                         if !nums.is_empty() {
@@ -204,10 +204,10 @@ pub fn derive_image_prefill(
             // 4) fallback: pick first non-edge matching
             for img in &matching {
                 let (_repo, tag_opt, _digest) = split_repo_tag_digest(img.as_str());
-                if let Some(tag) = tag_opt {
-                    if tag.eq_ignore_ascii_case("edge") {
-                        continue;
-                    }
+                if let Some(tag) = tag_opt
+                    && tag.eq_ignore_ascii_case("edge")
+                {
+                    continue;
                 }
                 return (filter, Some((*img).clone()));
             }
diff --git a/src/dialogs/exportable_apps_dialog.rs b/src/dialogs/exportable_apps_dialog.rs
@@ -195,9 +195,9 @@ impl ExportableAppsDialog {
         if binary_name_or_path.contains('/') {
             // For paths, we need to check on the host using a command
             // We'll use 'test -e' which returns 0 if the file exists
-            let expanded_path = if binary_name_or_path.starts_with("~/") {
+            let expanded_path = if let Some(stripped) = binary_name_or_path.strip_prefix("~/") {
                 // Expand home on host - use $HOME variable
-                format!("$HOME/{}", &binary_name_or_path[2..])
+                format!("$HOME/{stripped}")
             } else {
                 binary_name_or_path.to_string()
             };
@@ -352,12 +352,12 @@ impl ExportableAppsDialog {
 
                         if exists {
                             // Show confirmation dialog
+                            let confirmation_body = gettext(
+                                "The binary already exists on your host system. Do you want to continue?",
+                            );
                             let dialog = adw::AlertDialog::new(
                                 Some(&gettext("Binary Already Exists on Host")),
-                                Some(&format!(
-                                    "{}",
-                                    gettext("The binary already exists on your host system. Do you want to continue?"),
-                                )),
+                                Some(&confirmation_body),
                             );
                             dialog.add_response("cancel", &gettext("Cancel"));
                             dialog.add_response("export", &gettext("Export Anyway"));
diff --git a/src/dialogs/preferences_dialog.rs b/src/dialogs/preferences_dialog.rs
@@ -304,8 +304,8 @@ impl PreferencesDialog {
             .string();
 
         let dialog = adw::AlertDialog::builder()
-            .heading(&gettext("Delete this terminal?"))
-            .body(&gettext("This terminal will be removed from the terminal list. This action cannot be undone."))
+            .heading(gettext("Delete this terminal?"))
+            .body(gettext("This terminal will be removed from the terminal list. This action cannot be undone."))
             .close_response("cancel")
             .default_response("cancel")
             .build();
@@ -328,9 +328,9 @@ impl PreferencesDialog {
                     {
                         Ok(_) => {
                             glib::MainContext::ref_thread_default().spawn_local(async move {
-                                if let Some(terminal_combo_row) =
-                                    this.imp().terminal_combo_row.borrow().as_ref()
-                                {
+                                let terminal_combo_row =
+                                    this.imp().terminal_combo_row.borrow().as_ref().cloned();
+                                if let Some(terminal_combo_row) = terminal_combo_row {
                                     terminal_combo_row.rebuild_terminals_list();
                                     terminal_combo_row.set_selected_by_name(
                                         &this
diff --git a/src/distrobox_downloader.rs b/src/distrobox_downloader.rs
@@ -88,17 +88,18 @@ pub fn cleanup_old_bundled_versions() {
             Some(s) => s.to_string(),
             None => continue,
         };
-        if name_str.starts_with("distrobox-") && name_str != current_dir_name {
-            if entry.path().is_dir() {
-                if let Err(e) = std::fs::remove_dir_all(entry.path()) {
-                    tracing::warn!(
-                        "Failed to remove old bundled version {:?}: {}",
-                        entry.path(),
-                        e
-                    );
-                } else {
-                    tracing::info!("Removed old bundled version: {}", name_str);
-                }
+        if name_str.starts_with("distrobox-")
+            && name_str != current_dir_name
+            && entry.path().is_dir()
+        {
+            if let Err(e) = std::fs::remove_dir_all(entry.path()) {
+                tracing::warn!(
+                    "Failed to remove old bundled version {:?}: {}",
+                    entry.path(),
+                    e
+                );
+            } else {
+                tracing::info!("Removed old bundled version: {}", name_str);
             }
         }
     }
diff --git a/src/fakers/command.rs b/src/fakers/command.rs
@@ -90,10 +90,10 @@ impl Command {
 
     // removes the first occurrence of an arg by name and its value
     pub fn remove_flag_value_arg(&mut self, name: &str) -> &mut Command {
-        self.args.iter().position(|x| x == name).map(|index| {
+        if let Some(index) = self.args.iter().position(|x| x == name) {
             self.args.remove(index);
             self.args.remove(index); // same index, as the vector has shifted
-        });
+        }
         self
     }
     pub fn remove_flag_arg(&mut self, name: &str) -> &mut Command {
diff --git a/src/fakers/command_runner.rs b/src/fakers/command_runner.rs
@@ -20,6 +20,9 @@ use futures::{
     io::{AsyncRead, AsyncWrite, Cursor},
 };
 
+type ResponseFn = Rc<dyn Fn() -> Result<String, io::Error>>;
+type ResponseMap = HashMap<Vec<String>, ResponseFn>;
+
 #[derive(Debug, Clone)]
 pub enum CommandRunnerEvent {
     Spawned(usize, Command),
@@ -178,7 +181,7 @@ impl InnerCommandRunner for RealCommandRunner {
 
 #[derive(Default, Clone)]
 pub struct NullCommandRunnerBuilder {
-    responses: HashMap<Vec<String>, Rc<dyn Fn() -> Result<String, io::Error>>>,
+    responses: ResponseMap,
     #[allow(dead_code)]
     fallback_exit_status: ExitStatus,
 }
@@ -220,7 +223,7 @@ impl NullCommandRunnerBuilder {
 
 #[derive(Default, Clone)]
 pub struct NullCommandRunner {
-    responses: HashMap<Vec<String>, Rc<dyn Fn() -> Result<String, io::Error>>>,
+    responses: ResponseMap,
     #[allow(dead_code)]
     fallback_exit_status: ExitStatus,
 }
diff --git a/src/fakers/host_env.rs b/src/fakers/host_env.rs
@@ -8,23 +8,23 @@ pub async fn resolve_host_env(runner: &CommandRunner) -> io::Result<HashMap<Stri
     let mut cmd = Command::new("env");
     cmd.arg("-0");
 
-    if let Ok(output) = runner.output(cmd).await {
-        if output.status.success() {
-            let vars = output
-                .stdout
-                .split(|b| *b == 0)
-                .filter_map(|entry| {
-                    if entry.is_empty() {
-                        return None;
-                    }
-                    let s = String::from_utf8_lossy(entry).to_string();
-                    s.split_once('=')
-                        .map(|(k, v)| (k.to_string(), v.to_string()))
-                })
-                .collect::<HashMap<_, _>>();
-            if !vars.is_empty() {
-                return Ok(vars);
-            }
+    if let Ok(output) = runner.output(cmd).await
+        && output.status.success()
+    {
+        let vars = output
+            .stdout
+            .split(|b| *b == 0)
+            .filter_map(|entry| {
+                if entry.is_empty() {
+                    return None;
+                }
+                let s = String::from_utf8_lossy(entry).to_string();
+                s.split_once('=')
+                    .map(|(k, v)| (k.to_string(), v.to_string()))
+            })
+            .collect::<HashMap<_, _>>();
+        if !vars.is_empty() {
+            return Ok(vars);
         }
     }
 
diff --git a/src/gtk_utils/terminal_colors.rs b/src/gtk_utils/terminal_colors.rs
@@ -1,4 +1,3 @@
-use adw;
 /// Terminal color scheme utilities for VTE4 with libadwaita theme support
 /// Provides ANSI color palettes that respect the system light/dark theme preference
 use gtk::gdk;
diff --git a/src/models/known_distros.rs b/src/models/known_distros.rs
diff --git a/src/query/mod.rs b/src/query/mod.rs
diff --git a/src/widgets/container_overview.rs b/src/widgets/container_overview.rs
diff --git a/src/widgets/window.rs b/src/widgets/window.rs

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,10 @@ impl TerminalRepository {`
`215`	`215`	`let mut found_terminals = Vec::new();`
`216`	`216`	`for terminal in FLATPAK_TERMINAL_CANDIDATES.iter() {`
`217`	`217`	`// Extract app_id from extra_args (e.g., ["run", "org.gnome.Console"])`
`218`		`- if let Some(app_id) = terminal.extra_args.get(1) {`
`219`		`- if installed_apps.contains(app_id.as_str()) {`
`220`		`- found_terminals.push(terminal.clone());`
`221`		`- }`
	`218`	`+ if let Some(app_id) = terminal.extra_args.get(1)`
	`219`	`+ && installed_apps.contains(app_id.as_str())`
	`220`	`+ {`
	`221`	`+ found_terminals.push(terminal.clone());`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`