Skip to content
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.

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

Don't allow config env to modify vars set by cargo #9579

Merged
merged 1 commit into from
Jun 21, 2021

Conversation

wickerwaka
Copy link
Contributor

This changes how the [env] variables are applied. They will no longer replace any variables that are being set by cargo itself, whether or not the force flag is set. The force flag still determines whether existing variables from the environment can be overridden or not.

Addresses unresolved issue in #9539

@rust-highfive
Copy link

r? @ehuss

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2021
@ehuss
Copy link
Contributor

ehuss commented Jun 21, 2021

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 21, 2021

📌 Commit ac05a85 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 21, 2021
@bors
Copy link
Collaborator

bors commented Jun 21, 2021

⌛ Testing commit ac05a85 with merge 1b2caa7107959ed428285d8947c252beba91b62a...

@ehuss
Copy link
Contributor

ehuss commented Jun 21, 2021

Oops, CI isn't ready.

@bors r-

@bors bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 21, 2021
@ehuss
Copy link
Contributor

ehuss commented Jun 21, 2021

Once #9604 is merged I'll re-approve.

@ehuss ehuss removed the S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. label Jun 21, 2021
@bors
Copy link
Collaborator

bors commented Jun 21, 2021

💔 Test failed - checks-actions

@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2021
@ehuss
Copy link
Contributor

ehuss commented Jun 21, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 21, 2021

📌 Commit ac05a85 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 21, 2021
@bors
Copy link
Collaborator

bors commented Jun 21, 2021

⌛ Testing commit ac05a85 with merge 9548b78...

@bors
Copy link
Collaborator

bors commented Jun 21, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 9548b78 to master...

@bors bors merged commit 9548b78 into rust-lang:master Jun 21, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 24, 2021
Update cargo

This also updates `opener` used in bootstrap (to try to keep dependencies unified).

18 commits in 44456677b5d1d82fe981c955dc5c67734b31f340..9233aa06c801801cff75df65df718d70905a235e
2021-06-12 18:00:01 +0000 to 2021-06-22 21:32:55 +0000
- Detect incorrectly named cargo.toml (rust-lang/cargo#9607)
- Unify weak and namespaced features. (rust-lang/cargo#9574)
- Change `rustc-cdylib-link-arg` error to a warning. (rust-lang/cargo#9563)
- Updates to future-incompatible reporting. (rust-lang/cargo#9606)
- Add a compatibility notice for diesel and the new resolver. (rust-lang/cargo#9602)
- Don't allow config env to modify vars set by cargo (rust-lang/cargo#9579)
- Disambiguate is_symlink. (rust-lang/cargo#9604)
- Update opener requirement from 0.4 to 0.5 (rust-lang/cargo#9583)
- Avoid quadratic complexity when splitting output into lines (rust-lang/cargo#9586)
- Bump to 0.56.0, update changelog (rust-lang/cargo#9597)
- Fix dep-info files including non-local build script paths. (rust-lang/cargo#9596)
- Relax doc collision error. (rust-lang/cargo#9595)
- Handle "jobs = 0" case in cargo config files (rust-lang/cargo#9584)
- Enhancements to testsuite error output. (rust-lang/cargo#9589)
- Fix typo (rust-lang/cargo#9590)
- Enable support for fix --edition for 2021. (rust-lang/cargo#9588)
- Add more details for installing git repository errors (rust-lang/cargo#9582)
- More information for links conflicting (rust-lang/cargo#9568)
@ehuss ehuss added this to the 1.55.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants