Clean up some printlns and explain eating the expression errors.

fastly · Jan 13, 2025 · 4dbaad7 · 4dbaad7
1 parent 13d4282
commit 4dbaad7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/esi/src/expression.rs b/esi/src/expression.rs
@@ -1,5 +1,6 @@
 use fastly::http::Method;
 use fastly::Request;
+use log::debug;
 use regex::RegexBuilder;
 use std::fmt::Write;
 use std::iter::Peekable;
@@ -15,7 +16,9 @@ pub fn try_evaluate_interpolated(
 ) -> Option<Value> {
     evaluate_interpolated(cur, ctx)
         .map_err(|e| {
-            println!("Error while evaluating interpolated expression: {e}");
+            // We eat the error here because a failed expression should result in an empty result
+            // and not prevent the rest of the file from processing.
+            debug!("Error while evaluating interpolated expression: {e}");
         })
         .ok()
 }

diff --git a/esi/src/lib.rs b/esi/src/lib.rs
@@ -528,9 +528,7 @@ fn event_receiver(
                 queue.push_back(Element::Raw(result.to_string().into_bytes()));
             }
         }
-        Event::ESI(Tag::When { .. }) => {
-            println!("Shouldn't be possible to get a When tag here");
-        }
+        Event::ESI(Tag::When { .. }) => unreachable!(),
         Event::ESI(Tag::Choose {
             when_branches,
             otherwise_events,
@@ -557,7 +555,7 @@ fn event_receiver(
                         break;
                     }
                 } else {
-                    println!("Somehow got something other than a When in a Choose: {when:?}",);
+                    unreachable!()
                 }
             }