?

Author: tokatoka

libafl/src/stages/concolic.rs

@@ -10,11 +10,13 @@ use core::marker::PhantomData;
 use super::{Stage, TracingStage};
 #[cfg(feature = "introspection")]
 use crate::state::HasClientPerfMonitor;
+#[cfg(feature = "concolic_mutation")]
+use crate::state::State;
 use crate::{
     corpus::{Corpus, CorpusId},
     executors::{Executor, HasObservers},
     observers::concolic::ConcolicObserver,
-    state::{HasCorpus, HasExecutions, HasMetadata, State},
+    state::{HasCorpus, HasExecutions, HasMetadata},
     Error,
 };
 

libafl_libfuzzer/libafl_libfuzzer_runtime/src/feedbacks.rs

@@ -7,9 +7,9 @@ use libafl::{
     events::EventFirer,
     executors::ExitKind,
     feedbacks::{Feedback, MinMapFeedback},
-    inputs::{BytesInput, Input, UsesInput},
+    inputs::Input,
     observers::ObserversTuple,
-    state::{HasClientPerfMonitor, HasMetadata},
+    state::{HasMetadata, State},
     Error,
 };
 use libafl_bolts::{impl_serdeany, Named};
@@ -43,7 +43,7 @@ impl Named for LibfuzzerKeepFeedback {
 
 impl<S> Feedback<S> for LibfuzzerKeepFeedback
 where
-    S: UsesInput + HasClientPerfMonitor,
+    S: State,
 {
     fn is_interesting<EM, OT>(
         &mut self,
@@ -113,7 +113,7 @@ impl LibfuzzerCrashCauseFeedback {
 
 impl<S> Feedback<S> for LibfuzzerCrashCauseFeedback
 where
-    S: UsesInput<Input = BytesInput> + HasClientPerfMonitor,
+    S: State,
 {
     fn is_interesting<EM, OT>(
         &mut self,

libafl_libfuzzer/libafl_libfuzzer_runtime/src/fuzz.rs

@@ -23,7 +23,7 @@ use libafl::{
     },
     stages::StagesTuple,
     state::{
-        HasClientPerfMonitor, HasExecutions, HasLastReportTime, HasMetadata, HasSolutions,
+        HasExecutions, HasLastReportTime, HasMetadata, HasSolutions,
         UsesState,
     },
     Error, Fuzzer,
@@ -70,8 +70,7 @@ fn do_fuzz<F, ST, E, S, EM>(
 ) -> Result<(), Error>
 where
     F: Fuzzer<E, EM, ST, State = S>,
-    S: HasClientPerfMonitor
-        + HasMetadata
+    S: HasMetadata
         + HasExecutions
         + UsesInput
         + HasSolutions

libafl_libfuzzer/libafl_libfuzzer_runtime/src/report.rs

@@ -8,7 +8,7 @@ use libafl::{
     monitors::SimpleMonitor,
     stages::StagesTuple,
     state::{
-        HasClientPerfMonitor, HasExecutions, HasLastReportTime, HasMetadata, HasNamedMetadata,
+        HasExecutions, HasLastReportTime, HasMetadata, HasNamedMetadata,
     },
     Error, Fuzzer,
 };
@@ -26,8 +26,7 @@ fn do_report<F, ST, E, S, EM>(
 ) -> Result<(), Error>
 where
     F: Fuzzer<E, EM, ST, State = S>,
-    S: HasClientPerfMonitor
-        + HasMetadata
+    S: HasMetadata
         + HasNamedMetadata
         + HasExecutions
         + UsesInput

libafl_libfuzzer/libafl_libfuzzer_runtime/src/schedulers.rs

@@ -8,7 +8,7 @@ use libafl::{
     feedbacks::MapNoveltiesMetadata,
     inputs::UsesInput,
     schedulers::{RemovableScheduler, Scheduler},
-    state::{HasCorpus, HasMetadata, UsesState},
+    state::{HasCorpus, HasMetadata, UsesState, State},
     Error,
 };
 
@@ -21,14 +21,14 @@ pub struct MergeScheduler<S> {
 
 impl<S> UsesState for MergeScheduler<S>
 where
-    S: UsesInput,
+    S: State,
 {
     type State = S;
 }
 
 impl<S> RemovableScheduler for MergeScheduler<S>
 where
-    S: UsesInput + HasCorpus,
+    S: State + HasCorpus,
 {
     fn on_remove(
         &mut self,
@@ -43,7 +43,7 @@ where
 
 impl<S> Scheduler for MergeScheduler<S>
 where
-    S: UsesInput + HasCorpus,
+    S: State + HasCorpus,
 {
     fn on_add(&mut self, state: &mut Self::State, idx: CorpusId) -> Result<(), Error> {
         self.all.insert(idx);