Merge branch 'main' of github.com:AFLplusplus/LibAFLrs into main

afl/src/corpus/mod.rs

@@ -9,9 +9,9 @@ use core::marker::PhantomData;
 #[cfg(feature = "std")]
 use std::path::PathBuf;
 
-use crate::AflError;
 use crate::inputs::Input;
 use crate::utils::Rand;
+use crate::AflError;
 
 pub trait HasTestcaseVec<I>
 where

afl/src/corpus/testcase.rs

@@ -7,8 +7,8 @@ use core::default::Default;
 use core::option::Option;
 use hashbrown::HashMap;
 
-use crate::AflError;
 use crate::inputs::Input;
+use crate::AflError;
 
 // TODO PathBuf for no_std and change filename to PathBuf
 //#[cfg(feature = "std")]

afl/src/engines/mod.rs

@@ -380,6 +380,8 @@ where
     }
 }
 
+// TODO: no_std test
+#[cfg(feature = "std")]
 #[cfg(test)]
 mod tests {
 
@@ -403,7 +405,6 @@ mod tests {
         ExitKind::Ok
     }
 
-    #[cfg(feature = "std")]
     #[test]
     fn test_engine() {
         let mut rand = StdRand::new(0);

afl/src/executors/inmemory.rs

@@ -3,9 +3,9 @@ use core::cell::RefCell;
 use core::ffi::c_void;
 use core::ptr;
 
-use crate::AflError;
 use crate::executors::{Executor, ExitKind};
 use crate::inputs::Input;
+use crate::AflError;
 
 type HarnessFunction<I> = fn(&dyn Executor<I>, &[u8]) -> ExitKind;
 

afl/src/feedbacks/mod.rs

@@ -1,14 +1,14 @@
+use alloc::boxed::Box;
 use alloc::rc::Rc;
 use alloc::vec::Vec;
-use alloc::boxed::Box;
 use core::cell::RefCell;
 use core::marker::PhantomData;
 use num::Integer;
 
-use crate::AflError;
 use crate::corpus::{Testcase, TestcaseMetadata};
 use crate::inputs::Input;
 use crate::observers::MapObserver;
+use crate::AflError;
 
 pub trait Feedback<I>
 where

afl/src/generators/mod.rs

@@ -2,10 +2,10 @@ use alloc::vec::Vec;
 use core::cmp::min;
 use core::marker::PhantomData;
 
-use crate::AflError;
 use crate::inputs::bytes::BytesInput;
 use crate::inputs::Input;
 use crate::utils::Rand;
+use crate::AflError;
 
 pub trait Generator<I, R>
 where

afl/src/inputs/bytes.rs

@@ -4,8 +4,8 @@ use alloc::vec::Vec;
 use core::cell::RefCell;
 use core::convert::From;
 
-use crate::AflError;
 use crate::inputs::{HasBytesVec, HasTargetBytes, Input};
+use crate::AflError;
 
 /// A bytes input is the basic input
 #[derive(Clone, Debug, Default)]
@@ -68,7 +68,7 @@ impl BytesInput {
 
 #[cfg(test)]
 mod tests {
-    use crate::utils::{next_pow2, StdRand, Rand};
+    use crate::utils::{next_pow2, Rand, StdRand};
 
     #[test]
     fn test_input() {

afl/src/mutators/mod.rs

@@ -7,11 +7,11 @@ pub use scheduled::StdScheduledMutator;
 use alloc::rc::Rc;
 use core::cell::RefCell;
 
-use crate::AflError;
 use crate::corpus::Corpus;
 use crate::corpus::Testcase;
 use crate::inputs::Input;
 use crate::utils::Rand;
+use crate::AflError;
 
 pub trait Mutator<C, I, R>
 where

afl/src/mutators/scheduled.rs

@@ -1,11 +1,11 @@
 use alloc::vec::Vec;
 use core::marker::PhantomData;
 
-use crate::AflError;
 use crate::inputs::{HasBytesVec, Input};
 use crate::mutators::Corpus;
 use crate::mutators::Mutator;
 use crate::utils::Rand;
+use crate::AflError;
 
 pub enum MutationResult {
     Mutated,

afl/src/stages/mod.rs

@@ -4,7 +4,6 @@ pub use mutational::StdMutationalStage;
 use alloc::rc::Rc;
 use core::cell::RefCell;
 
-use crate::AflError;
 use crate::corpus::testcase::Testcase;
 use crate::corpus::Corpus;
 use crate::engines::State;
@@ -12,6 +11,7 @@ use crate::events::EventManager;
 use crate::executors::Executor;
 use crate::inputs::Input;
 use crate::utils::Rand;
+use crate::AflError;
 
 pub trait Stage<S, EM, E, C, I, R>
 where