Skip to content

Commit 3dc1b9f

Browse files
committed
Auto merge of rust-lang#132007 - rustbot:docs-update, r=ehuss
Update books ## rust-lang/edition-guide 7 commits in c7ebae25cb4801a31b6f05353f6d85bfa6feedd1..1f07c242f8162a711a5ac5a4ea8fa7ec884ee7a9 2024-10-21 14:29:49 UTC to 2024-10-19 19:08:20 UTC - 2024: Add reserved syntax (rust-lang/edition-guide#326) - Update stdout of `cargo new` (rust-lang/edition-guide#327) - Don't run doctests on rustfmt ident sorting page - add rustfmt raw identifer sorting doc (rust-lang/edition-guide#321) - Add some tips for what to be careful of with rustdoc-doctests (rust-lang/edition-guide#323) - Remove cargo-remove-implicit-features (rust-lang/edition-guide#324) - Rename doctest standalone tag (rust-lang/edition-guide#325) ## rust-embedded/book 1 commits in f40a8b420ec4b4505d9489965e261f1d5c28ba23..ddbf1b4e2858fedb71b7c42eb15c4576517dc125 2024-10-13 19:53:37 UTC to 2024-10-13 19:53:37 UTC - Add link to Cortex-M comparison to install.md (rust-embedded/book#378) ## rust-lang/reference 29 commits in c64e52a3d306eac0129f3ad6c6d8806ab99ae2e9..23ce619966541bf2c80d45fdfeecf3393e360a13 2024-10-05 00:33:03 +0000 to 2024-10-22 21:34:51 +0000 - Mention `--print cfg` under set configuration options (rust-lang/reference#1636) - Fix `pat` fragment specifier to be the "current" edition (rust-lang/reference#1640) - Add restriction for cfg_attr with crate_type and crate_name (rust-lang/reference#1649) - Sort macro fragment specifiers (rust-lang/reference#1641) - Document mixed-site hygiene (rust-lang/reference#1656) - Clarify that "macro attributes" refers to proc macros (rust-lang/reference#1660) - mdbook-spec: Fix Spec::new creation (rust-lang/reference#1658) - Fix stdcall example broken by recent rustc change (rust-lang/reference#1659) - Add spec identifiers to const_eval.md (rust-lang/reference#1569) - Add identifier syntax to trait-bounds.md (rust-lang/reference#1631) - Add identifier syntax to macro-ambiguity.md (rust-lang/reference#1634) - Add spec identifier syntax to conditional-compilation.md (rust-lang/reference#1564) - Add spec identifiers to behaviour-considered-undefined.md (rust-lang/reference#1562) - Add test linking (rust-lang/reference#1646) - Allow `deny` inside `forbid` as a no-op (rust-lang/reference#1655) - Add identifier syntax to identifiers.md (rust-lang/reference#1583) - Add spec identifiers to crates-and-source-files.md (rust-lang/reference#1570) - Add identifier syntax to linkage.md (rust-lang/reference#1633) - Add identifier syntax to type-coercions.md (rust-lang/reference#1632) - Add identifiers to variables.md (rust-lang/reference#1626) - Add identifier syntax to lexer chapters (rust-lang/reference#1620) - Add spec identifier syntax to `unsafe-keyword.md` and `unsafety.md` (rust-lang/reference#1619) - Add identifier syntax to types and subchapters. (rust-lang/reference#1618) - Add identifier syntax to subtyping.md (rust-lang/reference#1613) - Add identifier syntax to statements.md (rust-lang/reference#1611) - Add identifier syntax to type-layout.md (rust-lang/reference#1614) - Clarify definition of "immutable bytes" (rust-lang/reference#1637) - Add preview artifacts in CI (rust-lang/reference#1647) - trait bounds grammar: make `?` and `for<>` mutually exclusive (rust-lang/reference#1650) ## rust-lang/rustc-dev-guide 5 commits in 07bc9ca..59d94ea 2024-10-21 02:30:07 UTC to 2024-10-07 21:12:09 UTC - Add the WASM | WASI | Emscripten notification groups (rust-lang/rustc-dev-guide#2100) - Update bootstrapping.md (rust-lang/rustc-dev-guide#1900) - Rename `needs-profiler-support` to `needs-profiler-runtime` (rust-lang/rustc-dev-guide#2095) - Document compiletest directives `ignore-coverage-map` and `ignore-coverage-run` (rust-lang/rustc-dev-guide#2094) - Purge `run-pass-valgrind` mentions (rust-lang/rustc-dev-guide#2091)
2 parents a93c171 + df8551b commit 3dc1b9f

File tree

7 files changed

+22
-7
lines changed

7 files changed

+22
-7
lines changed

src/bootstrap/src/core/build_steps/doc.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,14 @@ impl<P: Step> Step for RustbookSrc<P> {
170170
builder.add_rustc_lib_path(compiler, &mut rustbook_cmd);
171171
}
172172

173-
rustbook_cmd.arg("build").arg(&src).arg("-d").arg(&out).run(builder);
173+
rustbook_cmd
174+
.arg("build")
175+
.arg(&src)
176+
.arg("-d")
177+
.arg(&out)
178+
.arg("--rust-root")
179+
.arg(&builder.src)
180+
.run(builder);
174181

175182
for lang in &self.languages {
176183
let out = out.join(lang);

src/doc/embedded-book

src/tools/rustbook/Cargo.lock

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is automatically @generated by Cargo.
22
# It is not intended for manual editing.
3-
version = 3
3+
version = 4
44

55
[[package]]
66
name = "adler2"
@@ -704,6 +704,7 @@ dependencies = [
704704
"semver",
705705
"serde_json",
706706
"tempfile",
707+
"walkdir",
707708
]
708709

709710
[[package]]

src/tools/rustbook/src/main.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ fn main() {
2222
.required(false)
2323
.value_parser(clap::value_parser!(String));
2424

25+
let root_arg = arg!(--"rust-root" <ROOT_DIR>
26+
"Path to the root of the rust source tree")
27+
.required(false)
28+
.value_parser(clap::value_parser!(PathBuf));
29+
2530
let dir_arg = arg!([dir] "Root directory for the book\n\
2631
(Defaults to the current directory when omitted)")
2732
.value_parser(clap::value_parser!(PathBuf));
@@ -37,6 +42,7 @@ fn main() {
3742
.about("Build the book from the markdown files")
3843
.arg(d_arg)
3944
.arg(l_arg)
45+
.arg(root_arg)
4046
.arg(&dir_arg),
4147
)
4248
.subcommand(
@@ -96,7 +102,8 @@ pub fn build(args: &ArgMatches) -> Result3<()> {
96102
}
97103

98104
if book.config.get_preprocessor("spec").is_some() {
99-
book.with_preprocessor(Spec::new());
105+
let rust_root = args.get_one::<PathBuf>("rust-root").cloned();
106+
book.with_preprocessor(Spec::new(rust_root)?);
100107
}
101108

102109
book.build()?;

0 commit comments

Comments
 (0)