From db3215f6be5341914f2a649b395b3de357f0d86a Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Sat, 21 Nov 2020 17:53:10 +0100 Subject: [PATCH] more no_std compatibility --- src/corpus/testcase.rs | 2 +- src/engines/mod.rs | 1 + src/events/mod.rs | 5 +++-- src/generators/mod.rs | 8 +++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/corpus/testcase.rs b/src/corpus/testcase.rs index a8207a074b..74cc3026b7 100644 --- a/src/corpus/testcase.rs +++ b/src/corpus/testcase.rs @@ -169,7 +169,7 @@ where pub fn load_input(&mut self) -> Result<&I, AflError> { if self.input.is_none() { let input = I::from_file(self.filename.as_ref().ok_or(AflError::EmptyOptional( - "filename not specified".to_string(), + "filename not specified".into(), ))?)?; self.input = Some(input); } diff --git a/src/engines/mod.rs b/src/engines/mod.rs index 7b709e70fd..591069aed2 100644 --- a/src/engines/mod.rs +++ b/src/engines/mod.rs @@ -199,6 +199,7 @@ where fn fuzz_one(&mut self, state: &mut S) -> Result { let (testcase, idx) = state.corpus_mut().next()?; + #[cfg(feature = "std")] println!("Cur entry: {}\tExecutions: {}", idx, state.executions()); for stage in self.stages_mut() { stage.perform(testcase.clone(), state)?; diff --git a/src/events/mod.rs b/src/events/mod.rs index ba0d5af3d0..a6cc3fe4c7 100644 --- a/src/events/mod.rs +++ b/src/events/mod.rs @@ -79,8 +79,9 @@ impl EventManager for LoggerEventManager { } } - fn fire(&mut self, event: E) -> Result<(), AflError> { - println!("{}", event); + fn fire(&mut self, _event: E) -> Result<(), AflError> { + #[cfg(feature = "std")] + println!("{}", _event); Ok(()) } diff --git a/src/generators/mod.rs b/src/generators/mod.rs index 60813d59b4..a8d30f1d54 100644 --- a/src/generators/mod.rs +++ b/src/generators/mod.rs @@ -1,10 +1,12 @@ +use alloc::rc::Rc; +use alloc::vec::Vec; +use core::cell::RefCell; +use core::cmp::min; + use crate::inputs::bytes::BytesInput; use crate::inputs::Input; use crate::utils::{HasRand, Rand}; use crate::AflError; -use alloc::rc::Rc; -use core::cell::RefCell; -use core::cmp::min; pub trait Generator: HasRand where