Bring back error binding top level and resolve a warning

mitsuhiko · Nov 6, 2024 · 816f4c4 · 816f4c4
1 parent 96b879a
commit 816f4c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -13,6 +13,7 @@ minijinja = { path = "../minijinja", default-features = false, features = [
     "unstable_machinery",
     "multi_template",
     "builtins",
+    "serde",
 ] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"

diff --git a/minijinja/src/vm/mod.rs b/minijinja/src/vm/mod.rs
@@ -242,9 +242,10 @@ impl<'env> Vm<'env> {
 
             // if we only have two arguments that we pull from the stack, we
             // can assign them to a and b.  This slightly reduces the amount of
-            // code bloat generated here.
+            // code bloat generated here.  Same with the error.
             let a;
             let b;
+            let mut err;
 
             macro_rules! func_binop {
                 ($method:ident) => {{
@@ -264,7 +265,7 @@ impl<'env> Vm<'env> {
 
             macro_rules! bail {
                 ($err:expr) => {{
-                    let mut err = $err;
+                    err = $err;
                     process_err(&mut err, pc, state);
                     return Err(err);
                 }};