Address clippy issues (#409)

This commit is contained in:
bmc-msft
2021-01-05 10:41:46 -05:00
committed by GitHub
parent 37f06bb324
commit 7e56efa6a8
22 changed files with 52 additions and 54 deletions

View File

@ -53,8 +53,8 @@ fn main() -> Result<(), Box<dyn Error>> {
let sha = run_cmd(&["git", "rev-parse", "HEAD"])?;
let hardcode_version = env::var("ONEFUZZ_SET_VERSION");
if hardcode_version.is_ok() {
print_values(hardcode_version.unwrap().as_ref(), &sha);
if let Ok(hardcode_version) = &hardcode_version {
print_values(hardcode_version, &sha);
return Ok(());
}

View File

@ -57,7 +57,7 @@ pub fn run(args: &clap::ArgMatches) -> Result<()> {
let mut rt = Runtime::new()?;
rt.block_on(merge_inputs(
config.clone(),
vec![config.clone().inputs[0].path.clone()],
vec![config.inputs[0].path.clone()],
))?;
Ok(())

View File

@ -129,7 +129,7 @@ async fn generate_input(
async fn start_fuzzing<'a>(
config: &GeneratorConfig,
corpus_dirs: Vec<impl AsRef<Path>>,
tester: Tester<'a>,
tester: Tester<'_>,
heartbeat_client: Option<TaskHeartbeatClient>,
) -> Result<()> {
let generator_tmp = "generator_tmp";

View File

@ -270,7 +270,7 @@ mod tests {
runtime_dir,
PathBuf::from(afl_fuzz_exe),
PathBuf::from(afl_test_binary),
fault_dir.clone(),
fault_dir,
corpus_dir,
&target_options,
&supervisor_options,

View File

@ -122,8 +122,10 @@ async fn test_ready_poll() {
let msg: Msg = 0;
let mut queue = TestQueue::default();
queue.pending = vec![msg];
let mut queue = TestQueue {
pending: vec![msg],
..Default::default()
};
task.trigger(Event::Poll(&mut queue)).await.unwrap();
@ -140,8 +142,9 @@ async fn test_polled_some_parse() {
task.set_state(State::Polled(Some(msg)));
let mut parser = TestParser::default();
parser.urls = vec![url.clone()]; // at index `msg`
let mut parser = TestParser {
urls: vec![url.clone()], // at index `msg`
};
task.trigger(Event::Parse(&mut parser)).await.unwrap();
@ -155,7 +158,6 @@ async fn test_polled_none_parse() {
task.set_state(State::Polled(None));
let mut parser = TestParser::default();
parser.urls = vec![];
task.trigger(Event::Parse(&mut parser)).await.unwrap();

View File

@ -124,7 +124,7 @@ async fn try_delete_blob(input_url: Url) -> Result<()> {
.await
{
Ok(_) => Ok(()),
Err(err) => Err(err.into()),
Err(err) => Err(err),
}
}

View File

@ -176,6 +176,6 @@ async fn try_delete_blob(input_url: Url) -> Result<()> {
.await
{
Ok(_) => Ok(()),
Err(err) => Err(err.into()),
Err(err) => Err(err),
}
}

View File

@ -153,7 +153,7 @@ impl CrashReport {
call_stack: asan_log.call_stack().to_vec(),
call_stack_sha256: asan_log.call_stack_sha256(),
asan_log: Some(asan_log.text().to_string()),
scariness_score: asan_log.scariness_score().into(),
scariness_score: asan_log.scariness_score(),
scariness_description: asan_log.scariness_description().to_owned(),
task_id,
job_id,