Skip to content

Commit

Permalink
Auto merge of #9026 - kassens:master, r=Eh2406
Browse files Browse the repository at this point in the history
Clarify fingerprint log messages

I had to look up the source to figure out which side was the old value for a RUSTFLAGS fingerprint mismatch.

Making the logs a bit more explicit about which value is old and new would've helped me.
  • Loading branch information
bors committed Dec 29, 2020
2 parents 134f614 + 4538ade commit cf8800a
Showing 1 changed file with 25 additions and 13 deletions.
38 changes: 25 additions & 13 deletions src/cargo/core/compiler/fingerprint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -817,9 +817,9 @@ impl Fingerprint {
}
if self.features != old.features {
bail!(
"features have changed: {} != {}",
self.features,
old.features
"features have changed: previously {}, now {}",
old.features,
self.features
)
}
if self.target != old.target {
Expand All @@ -833,9 +833,9 @@ impl Fingerprint {
}
if self.rustflags != old.rustflags {
bail!(
"RUSTFLAGS has changed: {:?} != {:?}",
self.rustflags,
old.rustflags
"RUSTFLAGS has changed: previously {:?}, now {:?}",
old.rustflags,
self.rustflags
)
}
if self.metadata != old.metadata {
Expand All @@ -853,15 +853,23 @@ impl Fingerprint {
match (new, old) {
(LocalFingerprint::Precalculated(a), LocalFingerprint::Precalculated(b)) => {
if a != b {
bail!("precalculated components have changed: {} != {}", a, b)
bail!(
"precalculated components have changed: previously {}, now {}",
b,
a
)
}
}
(
LocalFingerprint::CheckDepInfo { dep_info: adep },
LocalFingerprint::CheckDepInfo { dep_info: bdep },
) => {
if adep != bdep {
bail!("dep info output changed: {:?} != {:?}", adep, bdep)
bail!(
"dep info output changed: previously {:?}, now {:?}",
bdep,
adep
)
}
}
(
Expand All @@ -875,13 +883,17 @@ impl Fingerprint {
},
) => {
if aout != bout {
bail!("rerun-if-changed output changed: {:?} != {:?}", aout, bout)
bail!(
"rerun-if-changed output changed: previously {:?}, now {:?}",
bout,
aout
)
}
if apaths != bpaths {
bail!(
"rerun-if-changed output changed: {:?} != {:?}",
apaths,
"rerun-if-changed output changed: previously {:?}, now {:?}",
bpaths,
apaths,
)
}
}
Expand All @@ -896,11 +908,11 @@ impl Fingerprint {
},
) => {
if *akey != *bkey {
bail!("env vars changed: {} != {}", akey, bkey);
bail!("env vars changed: previously {}, now {}", bkey, akey);
}
if *avalue != *bvalue {
bail!(
"env var `{}` changed: previously {:?} now {:?}",
"env var `{}` changed: previously {:?}, now {:?}",
akey,
bvalue,
avalue
Expand Down

0 comments on commit cf8800a

Please sign in to comment.