diff --git a/src/bootstrap/format.rs b/src/bootstrap/format.rs index b49322e3c028f..1d57c6ecbbb8d 100644 --- a/src/bootstrap/format.rs +++ b/src/bootstrap/format.rs @@ -74,11 +74,11 @@ fn update_rustfmt_version(build: &Builder<'_>) { t!(std::fs::write(stamp_file, version)) } -/// Returns the files modified between the `merge-base` of HEAD and +/// Returns the Rust files modified between the `merge-base` of HEAD and /// rust-lang/master and what is now on the disk. /// /// Returns `None` if all files should be formatted. -fn get_modified_files(build: &Builder<'_>) -> Option> { +fn get_modified_rs_files(build: &Builder<'_>) -> Option> { let Ok(remote) = get_rust_lang_rust_remote() else {return None;}; if !verify_rustfmt_version(build) { return None; @@ -95,6 +95,7 @@ fn get_modified_files(build: &Builder<'_>) -> Option> { ) .lines() .map(|s| s.trim().to_owned()) + .filter(|f| Path::new(f).extension().map_or(false, |ext| ext == "rs")) .collect(), ) } @@ -195,7 +196,7 @@ pub fn format(build: &Builder<'_>, check: bool, paths: &[PathBuf]) { ignore_fmt.add(&format!("!/{}", untracked_path)).expect(&untracked_path); } if !check && paths.is_empty() { - if let Some(files) = get_modified_files(build) { + if let Some(files) = get_modified_rs_files(build) { for file in files { println!("formatting modified file {file}"); ignore_fmt.add(&format!("/{file}")).expect(&file);