1 files changed, 7 insertions, 5 deletions
diff --git a/src/source_map.rs b/src/source_map.rs
index dee5e4f7601..ed081adcd86 100644
--- a/src/source_map.rs
+++ b/src/source_map.rs
@@ -51,11 +51,13 @@ impl<'a> SpanUtils for SnippetProvider<'a> {
     }
 
     fn span_before(&self, original: Span, needle: &str) -> BytePos {
-        self.opt_span_before(original, needle).expect(&format!(
-            "bad span: {}: {}",
-            needle,
-            self.span_to_snippet(original).unwrap()
-        ))
+        self.opt_span_before(original, needle).unwrap_or_else(|| {
+            panic!(
+                "bad span: {}: {}",
+                needle,
+                self.span_to_snippet(original).unwrap()
+            )
+        })
     }
 
     fn opt_span_after(&self, original: Span, needle: &str) -> Option<BytePos> {