Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-09-20 22:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run rustfmt on batches of multiple files

Browse source
This commit is contained in:
Alex Macleod 2021-11-12 16:41:08 +00:00
parent 608c9e8584
commit 507030f7c4
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
clippy_dev/src/fmt.rs
View file

@ -1,6 +1,7 @@
use crate::clippy_project_root; use crate::clippy_project_root;
use itertools::Itertools;
use shell_escape::escape; use shell_escape::escape;
use std::ffi::OsStr; use std::ffi::{OsStr, OsString};
use std::path::Path; use std::path::Path;
use std::process::{self, Command}; use std::process::{self, Command};
use std::{fs, io}; use std::{fs, io};
@ -56,15 +57,22 @@ pub fn run(check: bool, verbose: bool) {
success &= cargo_fmt(context, &project_root.join("rustc_tools_util"))?; success &= cargo_fmt(context, &project_root.join("rustc_tools_util"))?;
success &= cargo_fmt(context, &project_root.join("lintcheck"))?; success &= cargo_fmt(context, &project_root.join("lintcheck"))?;
for entry in WalkDir::new(project_root.join("tests")) { let chunks = WalkDir::new(project_root.join("tests"))
let entry = entry?; .into_iter()
.filter_map(|entry| {
let entry = entry.expect("failed to find tests");
let path = entry.path(); let path = entry.path();
if path.extension() != Some("rs".as_ref()) || entry.file_name() == "ice-3891.rs" { if path.extension() != Some("rs".as_ref()) || entry.file_name() == "ice-3891.rs" {
continue; None
} else {
Some(entry.into_path().into_os_string())
} }
})
.chunks(250);
success &= rustfmt(context, path)?; for chunk in &chunks {
success &= rustfmt(context, chunk)?;
} }
Ok(success) Ok(success)
@ -185,14 +193,14 @@ fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> {
} }
} }
fn rustfmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> { fn rustfmt(context: &FmtContext, paths: impl Iterator<Item = OsString>) -> Result<bool, CliError> {
let mut args = vec![path.as_os_str()]; let mut args = Vec::new();
if context.check { if context.check {
args.push("--check".as_ref()); args.push(OsString::from("--check"));
} }
args.extend(paths);
let success = exec(context, "rustfmt", std::env::current_dir()?, &args)?; let success = exec(context, "rustfmt", std::env::current_dir()?, &args)?;
if !success {
eprintln!("rustfmt failed on {}", path.display());
}
Ok(success) Ok(success)
} }