Merge pull request #110 from mkantor/upgrade-handlebars

Upgrade handlebars to 5.x.
mkantor · May 22, 2024 · 953c53b · 953c53b
2 parents 11a8542 + 76c9dad
commit 953c53b
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 80 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ actix-web = "3.3.3"
 anyhow = "1.0.83"
 bytes = "0.5.6"
 futures = "0.3.30"
-handlebars = "4.5.0"
+handlebars = "5.1.2"
 log = "0.4.21"
 mime = "0.3.17"
 mime_guess = "2.0.4"

diff --git a/src/content/content_engine.rs b/src/content/content_engine.rs
@@ -17,7 +17,7 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 #[error(
   "Failed to register handlebars template{}.",
-  .source.template_name.as_ref().map(|known_name| format!(" '{}'", known_name)).unwrap_or_default(),
+  .source.name().map(|known_name| format!(" '{}'", known_name)).unwrap_or_default(),
 )]
 pub struct TemplateError {
     #[from]

diff --git a/src/content/content_item.rs b/src/content/content_item.rs
@@ -11,10 +11,7 @@ use thiserror::Error;
 /// Indicates that there was an error during rendering.
 #[derive(Error, Debug)]
 pub enum RenderingFailedError {
-    #[error(
-        "Rendering failed for handlebars template: {}",
-        .source
-    )]
+    #[error(transparent)]
     TemplateRenderError {
         #[from]
         source: handlebars::RenderError,