diff --git a/rustbook-en/Cargo.toml b/rustbook-en/Cargo.toml index 20fc1464..73c7ba47 100644 --- a/rustbook-en/Cargo.toml +++ b/rustbook-en/Cargo.toml @@ -6,14 +6,6 @@ exclude = [ "linkchecker", # linkchecker is part of the CI workflow "listings", # these are intentionally distinct from the workspace "tmp", # listings are built here when updating output via tools/update-rustc.sh - "packages/trpl", # manages its own dependencies as a standalone crate - - # These are used as path dependencies in `rust-lang/rust` (since we are not - # publishing them to crates.io), so they cannot be part of this workspace, - # because path dependencies do not get built as a crate within the hosting - # workspace. - "packages/mdbook-trpl-listing", - "packages/mdbook-trpl-note", ] [workspace.dependencies] diff --git a/rustbook-en/listings/ch19-patterns-and-matching/listing-19-15/src/main.rs b/rustbook-en/listings/ch19-patterns-and-matching/listing-19-15/src/main.rs index 9407cc16..7edf7f2b 100644 --- a/rustbook-en/listings/ch19-patterns-and-matching/listing-19-15/src/main.rs +++ b/rustbook-en/listings/ch19-patterns-and-matching/listing-19-15/src/main.rs @@ -19,7 +19,7 @@ fn main() { println!("Text message: {text}"); } Message::ChangeColor(r, g, b) => { - println!("Change the color to red {r}, green {g}, and blue {b}") + println!("Change the color to red {r}, green {g}, and blue {b}"); } } } diff --git a/rustbook-en/listings/ch19-patterns-and-matching/listing-19-16/src/main.rs b/rustbook-en/listings/ch19-patterns-and-matching/listing-19-16/src/main.rs index 1e7ad5f1..a31eeffb 100644 --- a/rustbook-en/listings/ch19-patterns-and-matching/listing-19-16/src/main.rs +++ b/rustbook-en/listings/ch19-patterns-and-matching/listing-19-16/src/main.rs @@ -18,7 +18,7 @@ fn main() { println!("Change color to red {r}, green {g}, and blue {b}"); } Message::ChangeColor(Color::Hsv(h, s, v)) => { - println!("Change color to hue {h}, saturation {s}, value {v}") + println!("Change color to hue {h}, saturation {s}, value {v}"); } _ => (), } diff --git a/rustbook-en/packages/mdbook-trpl-listing/Cargo.toml b/rustbook-en/packages/mdbook-trpl-listing/Cargo.toml index 20bfe347..4b90001e 100644 --- a/rustbook-en/packages/mdbook-trpl-listing/Cargo.toml +++ b/rustbook-en/packages/mdbook-trpl-listing/Cargo.toml @@ -17,3 +17,8 @@ toml = "0.8.12" [dev-dependencies] assert_cmd = "2" + +# This package is used as a path dependency in `rust-lang/rust`, not published +# to crates.io, so it cannot be part of the `rust-lang/book` workspace, because +# path dependencies do not get built as a crate within the hosting workspace. +[workspace] diff --git a/rustbook-en/packages/mdbook-trpl-note/Cargo.toml b/rustbook-en/packages/mdbook-trpl-note/Cargo.toml index e8dc53cc..4fde2fd8 100644 --- a/rustbook-en/packages/mdbook-trpl-note/Cargo.toml +++ b/rustbook-en/packages/mdbook-trpl-note/Cargo.toml @@ -14,3 +14,8 @@ serde_json = "1" [dev-dependencies] assert_cmd = "2" + +# This package is used as a path dependency in `rust-lang/rust`, not published +# to crates.io, so it cannot be part of the `rust-lang/book` workspace, because +# path dependencies do not get built as a crate within the hosting workspace. +[workspace] diff --git a/rustbook-en/packages/trpl/Cargo.toml b/rustbook-en/packages/trpl/Cargo.toml index 61c46319..26503e6b 100644 --- a/rustbook-en/packages/trpl/Cargo.toml +++ b/rustbook-en/packages/trpl/Cargo.toml @@ -21,3 +21,8 @@ tokio = { version = "1", default-features = false, features = [ "time", ] } tokio-stream = "0.1" + +# This package is built as a standalone package to publish to crates.io, and is +# also built as a path dependency for distribution with Rust, so it must not be +# built as part of the `rust-lang/book` or `rust-lang/rust` workspaces. +[workspace]