Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: only inherit workspace package table if the new package is a member #13261

Merged
merged 4 commits into from
Jan 9, 2024
Merged

fix: only inherit workspace package table if the new package is a member #13261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87345a1
test: correct not_inherit_workspace_package_table_if_not_members case
Rustin170506 Jan 8, 2024
47f4b75
fix: only inherit workspace package table if the new package is a member
Rustin170506 Jan 8, 2024
874645e
test: add lints
Rustin170506 Jan 9, 2024
db4ed03
refactor: separate get_display_path_and_check_membership
Rustin170506 Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
test: correct not_inherit_workspace_package_table_if_not_members case 
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
  • Loading branch information
@Rustin170506
Rustin170506 committed Jan 8, 2024
commit 87345a19327659f3e2e0899076e6c201eaf5ff9f
7 changes: 7 additions & 0 deletions tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[workspace]
exclude = ["bar"]
[workspace.package]
authors = ["Rustaceans"]
description = "foo"
Expand All @@ -13,3 +15,8 @@ include = ["foo"]
license = "MIT OR Apache-2.0"
publish = false
repository = "foo"

[package]
name = "foo"
version = "0.1.0"
edition = "2018"
2 changes: 1 addition & 1 deletion tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fn case() {

snapbox::cmd::Command::cargo_ui()
.arg("new")
.args(["foo"])
.args(["bar"])
.current_dir(cwd)
.assert()
.success()
Expand Down
7 changes: 6 additions & 1 deletion tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["foo"]
exclude = ["bar"]
[workspace.package]
authors = ["Rustaceans"]
description = "foo"
Expand All @@ -15,3 +15,8 @@ include = ["foo"]
license = "MIT OR Apache-2.0"
publish = false
repository = "foo"

[package]
name = "foo"
version = "0.1.0"
edition = "2018"
2 changes: 1 addition & 1 deletion ...e_table_if_not_members/out/foo/Cargo.toml → ...e_table_if_not_members/out/bar/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "foo"
name = "bar"
version = "0.1.0"
authors.workspace = true
description.workspace = true
Expand Down
3 changes: 0 additions & 3 deletions ...estsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/foo/src/main.rs
View file
Open in desktop

This file was deleted.

11 changes: 10 additions & 1 deletion tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
Created binary (application) `foo` package
warning: compiling this new package may not work due to invalid workspace configuration

failed to parse manifest at `[ROOT]/case/bar/Cargo.toml`

Caused by:
error inheriting `edition` from workspace root manifest's `workspace.package.edition`

Caused by:
failed to find a workspace root
Created binary (application) `bar` package