From 8d0dd8bbf37b5e68dd448ea00f61c01bedca135c Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sun, 7 Jul 2024 00:23:08 +0300 Subject: [PATCH] use "bootstrap" instead of "rustbuild" Let's stick with the single name "bootstrap" to refer to the bootstrap project to avoid confusion. Signed-off-by: onur-ozkan --- .../src/cargo/core/compiler/build_context/target_info.rs | 2 +- .../cargo-0.60.0/src/cargo/core/compiler/fingerprint.rs | 2 +- .../compile-benchmarks/cargo-0.60.0/src/cargo/version.rs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/build_context/target_info.rs b/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/build_context/target_info.rs index 505910d5f..3fd8a49a2 100644 --- a/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/build_context/target_info.rs +++ b/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/build_context/target_info.rs @@ -866,7 +866,7 @@ impl RustDocFingerprint { Ok(rustdoc_data) => rustdoc_data, // 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. Err(_) => return write_fingerprint(), }; diff --git a/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/fingerprint.rs b/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/fingerprint.rs index e3aaf9c76..c21c2b6b4 100644 --- a/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/fingerprint.rs +++ b/collector/compile-benchmarks/cargo-0.60.0/src/cargo/core/compiler/fingerprint.rs @@ -80,7 +80,7 @@ //! //! [^3]: See below for details on mtime tracking. //! -//! [^4]: `__CARGO_DEFAULT_LIB_METADATA` is set by rustbuild to embed the +//! [^4]: `__CARGO_DEFAULT_LIB_METADATA` is set by bootstrap to embed the //! release channel (bootstrap/stable/beta/nightly) in libstd. //! //! [^5]: Config settings that are not otherwise captured anywhere else. diff --git a/collector/compile-benchmarks/cargo-0.60.0/src/cargo/version.rs b/collector/compile-benchmarks/cargo-0.60.0/src/cargo/version.rs index 6dbb9d1c1..24f30d7ba 100644 --- a/collector/compile-benchmarks/cargo-0.60.0/src/cargo/version.rs +++ b/collector/compile-benchmarks/cargo-0.60.0/src/cargo/version.rs @@ -9,7 +9,7 @@ pub struct CommitInfo { pub commit_date: String, } -/// Information provided by the outer build system (rustbuild aka bootstrap). +/// Information provided by the outer build system (bootstrap). pub struct CfgInfo { /// Information about the Git repository we may have been built from. pub commit_info: Option, @@ -22,7 +22,7 @@ pub struct VersionInfo { /// Cargo's version, such as "1.57.0", "1.58.0-beta.1", "1.59.0-nightly", etc. pub version: String, /// Information that's only available when we were built with - /// rustbuild, rather than Cargo itself. + /// bootstrap, rather than Cargo itself. pub cfg_info: Option, } @@ -47,9 +47,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: