mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rustbook to support new test linking in reference

Browse Source
This commit is contained in:
Eric Huss 2024-10-23 10:52:12 -07:00
parent 87fb4eaa9d
commit df8551b60a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap/src/core/build_steps/doc.rs
View File

@ -170,7 +170,14 @@ fn run(self, builder: &Builder<'_>) {
builder.add_rustc_lib_path(compiler, &mut rustbook_cmd);
}
rustbook_cmd.arg("build").arg(&src).arg("-d").arg(&out).run(builder);
rustbook_cmd
.arg("build")
.arg(&src)
.arg("-d")
.arg(&out)
.arg("--rust-root")
.arg(&builder.src)
.run(builder);
for lang in &self.languages {
let out = out.join(lang);

9
src/tools/rustbook/src/main.rs
View File

@ -22,6 +22,11 @@ fn main() {
.required(false)
.value_parser(clap::value_parser!(String));
let root_arg = arg!(--"rust-root" <ROOT_DIR>
"Path to the root of the rust source tree")
.required(false)
.value_parser(clap::value_parser!(PathBuf));
let dir_arg = arg!([dir] "Root directory for the book\n\
(Defaults to the current directory when omitted)")
.value_parser(clap::value_parser!(PathBuf));
@ -37,6 +42,7 @@ fn main() {
.about("Build the book from the markdown files")
.arg(d_arg)
.arg(l_arg)
.arg(root_arg)
.arg(&dir_arg),
)
.subcommand(
@ -96,7 +102,8 @@ pub fn build(args: &ArgMatches) -> Result3<()> {
}
if book.config.get_preprocessor("spec").is_some() {
book.with_preprocessor(Spec::new());
let rust_root = args.get_one::<PathBuf>("rust-root").cloned();
book.with_preprocessor(Spec::new(rust_root)?);
}
book.build()?;