Cargo add support for workspace inheritance#10606
Merged
bors merged 7 commits intorust-lang:masterfrom Apr 28, 2022
Merged
Conversation
…g from a workspace dependency
… different source
rust-highfive
added
the
S-waiting-on-review
epage
reviewed
Apr 27, 2022
epage
reviewed
Apr 27, 2022
epage
approved these changes
Apr 27, 2022
Contributor
epage
left a comment
epage
left a comment
There was a problem hiding this comment.
I reviewed this in smaller pieces in muscraft's fork.
While nothing is explicitly put behind the feature flag, any of this working presupposes the feature flag, so that should be fine.
This is only additive and doesn't have real difference of behavior from what was merged already.
We do some re-parsing of files multiple times but this is not a performance sensitive command, so it should be fine. We can see if/when people have an issue.
12 tasks
Contributor
|
@bors r+ |
Contributor
|
📌 Commit aa7d116 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
Apr 28, 2022
Update cargo 8 commits in edffc4ada3d77799e5a04eeafd9b2f843d29fc23..f63f23ff1f1a12ede8585bbd1bbf0c536e50293d 2022-04-19 17:38:29 +0000 to 2022-04-28 03:15:50 +0000 - move workspace inheritance untable docs to the correct place (rust-lang/cargo#10609) - Cargo add support for workspace inheritance (rust-lang/cargo#10606) - chore: Upgrade toml_edit (rust-lang/cargo#10603) - Mark .cargo/git and .cargo/registry as cache dirs (rust-lang/cargo#10553) - fix(yank): Use '--version' like install (rust-lang/cargo#10575) - Disallow setting registry tokens with --config (rust-lang/cargo#10580) - Set cargo --version git hash length to 9 (rust-lang/cargo#10579) - Prefer `key.workspace = true` to `key = { workspace = true }` (rust-lang/cargo#10584)
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.
Tracking issue: #8415
RFC: rust-lang/rfcs#2906
This PR adds all the required support for workspace inheritance within
cargo-add. It was split up across a few different PRs as it requiredsnapboxsupport from #10581 and a newtoml_editversion from #10603. @epage and I decided to go ahead with this PR and add in some of the changes those PRs made. @epage's name on the commits is from helping to rewrite commits and some very minor additions.Changes:
cargo add foowhen afoo.workspace = truealready exists #10585cargo add foowill inherit a workspace dependency Muscraft/cargo#3foo.workspace = truewith a dependency from a… Muscraft/cargo#4r? @epage