Skip to content

Avoid hashing CARGO_ variables that are redundant/unrelated #2495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −9
Open

Avoid hashing CARGO_ variables that are redundant/unrelated #2495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/compiler/rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,15 +1517,19 @@ where
continue;
}

// CARGO_MAKEFLAGS will have jobserver info which is extremely non-cacheable.
// CARGO_REGISTRIES_*_TOKEN contains non-cacheable secrets.
// Registry override config doesn't need to be hashed, because deps' package IDs
// already uniquely identify the relevant registries.
// CARGO_BUILD_JOBS only affects Cargo's parallelism, not rustc output.
if var == "CARGO_MAKEFLAGS"
|| var.starts_with("CARGO_REGISTRIES_")
|| var == "CARGO_BUILD_JOBS"
{
let may_skip = var == "CARGO_MAKEFLAGS" // will have jobserver info which is extremely non-cacheable.
|| var == "CARGO_BUILD_JOBS" // does not affect results
|| var.starts_with("CARGO_REGISTRIES_") // CARGO_REGISTRIES_*_TOKEN contains non-cacheable secrets, and package IDs already uniquely identify the relevant registries.
|| var.starts_with("CARGO_REGISTRY_") // same as CARGO_REGISTRIES_*
|| var == "CARGO_TARGET_DIR" // already included in the file paths
|| var == "CARGO_BUILD_BUILD_DIR"
|| var == "CARGO_BUILD_TARGET_DIR"
|| var.starts_with("CARGO_HTTP_") // not relevant
|| var.starts_with("CARGO_NET_")
|| var.starts_with("CARGO_TERM_")
|| var.starts_with("CARGO_ALIAS_")
|| var == "CARGO_CACHE_AUTO_CLEAN_FREQUENCY";
if may_skip {
continue;
}

Expand Down Expand Up @@ -3501,6 +3505,7 @@ proc_macro false
OsString::from("CARGO_BUILD_JOBS"),
OsString::from("ignored"),
),
(OsString::from("CARGO_TERM_COLOR"), OsString::from("never")),
]
.to_vec(),
false,
Expand Down
Loading