Add solana-crate-features workaround to avoid cargo feature thrashing (#5904)
automerge
This commit is contained in:
44
crate-features/0001-Print-package-features.patch
Normal file
44
crate-features/0001-Print-package-features.patch
Normal file
@ -0,0 +1,44 @@
|
||||
From 64514728f549719b8b42af1570404d5f51730e8c Mon Sep 17 00:00:00 2001
|
||||
From: Michael Vines <mvines@gmail.com>
|
||||
Date: Fri, 13 Sep 2019 17:34:43 -0700
|
||||
Subject: [PATCH] Print package features
|
||||
|
||||
---
|
||||
src/cargo/core/compiler/context/compilation_files.rs | 8 ++++++++
|
||||
src/cargo/core/compiler/fingerprint.rs | 2 +-
|
||||
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs
|
||||
index ed3232ea..c98da4ca 100644
|
||||
--- a/src/cargo/core/compiler/context/compilation_files.rs
|
||||
+++ b/src/cargo/core/compiler/context/compilation_files.rs
|
||||
@@ -591,5 +591,13 @@ fn compute_metadata<'a, 'cfg>(
|
||||
if let Ok(ref channel) = __cargo_default_lib_metadata {
|
||||
channel.hash(&mut hasher);
|
||||
}
|
||||
+
|
||||
+ eprintln!(
|
||||
+ "package {}: {} #{} features={:?}",
|
||||
+ unit.pkg.package_id(),
|
||||
+ unit.target,
|
||||
+ hasher.finish(),
|
||||
+ bcx.resolve.features_sorted(unit.pkg.package_id()),
|
||||
+ );
|
||||
Some(Metadata(hasher.finish()))
|
||||
}
|
||||
diff --git a/src/cargo/core/compiler/fingerprint.rs b/src/cargo/core/compiler/fingerprint.rs
|
||||
index 3738bcdd..de78ffb4 100644
|
||||
--- a/src/cargo/core/compiler/fingerprint.rs
|
||||
+++ b/src/cargo/core/compiler/fingerprint.rs
|
||||
@@ -830,7 +830,7 @@ impl Fingerprint {
|
||||
// for a discussion of why it's `>` see the discussion about #5918
|
||||
// below in `find_stale`.
|
||||
if dep_mtime > max_mtime {
|
||||
- log::info!("dependency on `{}` is newer than we are", dep.name);
|
||||
+ eprintln!("dependency on `{}` is newer than we are", dep.name);
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
--
|
||||
2.20.1 (Apple Git-117)
|
||||
|
Reference in New Issue
Block a user