Merge pull request #426 from filecoin-project/fuzz/minor-fixes

Run clippy, fmt on fuzz targets and fix rle_encode corpus symlink

Author: Stebalien

ipld/amt/fuzz/fuzz_targets/equivalence.rs

@@ -3,11 +3,10 @@
 
 #![no_main]
 use arbitrary::Arbitrary;
-use fvm_ipld_amt::Amt;
-use libfuzzer_sys::fuzz_target;
 use cid::Cid;
+use fvm_ipld_amt::Amt;
 use itertools::Itertools;
-
+use libfuzzer_sys::fuzz_target;
 
 #[derive(Debug, Arbitrary)]
 struct Operation {
@@ -27,7 +26,7 @@ fn execute(ops: Vec<Operation>) -> (Cid, ahash::AHashMap<u64, u64>) {
     let mut amt = Amt::new(&db);
     let mut elements = ahash::AHashMap::new();
 
-    for (i, Operation { idx, method, flush}) in ops.into_iter().enumerate() {
+    for (i, Operation { idx, method, flush }) in ops.into_iter().enumerate() {
         let idx = idx as u64;
         if flush > 255 - 13 {
             // Periodic flushing and reloading of Amt to fuzz blockstore usage also
@@ -62,9 +61,15 @@ fn execute(ops: Vec<Operation>) -> (Cid, ahash::AHashMap<u64, u64>) {
 fuzz_target!(|ops: Vec<Operation>| {
     let (res_cid, m) = execute(ops);
 
-    let simplified_ops = m.iter().sorted_by_key(|(_, v)| *v).map(|(k ,v)| {
-        Operation{idx: *k as u16, method: Method::Insert(*v), flush: 0}
-    }).collect();
+    let simplified_ops = m
+        .iter()
+        .sorted_by_key(|(_, v)| *v)
+        .map(|(k, v)| Operation {
+            idx: *k as u16,
+            method: Method::Insert(*v),
+            flush: 0,
+        })
+        .collect();
 
     let (simplified_cid, _) = execute(simplified_ops);
     assert_eq!(res_cid, simplified_cid)

testing/common_fuzz/fuzz/corpus/rle_encode/rle_encode2 renamed to testing/common_fuzz/fuzz/corpus/rle_encode

@@ -1,7 +1,7 @@
 #![no_main]
-use libfuzzer_sys::fuzz_target;
-use fvm_ipld_bitfield::BitField;
 use arbitrary::Arbitrary;
+use fvm_ipld_bitfield::BitField;
+use libfuzzer_sys::fuzz_target;
 
 #[derive(Debug, Arbitrary)]
 enum Operation {
@@ -14,8 +14,12 @@ fuzz_target!(|data: (BitField, Vec<Operation>)| {
 
     for op in ops {
         match op {
-            Operation::Set(x) => { _ = bf.try_set(x);}
-            Operation::Unset(x) => {bf.unset(x);}
+            Operation::Set(x) => {
+                let _ = bf.try_set(x);
+            }
+            Operation::Unset(x) => {
+                bf.unset(x);
+            }
         };
     }
 

testing/common_fuzz/fuzz/fuzz_targets/rle_encode.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 #![no_main]
+#![allow(clippy::eq_op)]
 
 use fvm_ipld_bitfield::BitField;
 use libfuzzer_sys::fuzz_target;
@@ -31,6 +32,4 @@ fuzz_target!(|bfs: [BitField; 3]| {
         assert_eq!(&(bf1 - bf2) - bf3, &(bf1 - bf3) - bf2);
         assert_eq!(&(bf1 ^ bf2) ^ bf3, &(bf1 ^ bf3) ^ bf2);
     }
-
-    ()
 });