From 742a28a57a603365a03248ef66c0810b2bcb1472 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 24 Feb 2021 21:32:09 +0100
Subject: [PATCH] =?UTF-8?q?Cleaner=20control=20flow=20in=20for=20loop=20ev?=
 =?UTF-8?q?aluation=20=F0=9F=A7=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/eval/mod.rs | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index 3cf978606..c66f2ad28 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -462,7 +462,7 @@ impl Eval for ExprFor {
 
     fn eval(&self, ctx: &mut EvalContext) -> Self::Output {
         macro_rules! iter {
-            (for ($($binding:ident => $value:ident),*) in $iter:expr) => {
+            (for ($($binding:ident => $value:ident),*) in $iter:expr) => {{
                 let mut output = vec![];
                 ctx.scopes.push();
 
@@ -482,42 +482,43 @@ impl Eval for ExprFor {
                 }
 
                 ctx.scopes.pop();
-                return Value::Template(output);
-            };
+                Value::Template(output)
+            }};
         }
 
         let iter = self.iter.eval(ctx);
         match (self.pattern.clone(), iter) {
             (ForPattern::Value(v), Value::Str(string)) => {
-                iter!(for (v => value) in string.chars().map(|c| Value::Str(c.into())));
+                iter!(for (v => value) in string.chars().map(|c| Value::Str(c.into())))
             }
             (ForPattern::Value(v), Value::Array(array)) => {
-                iter!(for (v => value) in array.into_iter());
+                iter!(for (v => value) in array.into_iter())
             }
             (ForPattern::KeyValue(i, v), Value::Array(array)) => {
-                iter!(for (i => idx, v => value) in array.into_iter().enumerate());
+                iter!(for (i => idx, v => value) in array.into_iter().enumerate())
             }
             (ForPattern::Value(v), Value::Dict(dict)) => {
-                iter!(for (v => value) in dict.into_iter().map(|p| p.1));
+                iter!(for (v => value) in dict.into_iter().map(|p| p.1))
             }
             (ForPattern::KeyValue(k, v), Value::Dict(dict)) => {
-                iter!(for (k => key, v => value) in dict.into_iter());
+                iter!(for (k => key, v => value) in dict.into_iter())
             }
 
             (ForPattern::KeyValue(_, _), Value::Str(_)) => {
                 ctx.diag(error!(self.pattern.span(), "mismatched pattern"));
+                Value::Error
             }
 
-            (_, Value::Error) => {}
             (_, iter) => {
-                ctx.diag(error!(
-                    self.iter.span(),
-                    "cannot loop over {}",
-                    iter.type_name(),
-                ));
+                if iter != Value::Error {
+                    ctx.diag(error!(
+                        self.iter.span(),
+                        "cannot loop over {}",
+                        iter.type_name(),
+                    ));
+                }
+                Value::Error
             }
         }
-
-        Value::Error
     }
 }