fix bugs with workspace key and update_toml#10685
Merged
bors merged 2 commits intorust-lang:masterfrom May 20, 2022
Merged
Conversation
|
r? @ehuss (rust-highfive has picked a reviewer for you, use r? to override) |
198f377 to
ffc1053
Compare
WorkspaceSource's issues with rename and default-featuresworkspace key and update_toml
Contributor
|
@bors r+ |
Contributor
|
📌 Commit ffc1053 has been approved by |
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 25, 2022
Update cargo 10 commits in a4c1cd0eb6b18082a7e693f5a665548fe1534be4..39ad1039d9e3e1746177bf5d134af4c164f95528 2022-05-20 00:55:25 +0000 to 2022-05-25 00:50:02 +0000 * doc: discuss build script instruction order (rust-lang/cargo#10600) * Require http-registry URLs to end with a '/' (rust-lang/cargo#10698) * No printing executable names when running tests and benchmarks with json message format (rust-lang/cargo#10691) * Restore proper error for crate not in local reg (rust-lang/cargo#10683) * Update libcurl (rust-lang/cargo#10696) * Fixed small typos (rust-lang/cargo#10693) * fix bugs with `workspace` key and `update_toml` (rust-lang/cargo#10685) * Bump to 0.64.0, update changelog (rust-lang/cargo#10687) * List C compiler as a build dependency in README (rust-lang/cargo#10678) * Add unstable `rustc-check-cfg` build script output (rust-lang/cargo#10539) r? `@ehuss`
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
5 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.
Motivations and Context
When working on an external subcommand to help with the switch to workspace inheritance, I found issues with the output
Cargo.tomlit was creating. When acargo_add::Dependencywould change its source to aWorkspsaceSource,workspace = truewould not show up. This lead me to discover that thedefault-featureskey was not being removed when theworkspacekey was set.This fixes those issues but brought up questions about how to deal with removing keys and clearing conflicting fields in a
Dependency. After talking with @epage, it was decided that this was the minimal set of changes to make while the changes to fix the other issues is workshopped.Changes
default-featuresto the list of keys to remove when the source is aWorkspaceSourceworkspacekey when the source is aWorkspaceSource