Drop tera context sooner

rust-lang · Aug 31, 2024 · 1416cf3 · 1416cf3
1 parent 7f6bb33
commit 1416cf3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/assets.rs b/src/assets.rs
@@ -145,7 +145,7 @@ fn build_tera_cache() -> Fallible<Tera> {
 }
 
 #[allow(unused_variables)]
-pub fn render_template<C: Serialize>(name: &str, context: &C) -> Fallible<String> {
+pub fn render_template<C: Serialize>(name: &str, context: C) -> Fallible<String> {
     // On debug builds the cache is rebuilt every time to pick up changed templates
     let tera_owned: Tera;
     let tera;
@@ -161,7 +161,8 @@ pub fn render_template<C: Serialize>(name: &str, context: &C) -> Fallible<String
         tera = &TERA_CACHE;
     }
 
+    let tera_context = tera::Context::from_serialize(context)?;
     Ok(tera
-        .render(name, &tera::Context::from_serialize(context)?)
+        .render(name, &tera_context)
         .map_err(|e| failure::format_err!("{:?}", e))?)
 }
diff --git a/src/report/html.rs b/src/report/html.rs
@@ -256,10 +256,6 @@ fn write_report<W: ReportWriter>(
     };
 
     info!("generating {}", to);
-    let rendered = assets::render_template("report/results.html", &context)
-        .context("rendering template report/results.html")?;
-    let html = minifier::html::minify(&rendered);
-    dest.write_string(to, html.into(), &mime::TEXT_HTML)?;
 
     if output_templates {
         dest.write_string(
@@ -269,6 +265,11 @@ fn write_report<W: ReportWriter>(
         )?;
     }
 
+    let rendered = assets::render_template("report/results.html", context)
+        .context("rendering template report/results.html")?;
+    let html = minifier::html::minify(&rendered);
+    dest.write_string(to, html.into(), &mime::TEXT_HTML)?;
+
     Ok(())
 }