crates/lib: Fix various clippy lints

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

crates/lib/src/cfsctl.rs

@@ -148,10 +148,7 @@ enum Command {
 }
 
 fn verity_opt(opt: &Option<String>) -> Result<Option<Sha512HashValue>> {
-    Ok(opt
-        .as_ref()
-        .map(|value| FsVerityHashValue::from_hex(value))
-        .transpose()?)
+    Ok(opt.as_ref().map(FsVerityHashValue::from_hex).transpose()?)
 }
 
 pub(crate) async fn run_from_iter<I>(system_store: &crate::store::Storage, args: I) -> Result<()>

crates/lib/src/cli.rs

@@ -921,17 +921,9 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
 
     // If there's no specified image, let's be nice and check if the booted system is using rpm-ostree
     if imgref.is_none() {
-        let booted_incompatible = host
-            .status
-            .booted
-            .as_ref()
-            .map_or(false, |b| b.incompatible);
+        let booted_incompatible = host.status.booted.as_ref().is_some_and(|b| b.incompatible);
 
-        let staged_incompatible = host
-            .status
-            .staged
-            .as_ref()
-            .map_or(false, |b| b.incompatible);
+        let staged_incompatible = host.status.staged.as_ref().is_some_and(|b| b.incompatible);
 
         if booted_incompatible || staged_incompatible {
             return Err(anyhow::anyhow!(

crates/lib/src/deploy.rs

@@ -201,7 +201,7 @@ async fn handle_layer_progress_print(
                         subtask = SubTaskBytes {
                             subtask: layer_type.into(),
                             description: format!("{layer_type}: {short_digest}").clone().into(),
-                            id: format!("{short_digest}").clone().into(),
+                            id: short_digest.to_string().clone().into(),
                             bytes_cached: 0,
                             bytes: 0,
                             bytes_total: layer_size,

crates/lib/src/fsck.rs

@@ -213,7 +213,6 @@ async fn verity_state_of_all_objects(
             .map_err(|_| anyhow::anyhow!("Invalid UTF-8"))?;
 
         let objdir = ent.open_dir()?;
-        let expected = expected.clone();
         joinset.spawn_blocking(move || verity_state_of_objects(&objdir, name.as_str(), expected));
     }
 

crates/lib/src/install.rs

@@ -1447,7 +1447,7 @@ async fn install_to_filesystem_impl(
         if matches!(cleanup, Cleanup::TriggerOnNextBoot) {
             let sysroot_dir = crate::utils::sysroot_dir(ostree)?;
             tracing::debug!("Writing {DESTRUCTIVE_CLEANUP}");
-            sysroot_dir.atomic_write(format!("etc/{}", DESTRUCTIVE_CLEANUP), b"")?;
+            sysroot_dir.atomic_write(format!("etc/{DESTRUCTIVE_CLEANUP}"), b"")?;
         }
 
         // We must drop the sysroot here in order to close any open file

crates/lib/src/lints.rs

@@ -155,10 +155,10 @@ impl Lint {
         f: LintFn,
     ) -> Self {
         Lint {
-            name: name,
+            name,
             ty: LintType::Fatal,
             f: LintFnTy::Regular(f),
-            description: description,
+            description,
             root_type: None,
         }
     }
@@ -169,10 +169,10 @@ impl Lint {
         f: LintFn,
     ) -> Self {
         Lint {
-            name: name,
+            name,
             ty: LintType::Warning,
             f: LintFnTy::Regular(f),
-            description: description,
+            description,
             root_type: None,
         }
     }
@@ -290,7 +290,7 @@ fn lint_inner<'skip>(
         results.push((lint, f(&root, &config)));
     }
 
-    let mut recursive_lints = BTreeSet::from_iter(recursive_lints.into_iter());
+    let mut recursive_lints = BTreeSet::from_iter(recursive_lints);
     let mut recursive_errors = BTreeMap::new();
     root.walk(
         &WalkConfiguration::default()
@@ -327,7 +327,7 @@ fn lint_inner<'skip>(
         },
     )?;
     // Extend our overall result set with the recursive-lint errors.
-    results.extend(recursive_errors.into_iter().map(|(lint, e)| (lint, e)));
+    results.extend(recursive_errors);
     // Any recursive lint still in this list succeeded.
     results.extend(recursive_lints.into_iter().map(|lint| (lint, lint_ok())));
     for (lint, r) in results {
@@ -511,7 +511,7 @@ fn check_utf8(e: &WalkComponent, _config: &LintExecutionConfig) -> LintRecursive
 
     if e.file_type.is_symlink() {
         let target = e.dir.read_link_contents(filename)?;
-        if !target.to_str().is_some() {
+        if target.to_str().is_none() {
             return lint_err(format!(
                 "{}: Found non-utf8 symlink target",
                 PathQuotedDisplay::new(&path)
@@ -754,7 +754,7 @@ Any content here in the container image will be masked at runtime.
 );
 fn check_boot(root: &Dir, config: &LintExecutionConfig) -> LintResult {
     let Some(d) = root.open_dir_optional("boot")? else {
-        return lint_err(format!("Missing /boot directory"));
+        return lint_err("Missing /boot directory");
     };
 
     // First collect all entries to determine if the directory is empty
@@ -1161,7 +1161,7 @@ mod tests {
         output_str.clear();
 
         // Test case 2: Iterator with one item
-        let items_one = vec!["item1"];
+        let items_one = ["item1"];
         format_items(&config, header, items_one.iter(), &mut output_str)?;
         assert_eq!(output_str, "Test Header:\n  item1\n");
         output_str.clear();
@@ -1194,7 +1194,7 @@ mod tests {
         output_str.clear();
 
         // Test case 2: Iterator with fewer items than DEFAULT_TRUNCATED_OUTPUT
-        let items_few = vec!["item1", "item2"];
+        let items_few = ["item1", "item2"];
         format_items(&config, header, items_few.iter(), &mut output_str)?;
         assert_eq!(output_str, "Test Header:\n  item1\n  item2\n");
         output_str.clear();
@@ -1246,7 +1246,7 @@ mod tests {
         let header = "Numbers";
         let mut output_str = String::new();
 
-        let items_numbers = vec![1, 2, 3];
+        let items_numbers = [1, 2, 3];
         format_items(&config, header, items_numbers.iter(), &mut output_str)?;
         similar_asserts::assert_eq!(output_str, "Numbers:\n  1\n  2\n  3\n");
 

crates/lib/src/podstorage.rs

@@ -122,7 +122,7 @@ fn bind_storage_roots(cmd: &mut Command, storage_root: &Dir, run_root: &Dir) ->
 fn new_podman_cmd_in(storage_root: &Dir, run_root: &Dir) -> Result<Command> {
     let mut cmd = Command::new("podman");
     bind_storage_roots(&mut cmd, storage_root, run_root)?;
-    let run_root = format!("/proc/self/fd/{}", STORAGE_RUN_FD);
+    let run_root = format!("/proc/self/fd/{STORAGE_RUN_FD}");
     cmd.args(["--root", STORAGE_ALIAS_DIR, "--runroot", run_root.as_str()]);
     Ok(cmd)
 }
@@ -288,7 +288,6 @@ impl CStorage {
             Ok(r)
         })
         .await?
-        .map_err(Into::into)
     }
 
     #[context("Pruning")]

crates/lib/src/progress_jsonl.rs

@@ -248,7 +248,7 @@ impl ProgressWriter {
     /// Send an event.
     pub(crate) async fn send(&self, event: Event<'_>) {
         if let Err(e) = self.send_impl(event, true).await {
-            eprintln!("Failed to write to jsonl: {}", e);
+            eprintln!("Failed to write to jsonl: {e}");
             // Stop writing to fd but let process continue
             // SAFETY: Propagating panics from the mutex here is intentional
             let _ = self.inner.lock().await.take();
@@ -258,7 +258,7 @@ impl ProgressWriter {
     /// Send an event that can be dropped.
     pub(crate) async fn send_lossy(&self, event: Event<'_>) {
         if let Err(e) = self.send_impl(event, false).await {
-            eprintln!("Failed to write to jsonl: {}", e);
+            eprintln!("Failed to write to jsonl: {e}");
             // Stop writing to fd but let process continue
             // SAFETY: Propagating panics from the mutex here is intentional
             let _ = self.inner.lock().await.take();

crates/lib/src/spec.rs

@@ -95,9 +95,7 @@ pub struct ImageReference {
 /// If the reference is in :tag@digest form, strip the tag.
 fn canonicalize_reference(reference: Reference) -> Option<Reference> {
     // No tag? Just pass through.
-    if reference.tag().is_none() {
-        return None;
-    }
+    reference.tag()?;
 
     // No digest? Also pass through.
     let Some(digest) = reference.digest() else {
@@ -126,7 +124,7 @@ impl ImageReference {
                     transport: self.transport.clone(),
                     signature: self.signature.clone(),
                 };
-                return Ok(r);
+                Ok(r)
             }
             _ => {
                 // For other transports, we don't do any canonicalization
@@ -349,14 +347,14 @@ mod tests {
         let test_cases = [
             // When both a tag and digest are present, the digest should be used
             (
-                format!("quay.io/example/someimage:latest@{}", sample_digest),
-                format!("quay.io/example/someimage@{}", sample_digest),
+                format!("quay.io/example/someimage:latest@{sample_digest}"),
+                format!("quay.io/example/someimage@{sample_digest}"),
                 "registry",
             ),
             // When only a digest is present, it should be used
             (
-                format!("quay.io/example/someimage@{}", sample_digest),
-                format!("quay.io/example/someimage@{}", sample_digest),
+                format!("quay.io/example/someimage@{sample_digest}"),
+                format!("quay.io/example/someimage@{sample_digest}"),
                 "registry",
             ),
             // When only a tag is present, it should be preserved
@@ -385,13 +383,13 @@ mod tests {
             ),
             // Other cases are not canonicalized
             (
-                format!("quay.io/example/someimage:latest@{}", sample_digest),
-                format!("quay.io/example/someimage:latest@{}", sample_digest),
+                format!("quay.io/example/someimage:latest@{sample_digest}"),
+                format!("quay.io/example/someimage:latest@{sample_digest}"),
                 "containers-storage",
             ),
             (
-                format!("/path/to/dir:latest"),
-                format!("/path/to/dir:latest"),
+                "/path/to/dir:latest".to_string(),
+                "/path/to/dir:latest".to_string(),
                 "oci",
             ),
             (

crates/lib/src/status.rs

@@ -526,7 +526,7 @@ fn human_render_slot(
             write_row_name(&mut out, "Signature", prefix_len)?;
             match signature {
                 crate::spec::ImageSignature::OstreeRemote(remote) => {
-                    writeln!(out, "ostree-remote:{}", remote)?;
+                    writeln!(out, "ostree-remote:{remote}")?;
                 }
                 crate::spec::ImageSignature::ContainerPolicy => {
                     writeln!(out, "container-policy")?;