diff --git a/Cargo.lock b/Cargo.lock index ea4302a78..4aa7d74a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4792,9 +4792,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lol_html" -version = "2.9.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00aad58f6ec3990e795943872f13651e7a5fa59dca2c8f31a74faf8a0e0fb652" +checksum = "2ae574a677ef0443a0bd3c291f0cab9d1e61a3ad85a1515e3cfc0bc720d5a48e" dependencies = [ "bitflags 2.11.1", "cfg-if", diff --git a/crates/bin/docs_rs_web/Cargo.toml b/crates/bin/docs_rs_web/Cargo.toml index 0b8f5025e..25e1f74ad 100644 --- a/crates/bin/docs_rs_web/Cargo.toml +++ b/crates/bin/docs_rs_web/Cargo.toml @@ -47,7 +47,7 @@ font-awesome-as-a-crate = { path = "../../lib/font-awesome-as-a-crate" } futures-util = { workspace = true } getrandom = "0.4.0" http = { workspace = true } -lol_html = "2.0.0" +lol_html = "3.0.0" mime = { workspace = true } num_cpus = { workspace = true } opentelemetry = { workspace = true } diff --git a/crates/bin/docs_rs_web/src/utils/html_rewrite.rs b/crates/bin/docs_rs_web/src/utils/html_rewrite.rs index 307f10a58..2ee73e07c 100644 --- a/crates/bin/docs_rs_web/src/utils/html_rewrite.rs +++ b/crates/bin/docs_rs_web/src/utils/html_rewrite.rs @@ -107,14 +107,16 @@ where Ok(()) }; - let settings = Settings { - element_content_handlers: vec![ + let settings = Settings::new() + .append_element_content_handler( // Append `style.css` stylesheet after all head elements. element!("head", |head: &mut Element| { head.append(&head_html, ContentType::Html); Ok(()) }), - element!("body", body_handler), + ) + .append_element_content_handler(element!("body", body_handler)) + .append_element_content_handler( // Append `vendored.css` before `rustdoc.css`, so that the duplicate copy of // `normalize.css` will be overridden by the later version. // @@ -134,13 +136,11 @@ where Ok(()) } ), - ], - memory_settings: MemorySettings { - max_allowed_memory_usage, - ..MemorySettings::default() - }, - ..Settings::default() - }; + ) + .with_memory_settings( + MemorySettings::new() + .with_max_allowed_memory_usage(max_allowed_memory_usage), + ); let mut rewriter = HtmlRewriter::new(settings, move |chunk: &[u8]| { // send the result back to the main rewriter when its coming in.