Simplify some rustdoc template structs

GuillaumeGomez · GuillaumeGomez · commit 772ec94c5d46 · 2024-09-04T22:38:16.000+02:00
diff --git a/src/utils/html.rs b/src/utils/html.rs
@@ -19,8 +19,8 @@ pub(crate) fn rewrite_lol(
     use lol_html::{HtmlRewriter, MemorySettings, Settings};
 
     let head_html = Head::new(data).render().unwrap();
-    let vendored_html = Vendored::new(data).render().unwrap();
-    let body_html = Body::new(data).render().unwrap();
+    let vendored_html = Vendored.render().unwrap();
+    let body_html = Body.render().unwrap();
     let topbar_html = Topbar::new(data).render().unwrap();
 
     // Before: <body> ... rustdoc content ... </body>
diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs
@@ -36,9 +36,28 @@ macro_rules! rustdoc_page {
     };
 }
 
-rustdoc_page!(Head, "rustdoc/head.html");
-rustdoc_page!(Vendored, "rustdoc/vendored.html");
-rustdoc_page!(Body, "rustdoc/body.html");
+#[derive(Template)]
+#[template(path = "rustdoc/head.html")]
+pub struct Head<'a> {
+    rustdoc_css_file: &'a Option<String>,
+}
+
+impl<'a> Head<'a> {
+    pub fn new(inner: &'a RustdocPage) -> Self {
+        Self {
+            rustdoc_css_file: &inner.metadata.rustdoc_css_file,
+        }
+    }
+}
+
+#[derive(Template)]
+#[template(path = "rustdoc/vendored.html")]
+pub struct Vendored;
+
+#[derive(Template)]
+#[template(path = "rustdoc/body.html")]
+pub struct Body;
+
 rustdoc_page!(Topbar, "rustdoc/topbar.html", get_metadata);
 
 /// Holds all data relevant to templating
diff --git a/templates/crate/source.html b/templates/crate/source.html
@@ -6,7 +6,6 @@
 {%- endblock title -%}
 
 {%- block topbar -%}
-  {%- set metadata = metadata -%}
   {%- set current_target = String::new() -%}
   {%- set latest_version = "" -%}
   {%- set latest_path = "" -%}
diff --git a/templates/rustdoc/head.html b/templates/rustdoc/head.html
@@ -1,5 +1,5 @@
 {%- import "macros.html" as macros -%}
-        <link rel="stylesheet" href="/-/static/{{metadata.rustdoc_css_file|unwrap}}?{{ crate::BUILD_VERSION|slugify }}" media="all" />
+        <link rel="stylesheet" href="/-/static/{{rustdoc_css_file|unwrap}}?{{ crate::BUILD_VERSION|slugify }}" media="all" />
 
         <link rel="search" href="/-/static/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs" />
 
