From 486edb1d1bbd8ed228bd49c45fc64c3f81a0ddee Mon Sep 17 00:00:00 2001 From: Thomas Rooijakkers Date: Mon, 9 Dec 2024 11:14:44 +0100 Subject: [PATCH] Use use --- src/openapi_mutator/mod.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/openapi_mutator/mod.rs b/src/openapi_mutator/mod.rs index e47ff7e..21e9707 100644 --- a/src/openapi_mutator/mod.rs +++ b/src/openapi_mutator/mod.rs @@ -5,6 +5,7 @@ //! reorder them, for instance. And there are other mutators that act on the contents of a //! request, changing the parameter values (using a LibAFL byte sequence mutator, for example). +use core::num::NonZero; use std::borrow::Cow; use crate::input::parameter::SimpleValue; @@ -214,7 +215,7 @@ fn mutate_number(state: &mut S, n: &mut serde_json::value::Number) - // A small chance to get a special value that might just lead to interesting errors match state .rand_mut() - .below(core::num::NonZero::new(100).unwrap()) + .below(NonZero::new(100).unwrap()) { 0 => { *n = (-1).into(); @@ -231,7 +232,7 @@ fn mutate_number(state: &mut S, n: &mut serde_json::value::Number) - 0 => 0.into(), x_usz => state .rand_mut() - .below(core::num::NonZero::new(x_usz.saturating_mul(2)).unwrap()) + .below(NonZero::new(x_usz.saturating_mul(2)).unwrap()) .into(), }; return MutationResult::Mutated; @@ -239,11 +240,11 @@ fn mutate_number(state: &mut S, n: &mut serde_json::value::Number) - if let Some(x) = n.as_i64() { // always negative *n = (state.rand_mut().below( - core::num::NonZero::new(x) - .unwrap_or(core::num::NonZero::new(i64::MAX).unwrap()) // because -i64::MIN == i64::MIN - .saturating_mul(core::num::NonZero::new(4).unwrap()) + NonZero::new(x) + .unwrap_or(NonZero::new(i64::MAX).unwrap()) // because -i64::MIN == i64::MIN + .saturating_mul(NonZero::new(4).unwrap()) .try_into() - .unwrap_or(core::num::NonZero::new(usize::MAX).unwrap()), // larger values could otherwise be truncated + .unwrap_or(NonZero::new(usize::MAX).unwrap()), // larger values could otherwise be truncated ) as i64 + x.saturating_mul(2)) .into(); @@ -258,7 +259,7 @@ fn mutate_number(state: &mut S, n: &mut serde_json::value::Number) - 0 => 0, x_usz => state .rand_mut() - .below(core::num::NonZero::new(x_usz.saturating_mul(4)).unwrap()), + .below(NonZero::new(x_usz.saturating_mul(4)).unwrap()), }; let n_new = serde_json::value::Number::from_f64((x_int_new as f64) - 2.0 * x); if let Some(n_new) = n_new { @@ -369,7 +370,7 @@ where from.into_iter() .zip(1..) .fold(None, |result, (element, count)| { - match rand.below(core::num::NonZero::new(count).unwrap()) { + match rand.below(NonZero::new(count).unwrap()) { 0 => Some(element), _ => result, }