SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Order differential generics alphabetically (#2044)

Browse Source
This commit is contained in:
Dominik Maier 2024-04-12 12:14:49 +02:00 committed by GitHub
parent 631b1746e2
commit 0f778b5892
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libafl/src/executors/differential.rs
View File

@ -17,13 +17,13 @@ use crate::{
/// A [`DiffExecutor`] wraps a primary executor, forwarding its methods, and a secondary one /// A [`DiffExecutor`] wraps a primary executor, forwarding its methods, and a secondary one
#[derive(Debug)] #[derive(Debug)]
pub struct DiffExecutor<A, B, OTA, OTB, DOT> { pub struct DiffExecutor<A, B, DOT, OTA, OTB> {
primary: A, primary: A,
secondary: B, secondary: B,
observers: UnsafeCell<ProxyObserversTuple<OTA, OTB, DOT>>, observers: UnsafeCell<ProxyObserversTuple<OTA, OTB, DOT>>,
} }
impl<A, B, OTA, OTB, DOT> DiffExecutor<A, B, OTA, OTB, DOT> { impl<A, B, DOT, OTA, OTB> DiffExecutor<A, B, DOT, OTA, OTB> {
/// Create a new `DiffExecutor`, wrapping the given `executor`s. /// Create a new `DiffExecutor`, wrapping the given `executor`s.
pub fn new(primary: A, secondary: B, observers: DOT) -> Self pub fn new(primary: A, secondary: B, observers: DOT) -> Self
where where
@ -55,7 +55,7 @@ impl<A, B, OTA, OTB, DOT> DiffExecutor<A, B, OTA, OTB, DOT> {
} }
} }
impl<A, B, EM, DOT, Z> Executor<EM, Z> for DiffExecutor<A, B, A::Observers, B::Observers, DOT> impl<A, B, DOT, EM, Z> Executor<EM, Z> for DiffExecutor<A, B, DOT, A::Observers, B::Observers>
where where
A: Executor<EM, Z> + HasObservers, A: Executor<EM, Z> + HasObservers,
B: Executor<EM, Z, State = A::State> + HasObservers, B: Executor<EM, Z, State = A::State> + HasObservers,
@ -210,7 +210,7 @@ impl<A, B, DOT> ProxyObserversTuple<A, B, DOT> {
} }
} }
impl<A, B, OTA, OTB, DOT> UsesObservers for DiffExecutor<A, B, OTA, OTB, DOT> impl<A, B, DOT, OTA, OTB> UsesObservers for DiffExecutor<A, B, DOT, OTA, OTB>
where where
A: HasObservers<Observers = OTA>, A: HasObservers<Observers = OTA>,
B: HasObservers<Observers = OTB, State = A::State>, B: HasObservers<Observers = OTB, State = A::State>,
@ -221,7 +221,7 @@ where
type Observers = ProxyObserversTuple<OTA, OTB, DOT>; type Observers = ProxyObserversTuple<OTA, OTB, DOT>;
} }
impl<A, B, OTA, OTB, DOT> UsesState for DiffExecutor<A, B, OTA, OTB, DOT> impl<A, B, DOT, OTA, OTB> UsesState for DiffExecutor<A, B, DOT, OTA, OTB>
where where
A: UsesState, A: UsesState,
B: UsesState<State = A::State>, B: UsesState<State = A::State>,
@ -229,7 +229,7 @@ where
type State = A::State; type State = A::State;
} }
impl<A, B, OTA, OTB, DOT> HasObservers for DiffExecutor<A, B, OTA, OTB, DOT> impl<A, B, DOT, OTA, OTB> HasObservers for DiffExecutor<A, B, DOT, OTA, OTB>
where where
A: HasObservers<Observers = OTA>, A: HasObservers<Observers = OTA>,
B: HasObservers<Observers = OTB, State = A::State>, B: HasObservers<Observers = OTB, State = A::State>,