From 52e068df204ed62b0b93e3ad98a80479b4c6272c Mon Sep 17 00:00:00 2001 From: René Kijewski Date: Mon, 28 Mar 2022 16:10:45 +0200 Subject: Expose the fact that templates implement Display This is a quite useful feature, because you can use templates in format!(), format_args!(), etc. --- askama_shared/src/lib.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/askama_shared/src/lib.rs b/askama_shared/src/lib.rs index b656c53..ecf3d07 100644 --- a/askama_shared/src/lib.rs +++ b/askama_shared/src/lib.rs @@ -29,7 +29,7 @@ mod parser; /// Main `Template` trait; implementations are generally derived /// /// If you need an object-safe template, use [`DynTemplate`]. -pub trait Template { +pub trait Template: fmt::Display { /// Helper method which allocates a new `String` and renders into it fn render(&self) -> Result { let mut buf = String::with_capacity(Self::SIZE_HINT); @@ -92,6 +92,12 @@ impl DynTemplate for T { } } +impl fmt::Display for dyn DynTemplate { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + self.dyn_render_into(f).map_err(|_| ::std::fmt::Error {}) + } +} + #[derive(Debug)] struct Config<'a> { dirs: Vec, @@ -603,10 +609,23 @@ mod tests { const MIME_TYPE: &'static str = "text/plain; charset=utf-8"; } + impl fmt::Display for Test { + #[inline] + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + self.render_into(f).map_err(|_| fmt::Error {}) + } + } + fn render(t: &dyn DynTemplate) -> String { t.dyn_render().unwrap() } - assert_eq!(render(&Test), "test"); + let test = &Test as &dyn DynTemplate; + + assert_eq!(render(test), "test"); + + assert_eq!(test.to_string(), "test"); + + assert_eq!(format!("{}", test), "test"); } } -- cgit