Skip to content

Parse # env-dep directives in dep-info files #8421

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

Merged
merged 6 commits into from
Jun 30, 2020
Merged

Parse # env-dep directives in dep-info files #8421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f666b19
Parse `# env-dep` directives in dep-info files
alexcrichton Jun 26, 2020
784ea96
Filter env vars to check against
alexcrichton Jun 29, 2020
6820015
Get past internal test on CI
alexcrichton Jun 29, 2020
643f12e
Address review feedback
alexcrichton Jun 29, 2020
a6bf36e
Bump hashed metadata version
alexcrichton Jun 29, 2020
0750a6f
Handle env var escaping
alexcrichton Jun 29, 2020
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
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/context/compilation_files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ fn compute_metadata(
// cause a new hash due to the rustc version changing, but this allows
// cargo to be extra careful to deal with different versions of cargo that
// use the same rustc version.
1.hash(&mut hasher);
2.hash(&mut hasher);

// Unique metadata per (name, source, version) triple. This'll allow us
// to pull crates from anywhere without worrying about conflicts.
Expand Down
Loading