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

Fix CommandExecutor type params (#1222)

Browse Source
This commit is contained in:
Dongjia "toka" Zhang 2023-04-20 16:34:41 +02:00 committed by GitHub
parent fc23782dc3
commit e2f4e83890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libafl/src/executors/command.rs
View File

@ -151,15 +151,15 @@ impl CommandConfigurator for StdCommandConfigurator {
/// A `CommandExecutor` is a wrapper around [`std::process::Command`] to execute a target as a child process. /// A `CommandExecutor` is a wrapper around [`std::process::Command`] to execute a target as a child process.
/// Construct a `CommandExecutor` by implementing [`CommandConfigurator`] for a type of your choice and calling [`CommandConfigurator::into_executor`] on it. /// Construct a `CommandExecutor` by implementing [`CommandConfigurator`] for a type of your choice and calling [`CommandConfigurator::into_executor`] on it.
/// Instead, you can use [`CommandExecutor::builder()`] to construct a [`CommandExecutor`] backed by a [`StdCommandConfigurator`]. /// Instead, you can use [`CommandExecutor::builder()`] to construct a [`CommandExecutor`] backed by a [`StdCommandConfigurator`].
pub struct CommandExecutor<EM, OT, S, T, Z> { pub struct CommandExecutor<OT, S, T> {
/// The wrapped command configurer /// The wrapped command configurer
configurer: T, configurer: T,
/// The observers used by this executor /// The observers used by this executor
observers: OT, observers: OT,
phantom: PhantomData<(EM, S, Z)>, phantom: PhantomData<S>,
} }
impl CommandExecutor<(), (), (), (), ()> { impl CommandExecutor<(), (), ()> {
/// Creates a builder for a new [`CommandExecutor`], /// Creates a builder for a new [`CommandExecutor`],
/// backed by a [`StdCommandConfigurator`] /// backed by a [`StdCommandConfigurator`]
/// This is usually the easiest way to construct a [`CommandExecutor`]. /// This is usually the easiest way to construct a [`CommandExecutor`].
@ -178,7 +178,7 @@ impl CommandExecutor<(), (), (), (), ()> {
} }
} }
impl<EM, OT, S, T, Z> Debug for CommandExecutor<EM, OT, S, T, Z> impl<OT, S, T> Debug for CommandExecutor<OT, S, T>
where where
T: Debug, T: Debug,
OT: Debug, OT: Debug,
@ -191,7 +191,7 @@ where
} }
} }
impl<EM, OT, S, T, Z> CommandExecutor<EM, OT, S, T, Z> impl<OT, S, T> CommandExecutor<OT, S, T>
where where
T: Debug, T: Debug,
OT: Debug, OT: Debug,
@ -202,7 +202,7 @@ where
} }
} }
impl<EM, OT, S, Z> CommandExecutor<EM, OT, S, StdCommandConfigurator, Z> impl<OT, S> CommandExecutor<OT, S, StdCommandConfigurator>
where where
OT: MatchName + Debug + ObserversTuple<S>, OT: MatchName + Debug + ObserversTuple<S>,
S: UsesInput, S: UsesInput,
@ -293,7 +293,7 @@ where
// this only works on unix because of the reliance on checking the process signal for detecting OOM // this only works on unix because of the reliance on checking the process signal for detecting OOM
#[cfg(all(feature = "std", unix))] #[cfg(all(feature = "std", unix))]
impl<EM, OT, S, T, Z> Executor<EM, Z> for CommandExecutor<EM, OT, S, T, Z> impl<EM, OT, S, T, Z> Executor<EM, Z> for CommandExecutor<OT, S, T>
where where
EM: UsesState<State = S>, EM: UsesState<State = S>,
S: UsesInput, S: UsesInput,
@ -357,14 +357,14 @@ where
} }
} }
impl<EM, OT, S, T, Z> UsesState for CommandExecutor<EM, OT, S, T, Z> impl<OT, S, T> UsesState for CommandExecutor<OT, S, T>
where where
S: UsesInput, S: UsesInput,
{ {
type State = S; type State = S;
} }
impl<EM, OT, S, T, Z> UsesObservers for CommandExecutor<EM, OT, S, T, Z> impl<OT, S, T> UsesObservers for CommandExecutor<OT, S, T>
where where
OT: ObserversTuple<S>, OT: ObserversTuple<S>,
S: UsesInput, S: UsesInput,
@ -372,7 +372,7 @@ where
type Observers = OT; type Observers = OT;
} }
impl<EM, OT, S, T, Z> HasObservers for CommandExecutor<EM, OT, S, T, Z> impl<OT, S, T> HasObservers for CommandExecutor<OT, S, T>
where where
S: UsesInput, S: UsesInput,
T: Debug, T: Debug,
@ -527,10 +527,10 @@ impl CommandExecutorBuilder {
} }
/// Builds the `CommandExecutor` /// Builds the `CommandExecutor`
pub fn build<EM, OT, S, Z>( pub fn build<OT, S>(
&self, &self,
observers: OT, observers: OT,
) -> Result<CommandExecutor<EM, OT, S, StdCommandConfigurator, Z>, Error> ) -> Result<CommandExecutor<OT, S, StdCommandConfigurator>, Error>
where where
OT: Debug + MatchName + ObserversTuple<S>, OT: Debug + MatchName + ObserversTuple<S>,
S: UsesInput, S: UsesInput,
@ -578,7 +578,7 @@ impl CommandExecutorBuilder {
input_location: self.input_location.clone(), input_location: self.input_location.clone(),
command, command,
}; };
Ok(configurator.into_executor::<EM, OT, S, Z>(observers)) Ok(configurator.into_executor::<OT, S>(observers))
} }
} }
@ -628,7 +628,7 @@ pub trait CommandConfigurator: Sized + Debug {
I: Input + HasTargetBytes; I: Input + HasTargetBytes;
/// Create an `Executor` from this `CommandConfigurator`. /// Create an `Executor` from this `CommandConfigurator`.
fn into_executor<EM, OT, S, Z>(self, observers: OT) -> CommandExecutor<EM, OT, S, Self, Z> fn into_executor<OT, S>(self, observers: OT) -> CommandExecutor<OT, S, Self>
where where
OT: Debug + MatchName, OT: Debug + MatchName,
{ {