From: Debian Rust Maintainers Date: Thu, 14 Jul 2022 13:17:39 +0200 Subject: d-bootstrap-use-local-css =================================================================== --- src/bootstrap/doc.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) Index: rust/src/bootstrap/doc.rs =================================================================== --- rust.orig/src/bootstrap/doc.rs +++ rust/src/bootstrap/doc.rs @@ -360,7 +360,27 @@ impl Step for Standalone { .arg("--index-page") .arg(&builder.src.join("src/doc/index.md")) .arg("--markdown-playground-url") - .arg("https://play.rust-lang.org/") + .arg("https://play.rust-lang.org/"); + + // Debian: librustdoc now generates a resource-suffix for static + // files with rustc_hash::FxHasher, so we need to find it. + let _dir = out.join("static.files"); + if _dir.is_dir() { + let _css = _dir.read_dir().expect("Debian: failed to read static.files/ when is_dir() == true") + .find_map(|entry| entry.ok().map(|entry| { + let name = entry.file_name().into_string() + .expect("Debian: rustc files should have UTF-8 name"); + if name.starts_with("rustdoc-") && name.ends_with(".css") { + Some(name) + } else { None } + })).flatten(); + if let Some(name) = _css { + cmd.arg("--markdown-css").arg(name); + } + } + + cmd.arg("--markdown-css") + .arg("rust.css") .arg("-o") .arg(&out) .arg(&path); @@ -369,11 +389,6 @@ impl Step for Standalone { cmd.arg("--disable-minification"); } - if filename == "not_found.md" { - cmd.arg("--markdown-css").arg("https://doc.rust-lang.org/rust.css"); - } else { - cmd.arg("--markdown-css").arg("rust.css"); - } builder.run(&mut cmd); }