fix a bunch of warnings

AFLplusplus · May 8, 2024 · d63b622 · d63b622
1 parent 0fb4a5b
commit d63b622
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/lain/src/mutatable.rs b/lain/src/mutatable.rs
@@ -314,7  314,7 @@ where
         mutator: &mut Mutator<R>,
         constraints: Option<&Constraints<Self::RangeType>>,
     ) {
-        let mut constraints = constraints.and_then(|c| {
         let constraints = constraints.and_then(|c| {
             if c.max_size.is_none() {
                 None
             } else {
@@ -630,7  630,7 @@ where
             }
             None => {
                 if mutator.gen_chance(CHANCE_TO_FLIP_OPTION_STATE) {
-                    let mut new_item = T::new_fuzzed(mutator, constraints);
                     let new_item = T::new_fuzzed(mutator, constraints);
 
                     *self = Some(new_item);
                 }

diff --git a/lain/src/new_fuzzed.rs b/lain/src/new_fuzzed.rs
@@ -774,7  774,7 @@ macro_rules! impl_new_fuzzed_array {
                 type RangeType = usize;
 
                 fn new_fuzzed<R: Rng>(mutator: &mut Mutator<R>, constraints: Option<&Constraints<Self::RangeType>>) -> [T; $size] {
-                    let mut per_item_max_size: Option<usize> = constraints.and_then(|c| c.max_size.as_ref().and_then(|size| Some(*size / $size)));
                     let per_item_max_size: Option<usize> = constraints.and_then(|c| c.max_size.as_ref().and_then(|size| Some(*size / $size)));
 
                     let mut output: MaybeUninit<[T; $size]> = MaybeUninit::uninit();
                     let arr_ptr = output.as_mut_ptr() as *mut T;
@@ -828,7  828,7 @@ macro_rules! impl_new_fuzzed_array {
                 default type RangeType = usize;
 
                 default fn new_fuzzed<R: Rng>(mutator: &mut Mutator<R>, constraints: Option<&Constraints<Self::RangeType>>) -> [T; $size] {
-                    let mut per_item_max_size: Option<usize> = constraints.and_then(|c| c.max_size.as_ref().and_then(|size| Some(*size / $size)));
                     let per_item_max_size: Option<usize> = constraints.and_then(|c| c.max_size.as_ref().and_then(|size| Some(*size / $size)));
 
                     let mut output: MaybeUninit<[T; $size]> = MaybeUninit::uninit();
                     let arr_ptr = output.as_mut_ptr() as *mut T;

diff --git a/testsuite/benches/benchmark_generating_fuzzed_struct.rs b/testsuite/benches/benchmark_generating_fuzzed_struct.rs
@@ -52,7  52,7 @@ fn bench_new_fuzzed_1000(c: &mut Criterion) {
     c.bench(
         function_name.as_ref(),
         Benchmark::new("fuzz", move |b| {
-            let mut mutator = Mutator::new(lain::rand::rngs::SmallRng::from_seed([0u8; 16]));
             let mut mutator = Mutator::new(lain::rand::rngs::SmallRng::from_seed([0u8; 32]));
             b.iter(|| {
                 let s = NestedStruct::new_fuzzed(&mut mutator, None);
                 black_box(s);
@@ -69,8  69,8 @@ fn bench_in_place_mutation(c: &mut Criterion) {
     c.bench(
         function_name.as_ref(),
         Benchmark::new("fuzz", move |b| {
-            let mut mutator = Mutator::new(lain::rand::rngs::SmallRng::from_seed([0u8; 16]));
-            let mut s = NestedStruct::new_fuzzed(&mut mutator, None);
             let mut mutator = Mutator::new(lain::rand::rngs::SmallRng::from_seed([0u8; 32]));
             let s = NestedStruct::new_fuzzed(&mut mutator, None);
             b.iter(|| {
                 let mut s = s.clone();
                 let state = mutator.get_corpus_state();

diff --git a/testsuite/src/lib.rs b/testsuite/src/lib.rs
@@ -232,11  232,10 @@ mod test {
             b: u8,
         }
 
-        let mut instance;
         let mut mutator = get_mutator();
 
         for _i in 0..10000 {
-            instance = Foo::new_fuzzed(&mut mutator, None);
             Foo::new_fuzzed(&mut mutator, None);
         }
     }
 
@@ -792,7  791,7 @@ mod test {
             b: u32,
         }
 
-        let mut s = IncompleteBitfield { a: 0, b: 1 };
         let s = IncompleteBitfield { a: 0, b: 1 };
 
         assert_eq!(IncompleteBitfield::min_nonzero_elements_size(), 4);
 
@@ -906,8  905,8 @@ mod test {
 
         let mut mutator = get_mutator();
 
-        let mut obj = Foo::new_fuzzed(&mut mutator, Some(&constraints));
-        for i in 0..1000 {
         let mut obj;
         for _i in 0..1000 {
             obj = Foo::new_fuzzed(&mut mutator, Some(&constraints));
             assert!(obj.serialized_size() <= MAX_SIZE);
 
@@ -924,8  923,8 @@ mod test {
             );
         }
 
-        let mut baz = Baz::new_fuzzed(&mut mutator, Some(&constraints));
-        for i in 0..1000 {
         let mut baz;
         for _i in 0..1000 {
             baz = Baz::new_fuzzed(&mut mutator, Some(&constraints));
             assert!(baz.serialized_size() <= MAX_SIZE);
 
@@ -971,7  970,7 @@ mod test {
 
         // this breaks at 72 iterations which is fine. would break at a different iteration
         // with a different seed
-        for i in 0..50 {
         for _i in 0..50 {
             let prev_obj = obj.clone();
             obj.mutate(&mut mutator, None);