Auto merge of #14207 - onur-ozkan:use-bootstrap-instead-of-rustbuild, r=weihanglo

bors · bors · commit 036da81628dc · 2024-07-06T21:46:33.000Z
use "bootstrap" instead of "rustbuild" Let's stick with the single name "bootstrap" to refer to the bootstrap project to avoid confusion. cc rust-lang/rust#127434
diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs
@@ -1089,7 +1089,7 @@ impl RustDocFingerprint {
         let Ok(rustdoc_data) = paths::read(&fingerprint_path) else {
             // If the fingerprint does not exist, do not clear out the doc
             // directories. Otherwise this ran into problems where projects
-            // like rustbuild were creating the doc directory before running
+            // like bootstrap were creating the doc directory before running
             // `cargo doc` in a way that deleting it would break it.
             return write_fingerprint();
         };
diff --git a/src/cargo/version.rs b/src/cargo/version.rs
@@ -15,7 +15,7 @@ pub struct VersionInfo {
     pub version: String,
     /// The release channel we were built for (stable/beta/nightly/dev).
     ///
-    /// `None` if not built via rustbuild.
+    /// `None` if not built via bootstrap.
     pub release_channel: Option<String>,
     /// Information about the Git repository we may have been built from.
     ///
@@ -42,9 +42,9 @@ pub fn version() -> VersionInfo {
         };
     }
 
-    // This is the version set in rustbuild, which we use to match rustc.
+    // This is the version set in bootstrap, which we use to match rustc.
     let version = option_env_str!("CFG_RELEASE").unwrap_or_else(|| {
-        // If cargo is not being built by rustbuild, then we just use the
+        // If cargo is not being built by bootstrap, then we just use the
         // version from cargo's own `Cargo.toml`.
         //
         // There are two versions at play here:
