Don't add the new package to workspace.members if there is no existing workspace in Cargo.toml. #13391
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
|
r? @weihanglo (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
Command-new
S-waiting-on-review
linyihai
force-pushed
the
non_workspace_add_lib
branch
from
4474dc2 to
4d2c0c6
Compare
weihanglo
reviewed
Feb 4, 2024
tests/testsuite/cargo_new/add_lib_into_non_workspace/in/Cargo.toml
Outdated
Show resolved
Hide resolved
linyihai
force-pushed
the
non_workspace_add_lib
branch
from
4d2c0c6 to
6cd8a3a
Compare
linyihai
changed the title
…isting workspace in Cargo.toml
weihanglo
approved these changes
Feb 5, 2024
src/cargo/ops/cargo_new.rs
Outdated
| members.push(display_path); | ||
| if was_sorted { | ||
| members.sort_by(|lhs, rhs| lhs.as_str().cmp(&rhs.as_str())); | ||
| workspace_document["workspace"]["members"] = toml_edit::value(array); |
There was a problem hiding this comment.
nit: one less access
Suggested change
| workspace_document["workspace"]["members"] = toml_edit::value(array); | |
| workspace["members"] = toml_edit::value(array); |
There was a problem hiding this comment.
That's a good point.
linyihai
force-pushed
the
non_workspace_add_lib
branch
from
6cd8a3a to
0391b14
Compare
weihanglo
approved these changes
Feb 6, 2024
|
Thanks for the patch! @bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 7, 2024
Update cargo 14 commits in cdf84b69d0416c57ac9dc3459af80dfb4883d27a..ccc84ccec4b7340eb916aefda1cb3e2fe17d8e7b 2024-02-02 19:39:16 +0000 to 2024-02-07 15:37:49 +0000 - Relax a test to permit warnings to be emitted, too. (rust-lang/cargo#13415) - test: disable lldb test as it requires privileges to run on macOS (rust-lang/cargo#13416) - Update git2 (rust-lang/cargo#13412) - fix: Switch more notes/warnings to lowercase (rust-lang/cargo#13410) - Don't add the new package to workspace.members if there is no existing workspace in Cargo.toml. (rust-lang/cargo#13391) - Remove build metadata from curl-sys version. (rust-lang/cargo#13401) - Fix markdown line break in cargo-add (rust-lang/cargo#13400) - Remove `package.documentation` from the “before publishing” list. (rust-lang/cargo#13398) - chore(deps): update gix (rust-lang/cargo#13380) - chore(deps): update compatible (rust-lang/cargo#13379) - feat(update): Tell users when they are still behind (rust-lang/cargo#13372) - docs(changelog): Slight cleanup (rust-lang/cargo#13396) - Bump to 0.79.0; update changelog (rust-lang/cargo#13392) - doc: `[package]` doesn't require `version` field (rust-lang/cargo#13390) r? ghost
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.
What does this PR try to resolve?
Fixed #13345
If the current package has no workspace table in Cargo.toml, then if you run
cargo add foo, don't create the workspace inline item and don't addfoointo the workspace.members.How should we test and review this PR?
Reviewed by commit by commit.
Additional information