Skip to content

Commit

Permalink
refactor: simplify collect start failure
Browse files Browse the repository at this point in the history
  • Loading branch information
Zxilly committed Jul 22, 2024
1 parent b0d3824 commit 5ad1fb9
Showing 1 changed file with 10 additions and 20 deletions.
30 changes: 10 additions & 20 deletions crates/typos-cli/src/bin/typos-cli/report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,28 +399,18 @@ impl Report for PrintSarif {
.column_kind(sarif::ResultColumnKind::UnicodeCodePoints.to_string())
.results(self.results.lock().unwrap().borrow().clone());


if self.error.lock().unwrap().borrow().len() > 0 {
let invocations: Vec<Result<Invocation, std::io::Error>> = self.error.lock().unwrap().borrow().iter().map(
|x| {
sarif::InvocationBuilder::default()
.process_start_failure_message(x.to_owned().clone())
.build().map_err(error_to_io_error)
}
).collect();

let error = invocations.iter().find(|x| x.is_err());
// if invocations contains any error, return error
if error.is_some() {
let error = error.unwrap().as_ref().unwrap_err();
return Err(std::io::Error::new(error.kind(), error.to_string()));
if !self.error.lock().unwrap().borrow().is_empty() {
let invocations = self.error.lock().unwrap().borrow().iter().map(|x| {
sarif::InvocationBuilder::default()
.process_start_failure_message(x.clone())
.build()
}).collect::<Result<Vec<_>, _>>();

if let Err(e) = invocations {
return Err(std::io::Error::new(std::io::ErrorKind::Other, e.to_string()));
}

let invocations: Vec<Invocation> = invocations.into_iter().map(|x| x.unwrap()).collect();

run_builder.invocations(
invocations
);
run_builder.invocations(invocations.unwrap());
}

let sarif = sarif_builder.build().map_err(error_to_io_error)?;
Expand Down

0 comments on commit 5ad1fb9

Please sign in to comment.