From e7934eaaba16a4ff3afbbe3bc32edd1bc08609fc Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:38:57 +0000 Subject: [PATCH] Fix format container Clippy diagnostics --- crates/format/src/container.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/crates/format/src/container.rs b/crates/format/src/container.rs index 5544f2e9c..5c4f8b12f 100644 --- a/crates/format/src/container.rs +++ b/crates/format/src/container.rs @@ -82,6 +82,8 @@ pub struct PartDigest { pub digest: [u8; 32], } +type TrackedParts = (fn(&str) -> bool, Vec); + /// A container being written. pub struct Writer { zip: craft_zip::Writer, @@ -90,7 +92,7 @@ pub struct Writer { resolved: usize, limits: Limits, /// Which written parts to record for a signature, and the records so far. - tracked: Option<(fn(&str) -> bool, Vec)>, + tracked: Option, } impl Writer { @@ -111,7 +113,7 @@ impl Writer { /// The container's bytes. pub fn finish(self) -> Result, FormatError> { - Ok(self.zip.finish().map_err(invalid)?) + self.zip.finish().map_err(invalid) } /// Add a part, compressed or stored. A name already written is written once. @@ -206,11 +208,13 @@ impl Reader { // no path components that are "." or "..", and no duplicates. let mut name_set = BTreeSet::new(); for entry_idx in 0..archive.len() { - if let Ok(Some(name)) = archive.entry_name(entry_idx) { - if name.is_empty() || name.contains('\\') || name.split('/').any(|c| c.is_empty() || c == "." || c == "..") || !name_set.insert(name) - { - return Err(invalid("duplicate or invalid archive entry")); - } + if let Ok(Some(name)) = archive.entry_name(entry_idx) + && (name.is_empty() + || name.contains('\\') + || name.split('/').any(|c| c.is_empty() || c == "." || c == "..") + || !name_set.insert(name)) + { + return Err(invalid("duplicate or invalid archive entry")); } }