Skip to content

Commit 7f1f98e

Browse files
authored
Merge pull request #4083 from rust-lang/fix-workspace-config
infra: change how packages are opted out of workspaces
2 parents 9b812c6 + be84fe8 commit 7f1f98e

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ exclude = [
66
"linkchecker", # linkchecker is part of the CI workflow
77
"listings", # these are intentionally distinct from the workspace
88
"tmp", # listings are built here when updating output via tools/update-rustc.sh
9-
"packages/trpl", # manages its own dependencies as a standalone crate
10-
11-
# These are used as path dependencies in `rust-lang/rust` (since we are not
12-
# publishing them to crates.io), so they cannot be part of this workspace,
13-
# because path dependencies do not get built as a crate within the hosting
14-
# workspace.
15-
"packages/mdbook-trpl-listing",
16-
"packages/mdbook-trpl-note",
179
]
1810

1911
[workspace.dependencies]

packages/mdbook-trpl-listing/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ toml = "0.8.12"
1717

1818
[dev-dependencies]
1919
assert_cmd = "2"
20+
21+
# This package is used as a path dependency in `rust-lang/rust`, not published
22+
# to crates.io, so it cannot be part of the `rust-lang/book` workspace, because
23+
# path dependencies do not get built as a crate within the hosting workspace.
24+
[workspace]

packages/mdbook-trpl-note/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ serde_json = "1"
1414

1515
[dev-dependencies]
1616
assert_cmd = "2"
17+
18+
# This package is used as a path dependency in `rust-lang/rust`, not published
19+
# to crates.io, so it cannot be part of the `rust-lang/book` workspace, because
20+
# path dependencies do not get built as a crate within the hosting workspace.
21+
[workspace]

packages/trpl/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ tokio = { version = "1", default-features = false, features = [
2121
"time",
2222
] }
2323
tokio-stream = "0.1"
24+
25+
# This package is built as a standalone package to publish to crates.io, and is
26+
# also built as a path dependency for distribution with Rust, so it must not be
27+
# built as part of the `rust-lang/book` or `rust-lang/rust` workspaces.
28+
[workspace]

0 commit comments

Comments
 (0)