Share cache entries even if -Cprefer-dynamic and -Cextra-filename differ
#2469
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shadaj
force-pushed
the
cache-prefer-dynamic-extra-filename
branch
from
25f448a to
eb97b02
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2469 +/- ##
==========================================
+ Coverage 71.23% 71.24% +0.01%
==========================================
Files 64 64
Lines 35221 35245 +24
==========================================
+ Hits 25088 25110 +22
- Misses 10133 10135 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
shadaj
force-pushed
the
cache-prefer-dynamic-extra-filename
branch
from
eb97b02 to
adce4ad
Compare
shadaj
force-pushed
the
cache-prefer-dynamic-extra-filename
branch
from
adce4ad to
cca478e
Compare
MingweiSamuel
approved these changes
Oct 23, 2025
Comment on lines
+1472
to
+1476
| || (arg == "-C" && value == &Some(OsString::from("prefer-dynamic"))) | ||
| || (arg == "-C" | ||
| && value | ||
| .as_ref() | ||
| .is_some_and(|v| v.starts_with("extra-filename")))) |
There was a problem hiding this comment.
Maybe
(arg == "C" && (value == &Some(..) || value.as_ref().is_some_and(..))is more readable?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Makes two changes that improve the cache hit rate if switching between compilation with
-Cprefer-dynamicand not. First, because sccache only cachesrlib/staticlibcrates,-Cprefer-dynamichas no effect and can be ignored (it is often set via globalRUSTFLAGS).Similarly, the Cargo-generated fingerprint is easily invalidated by custom
RUSTFLAGS, but since sccache has fine-grained knowledge of therustcinvocation it should ignore this fingerprint. We do this by ignoring this flag in the cache key, and also stripping the-Cextra-filename(which Cargo uses to append the fingerprint to outputs) from the keys of the output files.Most of this behavior is (to my understanding) covered by the existing tests, but I adjusted a hashing test to ensure these two flags are correctly ignored.