From f130e50685d094f290610c505ec8c39e22f91c45 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Tue, 24 Nov 2020 12:51:27 +0100 Subject: [PATCH] code format --- afl/src/corpus/mod.rs | 2 +- afl/src/corpus/testcase.rs | 2 +- afl/src/executors/inmemory.rs | 2 +- afl/src/feedbacks/mod.rs | 4 ++-- afl/src/generators/mod.rs | 2 +- afl/src/inputs/bytes.rs | 4 ++-- afl/src/mutators/mod.rs | 2 +- afl/src/mutators/scheduled.rs | 2 +- afl/src/stages/mod.rs | 2 +- afl/src/stages/mutational.rs | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/afl/src/corpus/mod.rs b/afl/src/corpus/mod.rs index 4df65a9063..b8a33d55c4 100644 --- a/afl/src/corpus/mod.rs +++ b/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 where diff --git a/afl/src/corpus/testcase.rs b/afl/src/corpus/testcase.rs index 1af392952a..b2e518d7d8 100644 --- a/afl/src/corpus/testcase.rs +++ b/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")] diff --git a/afl/src/executors/inmemory.rs b/afl/src/executors/inmemory.rs index 36920a9169..4c60b37261 100644 --- a/afl/src/executors/inmemory.rs +++ b/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 = fn(&dyn Executor, &[u8]) -> ExitKind; diff --git a/afl/src/feedbacks/mod.rs b/afl/src/feedbacks/mod.rs index 943ae12629..2f11da8508 100644 --- a/afl/src/feedbacks/mod.rs +++ b/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 where diff --git a/afl/src/generators/mod.rs b/afl/src/generators/mod.rs index 02a976555f..1f1fefaa13 100644 --- a/afl/src/generators/mod.rs +++ b/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 where diff --git a/afl/src/inputs/bytes.rs b/afl/src/inputs/bytes.rs index f7c674a899..70847b0f8b 100644 --- a/afl/src/inputs/bytes.rs +++ b/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() { diff --git a/afl/src/mutators/mod.rs b/afl/src/mutators/mod.rs index 69298ad763..40dc42d6b5 100644 --- a/afl/src/mutators/mod.rs +++ b/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 where diff --git a/afl/src/mutators/scheduled.rs b/afl/src/mutators/scheduled.rs index 893a55a4c6..84c91c6279 100644 --- a/afl/src/mutators/scheduled.rs +++ b/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, diff --git a/afl/src/stages/mod.rs b/afl/src/stages/mod.rs index c0c011192f..17c8110a78 100644 --- a/afl/src/stages/mod.rs +++ b/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 where diff --git a/afl/src/stages/mutational.rs b/afl/src/stages/mutational.rs index c95d4cd18e..154d3beeda 100644 --- a/afl/src/stages/mutational.rs +++ b/afl/src/stages/mutational.rs @@ -2,7 +2,6 @@ use alloc::rc::Rc; use core::cell::RefCell; use core::marker::PhantomData; -use crate::{fire_event, AflError}; use crate::corpus::testcase::Testcase; use crate::engines::State; use crate::events::{EventManager, NewTestcaseEvent}; @@ -12,6 +11,7 @@ use crate::mutators::Mutator; use crate::stages::Corpus; use crate::stages::Stage; use crate::utils::Rand; +use crate::{fire_event, AflError}; // TODO multi mutators stage