[beta-1.69] backport #11824 #11863
Merged
[beta-1.69] backport #11824 #11863
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
…=ehuss Handle case mismatches when looking up env vars in the Config snapshot ### What does this PR try to resolve? Fixes rust-lang#11814. Windows environment variables are case-insensitive, which causes problems when looking them up in the `Config` env snapshot. This PR adds another member (`case_insensitive_env`) in `Config` that maps upper-cased keys to their original values in the env (for example, `"PATH" => "Path"`). If lookup in `self.env` fails, this PR converts the key to upper case and looks it up in `self.case_insensitive_env` to obtain the correct key name if it exists (on Windows only). ### How should we test and review this PR? Please see the new tests in `testsuite/config.rs` and `testsuite/cargo_command.rs`. ### Additional information Currently, this uses `str::to_uppercase` to uppercase the keys. This requires key to be valid UTF-8, and may disagree with how the OS uppercases things (see the link in [this comment](rust-lang#11814 (comment)) for details).
|
r? @epage (rustbot has picked a reviewer for you, use r? to override) |
|
rustbot
added
A-configuration
|
Thanks! @bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 19, 2023
…nglo [beta-1.69] cargo beta backports 3 commits in 9880b408a3af50c08fab3dbf4aa2a972df71e951..7b18c85808a6b45ec8364bf730617b6f13e0f9f8 2023-02-28 19:39:39 +0000 to 2023-03-17 12:29:33 +0000 - [beta-1.69] backport rust-lang/cargo#11824 (rust-lang/cargo#11863) - [beta-1.69] backport rust-lang/cargo#11820 (rust-lang/cargo#11823) - chore: Backport rust-lang/cargo#11630 to `1.69.0` (rust-lang/cargo#11806) r? `@ghost`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Beta backports:
In order to make CI pass, the following PRs are also cherry-picked: