From 8d25e28ea3ee7f79a4e89a86583148c4a9a6ca5e Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Sat, 3 Feb 2024 18:36:20 -0500 Subject: [PATCH] Fix clippy warnings and formatting Signed-off-by: Andrew Gunnerson --- avbroot/src/format/fec.rs | 4 ++-- avbroot/src/format/hashtree.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/avbroot/src/format/fec.rs b/avbroot/src/format/fec.rs index 3ada18d..ae8319b 100644 --- a/avbroot/src/format/fec.rs +++ b/avbroot/src/format/fec.rs @@ -807,12 +807,12 @@ mod tests { let size = 2 * 253 * 4096; let fec = Fec::new(size, 4096, 2).unwrap(); - assert_eq!(fec.rounds_for_ranges(&[0..0]).unwrap(), HashSet::new(),); + assert_eq!(fec.rounds_for_ranges(&[0..0]).unwrap(), HashSet::new()); assert_eq!( fec.rounds_for_ranges(&[0..size]).unwrap(), HashSet::from([0, 1]), ); - assert_eq!(fec.rounds_for_ranges(&[0..1]).unwrap(), HashSet::from([0]),); + assert_eq!(fec.rounds_for_ranges(&[0..1]).unwrap(), HashSet::from([0])); assert_eq!( fec.rounds_for_ranges(&[4095..4096]).unwrap(), HashSet::from([0]), diff --git a/avbroot/src/format/hashtree.rs b/avbroot/src/format/hashtree.rs index 920b0ac..31bafb6 100644 --- a/avbroot/src/format/hashtree.rs +++ b/avbroot/src/format/hashtree.rs @@ -326,7 +326,7 @@ impl<'a> HashTree<'a> { cancel_signal: &AtomicBool, ) -> Result<(Vec, Vec)> { let offsets = self.compute_level_offsets(image_size)?; - let hash_tree_size = offsets.get(0).map(|r| r.end).unwrap_or(0); + let hash_tree_size = offsets.first().map(|r| r.end).unwrap_or(0); let mut hash_tree_data = vec![0u8; hash_tree_size]; let root_digest = self.calculate( @@ -352,7 +352,7 @@ impl<'a> HashTree<'a> { cancel_signal: &AtomicBool, ) -> Result> { let offsets = self.compute_level_offsets(image_size)?; - let hash_tree_size = offsets.get(0).map(|r| r.end).unwrap_or(0); + let hash_tree_size = offsets.first().map(|r| r.end).unwrap_or(0); if hash_tree_data.len() != hash_tree_size { return Err(Error::InvalidHashTreeSize { input: image_size, @@ -381,7 +381,7 @@ impl<'a> HashTree<'a> { cancel_signal: &AtomicBool, ) -> Result<()> { let offsets = self.compute_level_offsets(image_size)?; - let hash_tree_size = offsets.get(0).map(|r| r.end).unwrap_or(0); + let hash_tree_size = offsets.first().map(|r| r.end).unwrap_or(0); if hash_tree_data.len() != hash_tree_size { return Err(Error::InvalidHashTreeSize { input: image_size, @@ -637,7 +637,7 @@ mod tests { hash_tree.blocks_for_ranges(16384, &[0..16384]).unwrap(), &[0..4], ); - assert_eq!(hash_tree.blocks_for_ranges(16384, &[0..0]).unwrap(), &[],); + assert_eq!(hash_tree.blocks_for_ranges(16384, &[0..0]).unwrap(), &[]); assert_eq!( hash_tree .blocks_for_ranges(16384, &[12287..12289, 0..1, 5000..5001])