bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #138406 - ehuss:update-mdbook, r=jieyouxu

Browse source 
Update mdbook to 0.4.47

This updates mdbook to bring in an important fix that enables the `output.html.hash-files` option to deal with network caching.

Changelog:
https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0446
https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0447
This commit is contained in:
Matthias Krüger 2025-03-13 17:44:08 +01:00 • committed by GitHub
commit 6db8e5ade5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tools/rustbook/Cargo.lock
View file

@ -552,6 +552,12 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hex"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]] [[package]]
name = "html5ever" name = "html5ever"
version = "0.27.0" version = "0.27.0"
@ -874,9 +880,9 @@ dependencies = [
[[package]] [[package]]
name = "mdbook" name = "mdbook"
version = "0.4.45" version = "0.4.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07d36d96ffe1b5b16ddf2bc80b3b26bb7a498b2a6591061250bf0af8e8095ad" checksum = "7e1a8fe3a4a01f28dab245c474cb7b95ccb4d3d2f17a5419a3d949f474c45e84"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"anyhow", "anyhow",
@ -886,6 +892,7 @@ dependencies = [
"elasticlunr-rs", "elasticlunr-rs",
"env_logger", "env_logger",
"handlebars", "handlebars",
"hex",
"log", "log",
"memchr", "memchr",
"once_cell", "once_cell",
@ -894,6 +901,7 @@ dependencies = [
"regex", "regex",
"serde", "serde",
"serde_json", "serde_json",
"sha2",
"shlex", "shlex",
"tempfile", "tempfile",
"toml 0.5.11", "toml 0.5.11",

2
src/tools/rustbook/Cargo.toml
View file

@ -15,6 +15,6 @@ mdbook-i18n-helpers = "0.3.3"
mdbook-spec = { path = "../../doc/reference/mdbook-spec" } mdbook-spec = { path = "../../doc/reference/mdbook-spec" }
[dependencies.mdbook] [dependencies.mdbook]
version = "0.4.45" version = "0.4.47"
default-features = false default-features = false
features = ["search"] features = ["search"]

1
src/tools/rustbook/src/main.rs
View file

@ -151,6 +151,7 @@ fn get_book_dir(args: &ArgMatches) -> PathBuf {
fn load_book(book_dir: &Path) -> Result3<MDBook> { fn load_book(book_dir: &Path) -> Result3<MDBook> {
let mut book = MDBook::load(book_dir)?; let mut book = MDBook::load(book_dir)?;
book.config.set("output.html.input-404", "").unwrap(); book.config.set("output.html.input-404", "").unwrap();
book.config.set("output.html.hash-files", true).unwrap();
Ok(book) Ok(book)
} }