Support overwriting a foo.workspace = true with a dependency from a…#4
Merged
Muscraft merged 1 commit intocargo-add-supportfrom Apr 27, 2022
Merged
Conversation
… different source
epage
approved these changes
Apr 27, 2022
bors
added a commit
to rust-lang/cargo
that referenced
this pull request
Apr 28, 2022
Cargo add support for workspace inheritance 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 required `snapbox` support from #10581 and a new `toml_edit` version 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: - #10585 - Muscraft#1 - Muscraft#3 - Muscraft#2 - Muscraft#4 r? `@epage`
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
2 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: rust-lang#8415
RFC: rust-lang/rfcs#2906
PRs in this RFC:
Cargo.tomlrust-lang/cargo#10517license-path, anddepednency.pathrust-lang/cargo#10538readmerust-lang/cargo#10548rust-versionrust-lang/cargo#10563excludeandincluderust-lang/cargo#10565workspaceto… rust-lang/cargo#10564InheritableFieldsin aLazyCellinside `… rust-lang/cargo#10568key.workspace = truetokey = { workspace = true }rust-lang/cargo#10584cargo-addsupportcargo add foowhen afoo.workspace = truealready exists rust-lang/cargo#10585cargo add foowill inherit a workspace dependency #3Changes:
update_toml()take in aKeyMutthat could be formatted as neededKeyMutanytime the source is notWorkspaceSourceWorkspaceSource(foo.workspace = true) to any other source there is a space afterfoofoo= { version = "0.0.0", path = "../dependency" }vsfoo = { version = "0.0.0", path = "../dependency"Remaining implementation work for the RFC
cargo-addsupport, see epage's commentr? @epage