Skip to content

Commit

Permalink
use "bootstrap" instead of "rustbuild"
Browse files Browse the repository at this point in the history
Let's stick with the single name "bootstrap" to refer to the bootstrap project to avoid confusion.

Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
onur-ozkan committed Jul 6, 2024
1 parent 6d68563 commit bf5df31
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/build_context/target_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down
6 changes: 3 additions & 3 deletions src/cargo/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand All @@ -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:
Expand Down

0 comments on commit bf5df31

Please sign in to comment.