Rollup merge of #85174 - GuillaumeGomez:doc-code-block-border-radius, r=jsha

[rust.git] / src / librustdoc / html / layout.rs
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs

index dc29add9333141ac7b1b7bac92b20a0f4f05dcfd..ec04c94dc11f9131c2b8c45dcb1dc9bfe3a97059 100644 (file)
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -34,6 +34,12 @@
      crate static_extra_scripts: &'a [&'a str],
  }
  
+impl<'a> Page<'a> {
+    crate fn get_static_root_path(&self) -> &str {
+        self.static_root_path.unwrap_or(self.root_path)
+    }
+}
+
  crate fn render<T: Print, S: Print>(
      layout: &Layout,
      page: &Page<'_>,
@@ -41,7 +47,7 @@
      t: T,
      style_files: &[StylePath],
  ) -> String {
-    let static_root_path = page.static_root_path.unwrap_or(page.root_path);
+    let static_root_path = page.get_static_root_path();
      format!(
          "<!DOCTYPE html>\
  <html lang=\"en\">\
@@ -99,7 +105,7 @@
                             placeholder=\"Click or press ‘S’ to search, ‘?’ for more options…\" \
                             type=\"search\">\
                  </div>\
-                <button type=\"button\" class=\"help-button\">?</button>
+                <button type=\"button\" id=\"help-button\">?</button>
                  <a id=\"settings-menu\" href=\"{root_path}settings.html\">\
                      <img src=\"{static_root_path}wheel{suffix}.svg\" \
                           width=\"18\" height=\"18\" \