Merge pull request #3931 from rust-lang/preprocessors-and-rust-lang

infra: tweak mdBook preprocessors configuration

.github/workflows/main.yml

@@ -38,7 +38,15 @@ jobs:
         rustup set profile minimal
         rustup toolchain install 1.76 -c rust-docs
         rustup default 1.76
-    - name: Run package tests
+    - name: Run `tools` package tests
+      run: |
+        cargo test
+    - name: Run `mdbook-trpl-note` package tests
+      working-directory: packages/mdbook-trpl-note
+      run: |
+        cargo test
+    - name: Run `mdbook-trpl-listing` package tests
+      working-directory: packages/mdbook-trpl-listing
       run: |
         cargo test
   lint:

Cargo.toml

@@ -1,16 +1,21 @@
 [workspace]
-members = ["packages/*"]
-default-members = ["packages/*"]
+members = ["packages/tools"]
+# default-members = ["packages/tools"]
 resolver = "2"
 exclude = [
     "linkchecker", # linkchecker is part of the CI workflow
     "listings",    # these are intentionally distinct from the workspace
+
+    # 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]
-assert_cmd = "2.0.14"
 walkdir = "2.3.1"
-clap = { version = "4.5.4", features = ["derive"] }
 docopt = "1.1.0"
 mdbook = "0.4.37"
 pulldown-cmark = { version = "0.10.3", features = ["simd"] }

packages/mdbook-trpl-listing/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { workspace = true }
-mdbook = { workspace = true }
-pulldown-cmark = { workspace = true }
-pulldown-cmark-to-cmark = { workspace = true }
-serde_json = { workspace = true }
+clap = { version = "4", features = ["derive"] }
+mdbook = { version = "0.4", features = [] }                # only need the library
+pulldown-cmark = { version = "0.10", features = ["simd"] }
+pulldown-cmark-to-cmark = "13"
+serde_json = "1"
 thiserror = "1.0.60"
 toml = "0.8.12"
 xmlparser = "0.13.6"
 
 [dev-dependencies]
-assert_cmd = { workspace = true }
+assert_cmd = "2"

packages/mdbook-trpl-note/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { workspace = true }
-mdbook = { workspace = true }
-pulldown-cmark = { workspace = true }
-pulldown-cmark-to-cmark = { workspace = true }
-serde_json = { workspace = true }
+clap = { version = "4", features = ["derive"] }
+mdbook = { version = "0.4", features = [] }                # only need the library
+pulldown-cmark = { version = "0.10", features = ["simd"] }
+pulldown-cmark-to-cmark = "13"
+serde_json = "1"
 
 [dev-dependencies]
-assert_cmd = { workspace = true }
+assert_cmd = "2"