Unrolled build for rust-lang#122026

rust-timer · web-flow · commit 708562bb57c8 · 2024-03-07T00:05:07.000-05:00
Rollup merge of rust-lang#122026 - clubby789:fmt-removed, r=onur-ozkan Do not try to format removed files If you removed a file, `x fmt` would confusingly print ``` formatting modified file path/to/file.rs ``` and pass it to the formatting logic. Filter out files with `D` (removed) status
diff --git a/src/bootstrap/src/core/build_steps/format.rs b/src/bootstrap/src/core/build_steps/format.rs
@@ -81,7 +81,7 @@ fn update_rustfmt_version(build: &Builder<'_>) {
 }
 
 /// Returns the Rust files modified between the `merge-base` of HEAD and
-/// rust-lang/master and what is now on the disk.
+/// rust-lang/master and what is now on the disk. Does not include removed files.
 ///
 /// Returns `None` if all files should be formatted.
 fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, String> {
diff --git a/src/tools/build_helper/src/git.rs b/src/tools/build_helper/src/git.rs
@@ -113,6 +113,7 @@ pub fn get_git_merge_base(
 
 /// Returns the files that have been modified in the current branch compared to the master branch.
 /// The `extensions` parameter can be used to filter the files by their extension.
+/// Does not include removed files.
 /// If `extensions` is empty, all files will be returned.
 pub fn get_git_modified_files(
     config: &GitConfig<'_>,
@@ -125,13 +126,19 @@ pub fn get_git_modified_files(
     if let Some(git_dir) = git_dir {
         git.current_dir(git_dir);
     }
-    let files = output_result(git.args(["diff-index", "--name-only", merge_base.trim()]))?
+    let files = output_result(git.args(["diff-index", "--name-status", merge_base.trim()]))?
         .lines()
-        .map(|s| s.trim().to_owned())
-        .filter(|f| {
-            Path::new(f).extension().map_or(false, |ext| {
+        .filter_map(|f| {
+            let (status, name) = f.trim().split_once(char::is_whitespace).unwrap();
+            if status == "D" {
+                None
+            } else if Path::new(name).extension().map_or(false, |ext| {
                 extensions.is_empty() || extensions.contains(&ext.to_str().unwrap())
-            })
+            }) {
+                Some(name.to_owned())
+            } else {
+                None
+            }
         })
         .collect();
     Ok(Some(files))

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ fn update_rustfmt_version(build: &Builder<'_>) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	/// Returns the Rust files modified between the `merge-base` of HEAD and
`84`		`-/// rust-lang/master and what is now on the disk.`
	`84`	`+/// rust-lang/master and what is now on the disk. Does not include removed files.`
`85`	`85`	`///`
`86`	`86`	/// Returns `None` if all files should be formatted.
`87`	`87`	`fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, String> {`