nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-03 20:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that we run rustfmt against every edition

Browse Source
This commit is contained in:
topecongiro 2019-03-25 07:54:31 +09:00
parent 288d7db5a9
commit 5f1f5aac05
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cargo-fmt/main.rs
View File

@ -311,8 +311,7 @@ fn run_rustfmt(
fmt_args: &[String],
verbosity: Verbosity,
) -> Result<i32, io::Error> {
let default_edition = String::from("2015");
let mut by_edition = targets
let by_edition = targets
.iter()
.inspect(|t| {
if verbosity == Verbosity::Verbose {
@ -324,10 +323,8 @@ fn run_rustfmt(
h.entry(t.0).or_insert_with(Vec::new).push(t.1);
h
});
if by_edition.is_empty() {
by_edition.insert(&default_edition, Vec::new());
}
let mut status = vec![];
for (edition, files) in by_edition {
let stdout = if verbosity == Verbosity::Quiet {
std::process::Stdio::null()
@ -357,13 +354,14 @@ fn run_rustfmt(
_ => e,
})?;
let status = command.wait()?;
if !status.success() {
return Ok(status.code().unwrap_or(FAILURE));
}
status.push(command.wait()?);
}
Ok(SUCCESS)
Ok(status
.iter()
.filter_map(|s| if s.success() { None } else { s.code() })
.next()
.unwrap_or(SUCCESS))
}
fn get_cargo_metadata(manifest_path: Option<&Path>) -> Result<cargo_metadata::Metadata, io::Error> {