From 9d83ddbd69b866101b397a32e703d24a01eea0c9 Mon Sep 17 00:00:00 2001 From: Alwin Berger Date: Mon, 26 Aug 2024 15:16:25 +0200 Subject: [PATCH] low prio warnings-- --- fuzzers/FRET/src/fuzzer.rs | 4 ++-- fuzzers/FRET/src/systemstate/helpers.rs | 4 +++- fuzzers/FRET/src/systemstate/schedulers.rs | 2 +- libafl/src/fuzzer/mod.rs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fuzzers/FRET/src/fuzzer.rs b/fuzzers/FRET/src/fuzzer.rs index 1ebfdbbaba..349afbcb42 100644 --- a/fuzzers/FRET/src/fuzzer.rs +++ b/fuzzers/FRET/src/fuzzer.rs @@ -361,7 +361,7 @@ let run_client = |state: Option<_>, mut mgr, _core_id| { .find(|pc| (breakpoint..breakpoint + 5).contains(pc.as_ref().unwrap_or(&0))) { Some(_) => ExitKind::Ok, - None => ExitKind::Crash, + Option::None => ExitKind::Crash, } } }; @@ -556,7 +556,7 @@ let run_client = |state: Option<_>, mut mgr, _core_id| { } match time { - None => { + Option::None => { fuzzer .fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr) .unwrap(); diff --git a/fuzzers/FRET/src/systemstate/helpers.rs b/fuzzers/FRET/src/systemstate/helpers.rs index 09978b53c2..34b0b53457 100644 --- a/fuzzers/FRET/src/systemstate/helpers.rs +++ b/fuzzers/FRET/src/systemstate/helpers.rs @@ -280,7 +280,7 @@ fn trigger_collection(emulator: &libafl_qemu::Qemu, edge: (GuestAddr, GuestAddr) let mut buf : [u8; 4] = [0,0,0,0]; match h.input_counter { Some(s) => unsafe { emulator.read_mem(s, &mut buf); }, - None => (), + Option::None => (), }; systemstate.input_counter = GuestAddr::from_le_bytes(buf); @@ -436,6 +436,7 @@ where } //============================= Read Hooks +#[allow(unused)] pub fn gen_read_is_input( hooks: &mut QemuHooks, _state: Option<&mut S>, @@ -459,6 +460,7 @@ where static mut INPUT_MEM : Range = 0..0; static mut MEM_READ : Option> = None; +#[allow(unused)] pub fn trace_reads( _hooks: &mut QemuHooks, _state: Option<&mut S>, diff --git a/fuzzers/FRET/src/systemstate/schedulers.rs b/fuzzers/FRET/src/systemstate/schedulers.rs index 6c6d2529f4..f0a6932789 100644 --- a/fuzzers/FRET/src/systemstate/schedulers.rs +++ b/fuzzers/FRET/src/systemstate/schedulers.rs @@ -188,7 +188,7 @@ where // println!("normal next: {}", (*c).0); return Ok((*c).0.into()) }, - None => { + Option::None => { swap(&mut to_remove, &mut gm.current_gen); swap(&mut gm.next_gen, &mut gm.current_gen); gm.current_gen.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap()); diff --git a/libafl/src/fuzzer/mod.rs b/libafl/src/fuzzer/mod.rs index 8a4d86cea9..212c668f1f 100644 --- a/libafl/src/fuzzer/mod.rs +++ b/libafl/src/fuzzer/mod.rs @@ -335,7 +335,7 @@ where // But as the state may grow to a few megabytes, // for now we won' and the user has to do it (unless we find a way to do this on `Drop`). - if let None = ret { + if ret.is_none() { eprintln!("Warning: fuzzing loop ended with no last element"); ret = Some(crate::corpus::CorpusId(0)); }