Clippy fixes for latest version of Rust

ava-labs · Aug 24, 2023 · ce5a5bb · ce5a5bb
1 parent 9f7e6d5
commit ce5a5bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/firewood/src/storage/mod.rs b/firewood/src/storage/mod.rs
@@ -93,7 +93,7 @@ impl growthring::wal::Record for AshRecord {
                     undo.offset
                         .to_le_bytes()
                         .into_iter()
-                        .chain(undo_data_len.to_le_bytes().into_iter())
+                        .chain(undo_data_len.to_le_bytes())
                         .chain(undo.data.iter().copied())
                         .chain(redo.data.iter().copied())
                 });
@@ -103,7 +103,7 @@ impl growthring::wal::Record for AshRecord {
             .flat_map(|(space_id_bytes, undo_len, ash_bytes)| {
                 space_id_bytes
                     .into_iter()
-                    .chain(undo_len.to_le_bytes().into_iter())
+                    .chain(undo_len.to_le_bytes())
                     .chain(ash_bytes)
             });
 

diff --git a/firewood/src/v2/emptydb.rs b/firewood/src/v2/emptydb.rs
@@ -96,7 +96,7 @@ mod tests {
 
         assert_eq!(proposal.val(b"k").await.unwrap().unwrap(), b"v");
 
-        assert!(matches!(proposal.val(b"z").await.unwrap(), None));
+        assert!(proposal.val(b"z").await.unwrap().is_none());
 
         Ok(())
     }
@@ -129,7 +129,7 @@ mod tests {
         assert_eq!(proposal1.val(b"k").await.unwrap().unwrap(), b"v");
         assert_eq!(proposal2.val(b"k").await.unwrap().unwrap(), b"v");
         // only proposal1 doesn't have z
-        assert!(matches!(proposal1.val(b"z").await.unwrap(), None));
+        assert!(proposal1.val(b"z").await.unwrap().is_none());
         // proposal2 has z with value "undo"
         assert_eq!(proposal2.val(b"z").await.unwrap().unwrap(), b"undo");
 

diff --git a/firewood/tests/merkle.rs b/firewood/tests/merkle.rs
@@ -730,7 +730,7 @@ fn test_empty_range_proof() -> Result<(), ProofError> {
     items.sort();
     let merkle = merkle_build_test(items.clone(), 0x10000, 0x10000)?;
 
-    let cases = vec![(items.len() - 1, false)];
+    let cases = [(items.len() - 1, false)];
     for (_, c) in cases.iter().enumerate() {
         let first = increase_key(items[c.0].0);
         let proof = merkle.prove(first)?;
@@ -942,7 +942,7 @@ fn test_empty_value_range_proof() -> Result<(), ProofError> {
     let empty_data: [u8; 20] = [0; 20];
     items.splice(
         mid_index..mid_index,
-        vec![(&key, &empty_data)].iter().cloned(),
+        [(&key, &empty_data)].iter().cloned(),
     );
 
     let start = 1;
@@ -980,7 +980,7 @@ fn test_all_elements_empty_value_range_proof() -> Result<(), ProofError> {
     let empty_data: [u8; 20] = [0; 20];
     items.splice(
         mid_index..mid_index,
-        vec![(&key, &empty_data)].iter().cloned(),
+        [(&key, &empty_data)].iter().cloned(),
     );
 
     let start = 0;

diff --git a/growth-ring/src/wal.rs b/growth-ring/src/wal.rs
@@ -658,7 +658,7 @@ impl<F: WalFile + 'static, S: WalStore<F>> WalWriter<F, S> {
             .collect();
 
         res.into_iter()
-            .zip(records.into_iter())
+            .zip(records)
             .map(|((ringid, blks), rec)| {
                 future::try_join_all(blks.into_iter().map(|idx| writes[idx].clone()))
                     .or_else(|_| future::ready(Err(())))