Merge remote-tracking branch 'origin/unify' into unify

guliwa · guliwa · commit 32197a72dce9 · 2024-10-23T05:42:55.000Z
# Conflicts:
#	src/bootstrap/src/core/build_steps/tool.rs
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
@@ -596,8 +596,8 @@ impl Step for Rustdoc {
         {
             let files_to_track = &["src/librustdoc", "src/tools/rustdoc"];
 
+            // Check if unchanged
             if builder.config.last_modified_commit(files_to_track, "rustdoc", true).is_some() {
-                // if return Some(commit)，means unchanged
                 let precompiled_rustdoc = builder
                     .config
                     .ci_rustc_dir()

Original file line number	Diff line number	Diff line change
`@@ -596,8 +596,8 @@ impl Step for Rustdoc {`
`596`	`596`	`{`
`597`	`597`	`let files_to_track = &["src/librustdoc", "src/tools/rustdoc"];`
`598`	`598`
	`599`	`+ // Check if unchanged`
`599`	`600`	`if builder.config.last_modified_commit(files_to_track, "rustdoc", true).is_some() {`
`600`		`- // if return Some(commit)，means unchanged`
`601`	`601`	`let precompiled_rustdoc = builder`
`602`	`602`	`.config`
`603`	`603`	`.ci_rustc_dir()`