From 7e6eda2f69fbe104be3823cabc31af9307b83a38 Mon Sep 17 00:00:00 2001
From: bott <mhpoin@gmail.com>
Date: Sun, 11 Nov 2018 21:53:54 +0100
Subject: Fix write expression wrapper

---
 askama_derive/src/generator.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'askama_derive/src/generator.rs')

diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs
index 38eca55..8b75e21 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_derive/src/generator.rs
@@ -630,7 +630,7 @@ impl<'a> Generator<'a> {
             buf.writeln(&format!("writer.write_str({:#?})?;", &buf_lit.buf));
             return;
         }
-    
+
         let mut buf_format = Buffer::new(0);
         let mut buf_expr = Buffer::new(buf.indent + 1);
         let mut expr_cache = HashMap::with_capacity(self.buf_writable.len());
@@ -646,23 +646,20 @@ impl<'a> Generator<'a> {
                     let wrapped = self.visit_expr(&mut expr_buf, s);
                     let expression = match (wrapped, &self.input.escaping) {
                         (Wrapped, &Html) | (Wrapped, &None) | (Unwrapped, &None) => {
-                            expr_buf.buf.clone()
+                            expr_buf.buf
                         }
                         (Unwrapped, &Html) => {
-                            format!(
-                                "::askama::MarkupDisplay::from(&{})",
-                                expr_buf.buf.clone()
-                            )
+                            format!("::askama::MarkupDisplay::from(&{})", expr_buf.buf)
                         }
                     };
 
-                    let id = expr_cache.entry(expression).or_insert_with(|| {
+                    let id = expr_cache.entry(expression.clone()).or_insert_with(|| {
                         let id = self.named;
                         self.named += 1;
 
                         buf_expr.write(&format!("expr{} = ", id));
                         buf_expr.write("&");
-                        buf_expr.write(&expr_buf.buf);
+                        buf_expr.write(&expression);
                         buf_expr.writeln(",");
 
                         id
-- 
cgit