From 94aebf7810b16b9adae3084ef92f450bc191bca7 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Thu, 14 Jul 2022 13:17:39 +0200 Subject: [PATCH] d-bootstrap-use-local-css Forwarded: not-needed =================================================================== Gbp-Pq: Topic build Gbp-Pq: Name d-bootstrap-use-local-css.patch --- src/bootstrap/src/core/build_steps/doc.rs | 27 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs index 8511533c54..2a60c64468 100644 --- a/src/bootstrap/src/core/build_steps/doc.rs +++ b/src/bootstrap/src/core/build_steps/doc.rs @@ -392,7 +392,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(format!("static.files/{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); @@ -401,11 +421,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"); - } cmd.run(builder); } -- 2.30.2