Improvements to StringList config handling. #7891
Merged
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
|
r? @Eh2406 (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
Looks like an improvement. |
|
📌 Commit fd25863 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Feb 17, 2020
Improvements to StringList config handling. `StringList` was using an untagged enum to deserialize a string or list. Unfortunately, serde does not handle untagged enums very well. The error messages are not very good, and it doesn't interact with untyped deserializers (like our environment variables). This switches it to a newtype struct, and then has hard-coded support for it in the deserializer. This fixes some deserialization errors (like treating `true` as a boolean) and provides better error messages. `StringList` is currently used for `build.rustflags`, `target.*.rustflags`, and `target.*.runner`. Fixes #7780 Fixes #7781
|
☀️ Test successful - checks-azure |
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Feb 19, 2020
Update cargo 9 commits in 3c53211c3d7fee4f430f170115af5baad17a3da9..e02974078a692d7484f510eaec0e88d1b6cc0203 2020-02-07 15:35:03 +0000 to 2020-02-18 15:24:43 +0000 - Set an environment variable for tests to find executables. (rust-lang/cargo#7697) - Rework internal errors. (rust-lang/cargo#7896) - Improvements to StringList config handling. (rust-lang/cargo#7891) - Add new/old rustflags to fingerprint log. (rust-lang/cargo#7890) - Fix inaccurate doc comment on `env_args`. (rust-lang/cargo#7889) - Add some extra fingerprint debug information. (rust-lang/cargo#7888) - Link the licenses into crates/cargo-platform (rust-lang/cargo#7886) - Modify test to make `rustc` PR mergeable (rust-lang/cargo#7883) - Keep environment variables in a BTreeMap to preserve sort order (rust-lang/cargo#7877)
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.
StringListwas using an untagged enum to deserialize a string or list. Unfortunately, serde does not handle untagged enums very well. The error messages are not very good, and it doesn't interact with untyped deserializers (like our environment variables). This switches it to a newtype struct, and then has hard-coded support for it in the deserializer. This fixes some deserialization errors (like treatingtrueas a boolean) and provides better error messages.StringListis currently used forbuild.rustflags,target.*.rustflags, andtarget.*.runner.Fixes #7780
Fixes #7781