Fix (or allow) remaining clippy lints

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

Author: cgwalters

crates/lib/src/deploy.rs

@@ -139,6 +139,7 @@ fn prefix_of_progress(p: &ImportProgress) -> &'static str {
 }
 
 /// Write container fetch progress to standard output.
+#[allow(clippy::too_many_arguments)]
 async fn handle_layer_progress_print(
     mut layers: tokio::sync::mpsc::Receiver<ostree_container::store::ImportProgress>,
     mut layer_bytes: tokio::sync::watch::Receiver<Option<ostree_container::store::LayerProgress>>,
@@ -331,6 +332,7 @@ pub(crate) struct PreparedImportMeta {
     pub bytes_total: u64,
 }
 
+#[allow(clippy::large_enum_variant)]
 pub(crate) enum PreparedPullResult {
     Ready(PreparedImportMeta),
     AlreadyPresent(Box<ImageState>),

crates/lib/src/spec.rs

@@ -98,10 +98,8 @@ fn canonicalize_reference(reference: Reference) -> Option<Reference> {
     reference.tag()?;
 
     // No digest? Also pass through.
-    let Some(digest) = reference.digest() else {
-        return None;
-    };
-
+    let digest = reference.digest()?;
+    // Otherwise, replace with the digest
     Some(reference.clone_with_digest(digest.to_owned()))
 }
 

crates/tmpfiles/src/lib.rs

@@ -315,6 +315,7 @@ pub fn var_to_tmpfiles<U: uzers::Users, G: uzers::Groups>(
 /// This proceeds depth-first and progressively deletes translated subpaths as it goes.
 /// `prefix` is updated at each recursive step, so that in case of errors it can be
 /// used to pinpoint the faulty path.
+#[allow(clippy::too_many_arguments)]
 fn convert_path_to_tmpfiles_d_recurse<U: uzers::Users, G: uzers::Groups>(
     out_entries: &mut BTreeSet<String>,
     out_unsupported: &mut Vec<PathBuf>,