From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Jan 2021 00:24:43 +0000 (+0000)
Subject: nwtemplates: move error conversion into nwtemplates
X-Git-Tag: otter-0.3.0~13
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=46104278b206fab0c27460d535e52bfb11a32714;p=otter.git

nwtemplates: move error conversion into nwtemplates

tera::Error is not Sync so we can't use anyhow on it

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/nwtemplates.rs b/src/nwtemplates.rs
index af19784a..9680baf8 100644
--- a/src/nwtemplates.rs
+++ b/src/nwtemplates.rs
@@ -30,11 +30,13 @@ pub fn init() {
   })
 }
 
-#[throws(tera::Error)]
+#[throws(anyhow::Error)]
 pub fn render<D: Serialize>(template_name: &str, data: &D) -> String {
   fn get_tera() -> MappedRwLockReadGuard<'static, tera::Tera> {
     let g = STATE.read();
     RwLockReadGuard::map(g, |g| &g.as_ref().unwrap().tera)
   }
-  get_tera().render(template_name, data)?
+  get_tera().render(template_name, data)
+    .map_err(|e| anyhow!(e.to_string()))
+    ?
 }
diff --git a/src/spec.rs b/src/spec.rs
index bcf5a610..43fef1d1 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -510,8 +510,8 @@ pub mod implementation {
           };
           nwtemplates::render("token-other.tera", &data)
         },
-      }.map_err(|e| anyhow!(e.to_string()))
-        .context("render email template")?;
+      }
+      .context("render email template")?;
 
       let messagefile = (||{
         let mut messagefile = tempfile::tempfile().context("tempfile")?;