Fix deserialization of check-cfg in config.toml#10799
Merged
bors merged 2 commits intorust-lang:masterfrom Jun 29, 2022
Merged
Conversation
|
r? @ehuss (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Closed
3 tasks
Contributor
|
Thanks!
TOML can support tuples. I think the underlying issue is that the Config deserializer doesn't support tuples with anything except strings (particularly to handle environment variables), and we just have never encountered a situation where anything else was needed. This looks good, though. Setting it with booleans would be kinda strange. @bors r+ |
Contributor
|
@bors ping |
Contributor
|
😪 I'm awake I'm awake |
Contributor
|
@bors r+ |
Contributor
|
📌 Commit 23f59d4 has been approved by |
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 5, 2022
Update cargo 9 commits in dbff32b27893b899ae2397f3d56d1be111041d56..c0bbd42ce5e83fe2a93e817c3f9b955492d3130a 2022-06-24 19:25:13 +0000 to 2022-07-03 13:41:11 +0000 - fix typo (rust-lang/cargo#10818) - fix(add): Don't panic with `--offline` (rust-lang/cargo#10817) - chore: Set permissions for GitHub actions (rust-lang/cargo#10816) - Bump to 0.65.0, update changelog (rust-lang/cargo#10812) - Fix zsh completions for add and locate-project (rust-lang/cargo#10810) - Bump cargo-util version. (rust-lang/cargo#10804) - Update os_info (rust-lang/cargo#10802) - Fix deserialization of check-cfg in config.toml (rust-lang/cargo#10799) - fix: bash complete `install --path` with dirs (rust-lang/cargo#10798)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
When improving the check-cfg implementation in #10566 I changed the internal representation of
check_cfgfrom multiplebooloptions to oneOption<(bool, bool, bool, bool)>but I didn't realize until rust-lang/rust#82450 (comment) that the internal representation is actually somewhat public as it's used in the[unstable]in.cargo/config.toml.And because TOML cannot represent tuples there is no way to set it from the
[unstable]section. This PR fix this oversight by using a custom deserializer method similar to what was already done forbuild-std.