refactor(toml): Cleanup noticed on the way to #12801 #12902
Merged
Conversation
This file contains 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
In switching from toml v0.5 to toml_edit, we no longer need to have tables after all fields.
|
r? @weihanglo (rustbot has picked a reviewer for you, use r? to override) |
weihanglo
reviewed
Oct 31, 2023
|
|
||
| // Properties that can be inherited by members. | ||
| package: Option<InheritableFields>, | ||
| dependencies: Option<BTreeMap<String, TomlDependency>>, | ||
| lints: Option<TomlLints>, | ||
|
|
||
| // Note that this field must come last due to the way toml serialization | ||
| // works which requires tables to be emitted after all values. |
There was a problem hiding this comment.
Seems like metadata isn't needed to be the last anymore. Do we have a test to verify the change?
There was a problem hiding this comment.
Looks like we have several tests in testsuite/package.rs that use package.metadata which means we'll serialize the prepared manifest and verify its output which would hit this situation.
There was a problem hiding this comment.
This was 6bc7455 but since we have tests and toml crate has changed largely, I am going to merge this. Thank you!
weihanglo
approved these changes
Oct 31, 2023
|
@bors r+ |
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 31, 2023
Update cargo 7 commits in 708383d620e183a9ece69b8fe930c411d83dee27..b4d18d4bd3db6d872892f6c87c51a02999b80802 2023-10-27 21:09:26 +0000 to 2023-10-31 18:19:10 +0000 - refactor(toml): Cleanup noticed on the way to rust-lang/cargo#12801 (rust-lang/cargo#12902) - feat(trim-paths): set env `CARGO_TRIM_PATHS` for build scripts (rust-lang/cargo#12900) - feat: implement RFC 3127 `-Ztrim-paths` (rust-lang/cargo#12625) - docs: clarify config to use vendored source is printed to stdout (rust-lang/cargo#12893) - Improve the margin calculation for the search command's UI (rust-lang/cargo#12890) - Add new packages to [workspace.members] automatically (rust-lang/cargo#12779) - refactor(toml): Decouple parsing from interning system (rust-lang/cargo#12881) r? ghost
20 tasks
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.
In splitting up
toml/mod.rsfor #12801, I noticed some things to clean up. I decided to split this up.