bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #111345 - jyn514:cfg-release-caching, r=cjgillot,est31

Browse source 
Only depend on CFG_VERSION in rustc_interface

This avoids having to rebuild the whole compiler on each commit when `omit-git-hash = false`.

cc https://github.com/rust-lang/rust/issues/76720 - this won't fix it, and I'm not suggesting we turn this on by default, but it will make it less painful for people who do have `omit-git-hash` on as a workaround.
This commit is contained in:
bors 2023-05-18 21:45:02 +00:00
commit c9dc55d05c
24 changed files with 97 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_span/src/def_id.rs
View file

@ -146,7 +146,12 @@ pub struct StableCrateId(pub(crate) Hash64);
impl StableCrateId {
/// Computes the stable ID for a crate with the given name and
/// `-Cmetadata` arguments.
pub fn new(crate_name: Symbol, is_exe: bool, mut metadata: Vec<String>) -> StableCrateId {
pub fn new(
crate_name: Symbol,
is_exe: bool,
mut metadata: Vec<String>,
cfg_version: &'static str,
) -> StableCrateId {
let mut hasher = StableHasher::new();
// We must hash the string text of the crate name, not the id, as the id is not stable
// across builds.
@ -180,7 +185,7 @@ impl StableCrateId {
if let Some(val) = std::env::var_os("RUSTC_FORCE_RUSTC_VERSION") {
hasher.write(val.to_string_lossy().into_owned().as_bytes())
} else {
hasher.write(option_env!("CFG_VERSION").unwrap_or("unknown version").as_bytes());
hasher.write(cfg_version.as_bytes())
}
StableCrateId(hasher.finish())