Automatically inherit workspace fields when running cargo new/init #12069

Rustin170506 · 2023-05-01T13:07:55Z

What does this PR try to resolve?

close #10870

One thing to note: we will try to ensure the order of the inherited fields. You can see more at #12069 (comment)

How should we test and review this PR?

unit tests

rustbot · 2023-05-01T13:08:00Z

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

Rustin170506

Working in process.

src/cargo/ops/cargo_new.rs

Rustin170506

Self check

Rustin170506 · 2023-05-03T06:05:48Z

tests/testsuite/main.rs

@@ -24,6 +24,7 @@ mod cargo_command;
 mod cargo_config;
 mod cargo_env_config;
 mod cargo_features;
+mod cargo_new;


I will move other tests for the new command to this mod after this PR merging.

@epage Do you believe it's necessary to migrate it, or can we retain it?

Moving things around are under discussion, so don't worry about it

Rustin170506 · 2023-05-03T06:06:15Z

r? @epage

Muscraft

This appears to be happening inside of mv, which is used by cargo new and cargo init. I am not sure if we want to support this for cargo init, currently only cargo new is specified in #10870. This should probably be brought up and discussed in #10870 before this is merged.

src/cargo/ops/cargo_new.rs

tests/testsuite/cargo_new/inherit_workspace_package_table.in/Cargo.toml

epage · 2023-05-04T00:51:42Z

This appears to be happening inside of mv, which is used by cargo new and cargo init. I am not sure if we want to support this for cargo init, currently only cargo new is specified in #10870. This should probably be brought up and discussed in #10870 before this is merged.

It specified new because it is easy to overlook one or the other. Looking at the documentation for init, it doesn't seem like we advertise these as slightly different roles, so I think its reasonable to do for both

Signed-off-by: hi-rustin <[email protected]>

src/cargo/ops/cargo_new.rs

Signed-off-by: hi-rustin <[email protected]>

Rustin170506

Self check

epage

Thanks for your work on this and sticking through the more dramatic changes in the approach! This both better prepares us for future changes and makes it easier to add other rich features to cargo add / cargo init.

Let me know if this is ready to merge or if you had other updates you were working on.

Rustin170506 · 2023-05-23T02:46:34Z

Let me know if this is ready to merge or if you had other updates you were working on.

I think it is ready to go.

Thanks for your work on this and sticking through the more dramatic changes in the approach! This both better prepares us for future changes and makes it easier to add other rich features to cargo add / cargo init.

Thanks for your patient review! 💚 💙 💜 💛 ❤️
This approach definitely better than before! Learned a lot.

epage · 2023-05-23T13:09:06Z

@bors r+

bors · 2023-05-23T13:09:08Z

📌 Commit 821725d has been approved by epage

It is now in the queue for this repository.

bors · 2023-05-23T13:09:15Z

⌛ Testing commit 821725d with merge 50d56ca...

bors · 2023-05-23T13:52:18Z

☀️ Test successful - checks-actions
Approved by: epage
Pushing 50d56ca to master...

Update cargo 10 commits in 09276c703a473ab33daaeb94917232e80eefd628..64fb38c97ac4d3a327fc9032c862dd28c8833b17 2023-05-16 21:43:35 +0000 to 2023-05-23 18:53:23 +0000 - Consider rust-version when selecting packages for cargo add (rust-lang/cargo#12078) - fix(lints): Switch to -Zlints so stable projects can experiment (rust-lang/cargo#12168) - Automatically inherit workspace fields when running cargo new/init (rust-lang/cargo#12069) - ci: check if any version bump needed for member crates (rust-lang/cargo#12126) - feat: `lints` feature (rust-lang/cargo#12148) - fix: pass `-C debuginfo` after weakening if explicitly set (rust-lang/cargo#12165) - Tweak build help to clarify role of --bin (rust-lang/cargo#12157) - fix: Pass CI on nightly (rust-lang/cargo#12160) - docs(source): doc comments for Source and its impls (rust-lang/cargo#12159) - docs(source): doc comments for `Source` and friends (rust-lang/cargo#12153) r? `@ghost`

epage · 2023-07-14T16:56:26Z

FYI @hi-rustin though this didn't make the release blog post, people seemed to be excited by it

My post on reddit is the most upvoted
My post on mastadon has gotten some attention as well

So far my favorite quote:

That is a really cool feature! I didn't knew I needed it, but I actually do!

rustbot assigned ehuss May 1, 2023

rustbot added Command-new S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 1, 2023

Rustin170506 commented May 1, 2023

View reviewed changes

src/cargo/ops/cargo_new.rs Outdated Show resolved Hide resolved

epage reviewed May 1, 2023

View reviewed changes

src/cargo/ops/cargo_new.rs Outdated Show resolved Hide resolved

Rustin170506 force-pushed the rustin-patch-ws branch 9 times, most recently from 0df76c9 to ba20265 Compare May 3, 2023 05:33

Rustin170506 marked this pull request as ready for review May 3, 2023 05:34

Rustin170506 commented May 3, 2023

View reviewed changes

rustbot assigned epage and unassigned ehuss May 3, 2023

Rustin170506 requested a review from epage May 3, 2023 06:06

Muscraft reviewed May 3, 2023

View reviewed changes

src/cargo/ops/cargo_new.rs Outdated Show resolved Hide resolved

tests/testsuite/cargo_new/inherit_workspace_package_table.in/Cargo.toml Outdated Show resolved Hide resolved

Rustin170506 force-pushed the rustin-patch-ws branch 2 times, most recently from c19e6dd to 89c6a6f Compare May 4, 2023 01:33

This comment was marked as outdated.

Sign in to view

Rustin170506 force-pushed the rustin-patch-ws branch from efc39fb to 38babd5 Compare May 7, 2023 09:23

This comment was marked as outdated.

Sign in to view

rustbot added the A-manifest Area: Cargo.toml issues label May 13, 2023

Rustin170506 force-pushed the rustin-patch-ws branch from 3a9da71 to 079af54 Compare May 13, 2023 08:41

Rustin170506 force-pushed the rustin-patch-ws branch 2 times, most recently from f7895e9 to 72205b8 Compare May 23, 2023 01:52

Use toml_edit to new/init cargo project

f69b46a

Signed-off-by: hi-rustin <[email protected]>

Rustin170506 force-pushed the rustin-patch-ws branch from 72205b8 to 1717205 Compare May 23, 2023 02:09

epage reviewed May 23, 2023

View reviewed changes

src/cargo/ops/cargo_new.rs Outdated Show resolved Hide resolved

Rustin170506 force-pushed the rustin-patch-ws branch from 1717205 to 00bdb80 Compare May 23, 2023 02:26

Rustin170506 added 3 commits May 23, 2023 10:35

Automatically inherit workspace fields when running cargo new

e6dae8e

Signed-off-by: hi-rustin <[email protected]>

Add tests for inherit_workspace_package_table

5265b1d

Signed-off-by: hi-rustin <[email protected]>

Add a inherit test for init

821725d

Signed-off-by: hi-rustin <[email protected]>

Rustin170506 force-pushed the rustin-patch-ws branch from 00bdb80 to 821725d Compare May 23, 2023 02:37

Rustin170506 commented May 23, 2023

View reviewed changes

epage approved these changes May 23, 2023

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2023

epage mentioned this pull request May 23, 2023

Tracking Issue for [lints] table RFC 3389 #12115

Closed

bors merged commit 50d56ca into rust-lang:master May 23, 2023

bors mentioned this pull request May 23, 2023

test(cli): Track --help output #11912

Merged

weihanglo mentioned this pull request May 23, 2023

Update cargo rust-lang/rust#111890

Merged

Rustin170506 mentioned this pull request May 24, 2023

Automatically inherit workspace lints when running cargo new/init #12174

Merged

ehuss added this to the 1.71.0 milestone May 30, 2023

weihanglo mentioned this pull request Jul 17, 2023

cargo new sometimes generates invalid Cargo.toml when new crate is in a subdirectory of a workspace with Cargo 1.71 #12360

Closed

epage mentioned this pull request Aug 1, 2023

Feature Request: cargo new --in-workspace [directory] [name] #6378

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Automatically inherit workspace fields when running cargo new/init #12069

Automatically inherit workspace fields when running cargo new/init #12069

Rustin170506 commented May 1, 2023 •

edited

Loading

rustbot commented May 1, 2023

Rustin170506 left a comment

Rustin170506 left a comment

Rustin170506 May 3, 2023

Rustin170506 Jun 6, 2023

epage Jun 6, 2023

Rustin170506 commented May 3, 2023

Muscraft left a comment

epage commented May 4, 2023

This comment was marked as outdated.

This comment was marked as outdated.

Rustin170506 left a comment

epage left a comment

Rustin170506 commented May 23, 2023

epage commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

epage commented Jul 14, 2023

Automatically inherit workspace fields when running cargo new/init #12069

Automatically inherit workspace fields when running cargo new/init #12069

Conversation

Rustin170506 commented May 1, 2023 • edited Loading

What does this PR try to resolve?

How should we test and review this PR?

rustbot commented May 1, 2023

Rustin170506 left a comment

Choose a reason for hiding this comment

Rustin170506 left a comment

Choose a reason for hiding this comment

Rustin170506 May 3, 2023

Choose a reason for hiding this comment

Rustin170506 Jun 6, 2023

Choose a reason for hiding this comment

epage Jun 6, 2023

Choose a reason for hiding this comment

Rustin170506 commented May 3, 2023

Muscraft left a comment

Choose a reason for hiding this comment

epage commented May 4, 2023

This comment was marked as outdated.

This comment was marked as outdated.

Rustin170506 left a comment

Choose a reason for hiding this comment

epage left a comment

Choose a reason for hiding this comment

Rustin170506 commented May 23, 2023

epage commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

epage commented Jul 14, 2023

Rustin170506 commented May 1, 2023 •

edited

Loading