numtide/treefmt
1
1
Fork 0
mirror of https://github.com/numtide/treefmt.git synced 2024-09-11 17:07:44 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add Result when collecting formatter result

Browse Source
This commit is contained in:
Andika Demas Riyandi 2021-04-07 18:41:03 +07:00
parent 73f5f250b2
commit c3512d12b6
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/engine.rs
View File

@ -177,7 +177,7 @@ pub fn run_treefmt(
// Don't run the formatter if there are no paths to format!
if paths.is_empty() {
(formatter_name.clone(), path_mtime.clone())
Ok((formatter_name.clone(), path_mtime.clone()))
} else {
let start_time = Instant::now();
@ -187,18 +187,17 @@ pub fn run_treefmt(
if !out.status.success() {
match out.status.code() {
Some(scode) => {
error!(
return Err(anyhow!(
"{}'s formatter failed: exit status {}",
&formatter, scode
);
return (formatter_name.clone(), path_mtime.clone());
&formatter,
scode
));
}
None => {
error!(
return Err(anyhow!(
"{}'s formatter failed: unknown formatter error",
&formatter
);
return (formatter_name.clone(), path_mtime.clone());
));
}
}
}
@ -218,18 +217,18 @@ pub fn run_treefmt(
sum
});
// Return the new mtimes
(formatter_name.clone(), new_paths)
Ok((formatter_name.clone(), new_paths))
}
Err(err) => {
// FIXME: What is the right behaviour if a formatter has failed running?
error!("{} failed: {}", &formatter, err);
// error!("{} failed: {}", &formatter, err);
// Assume the paths were not formatted
(formatter_name.clone(), path_mtime.clone())
return Err(anyhow!("{} failed: {}", &formatter, err));
}
}
}
})
.collect::<BTreeMap<FormatterName, BTreeMap<PathBuf, Mtime>>>();
.collect::<Result<BTreeMap<FormatterName, BTreeMap<PathBuf, Mtime>>, _>>()?;
timed_debug("format");
// Record the new matches in the cache