diff --git a/src/cargo/core/compiler/fingerprint/dirty_reason.rs b/src/cargo/core/compiler/fingerprint/dirty_reason.rs index cb6548a41a5..91d05a85198 100644 --- a/src/cargo/core/compiler/fingerprint/dirty_reason.rs +++ b/src/cargo/core/compiler/fingerprint/dirty_reason.rs @@ -68,10 +68,8 @@ pub enum DirtyReason { new: InternedString, }, UnitDependencyInfoChanged { - old_name: InternedString, + name: InternedString, old_fingerprint: u64, - - new_name: InternedString, new_fingerprint: u64, }, FsStatusOutdated(FsStatus), @@ -209,8 +207,8 @@ impl DirtyReason { unit, format_args!("name of dependency changed ({old} => {new})"), ), - DirtyReason::UnitDependencyInfoChanged { .. } => { - s.dirty_because(unit, "dependency info changed") + DirtyReason::UnitDependencyInfoChanged { name, .. } => { + s.dirty_because(unit, format_args!("dependency info changed ({name})")) } DirtyReason::FsStatusOutdated(status) => match status { FsStatus::Stale => s.dirty_because(unit, "stale, unknown reason"), diff --git a/src/cargo/core/compiler/fingerprint/mod.rs b/src/cargo/core/compiler/fingerprint/mod.rs index f22d4a9ed97..9a79a4c64a3 100644 --- a/src/cargo/core/compiler/fingerprint/mod.rs +++ b/src/cargo/core/compiler/fingerprint/mod.rs @@ -1046,9 +1046,8 @@ impl Fingerprint { if a.fingerprint.hash_u64() != b.fingerprint.hash_u64() { return DirtyReason::UnitDependencyInfoChanged { - new_name: a.name, + name: a.name, new_fingerprint: a.fingerprint.hash_u64(), - old_name: b.name, old_fingerprint: b.fingerprint.hash_u64(), }; } diff --git a/tests/testsuite/lto.rs b/tests/testsuite/lto.rs index c6958fc6fe8..7212fe66702 100644 --- a/tests/testsuite/lto.rs +++ b/tests/testsuite/lto.rs @@ -604,7 +604,7 @@ fn dylib() { [COMPILING] registry-shared v0.0.1 [FRESH] registry v0.0.1 [RUNNING] `rustc --crate-name registry_shared [..]-C embed-bitcode=no[..] -[DIRTY] bar v0.0.0 ([..]): dependency info changed +[DIRTY] bar v0.0.0 ([..]): dependency info changed (registry_shared) [COMPILING] bar [..] [RUNNING] `rustc --crate-name bar [..]--crate-type dylib [..]-C embed-bitcode=no[..] [FINISHED] [..] @@ -622,7 +622,7 @@ fn dylib() { [FRESH] registry-shared v0.0.1 [COMPILING] registry v0.0.1 [RUNNING] `rustc --crate-name registry [..] -[DIRTY] bar v0.0.0 ([..]): dependency info changed +[DIRTY] bar v0.0.0 ([..]): dependency info changed (registry_shared) [COMPILING] bar [..] [RUNNING] `rustc --crate-name bar [..]--crate-type dylib [..]-C embed-bitcode=no[..] [RUNNING] `rustc --crate-name bar [..]-C lto [..]--test[..]