From b7310e3974a0b87ca480df4541864cb72c979a47 Mon Sep 17 00:00:00 2001
From: Sean Loiselle <sean@materialize.io>
Date: Mon, 5 Dec 2022 16:41:53 -0500
Subject: [PATCH] repr: fix merge skew prohibiting std::panic::catch_unwind

---
 src/repr/src/row.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/repr/src/row.rs b/src/repr/src/row.rs
index 5778d821c9da..412261356500 100644
--- a/src/repr/src/row.rs
+++ b/src/repr/src/row.rs
@@ -2270,7 +2270,6 @@ mod tests {
     #[test]
     fn test_range_errors() {
         fn test_range_errors_inner<'a>(datums: Vec<Vec<Datum<'a>>>) -> Result<(), RangeError> {
-            println!("datums {:?}", datums);
             let mut row = Row::default();
             let row_len = row.byte_len();
             let mut packer = row.packer();
@@ -2319,7 +2318,9 @@ mod tests {
             vec![vec![Datum::Null], vec![Datum::Int32(2)]],
             vec![vec![Datum::Int32(1)], vec![Datum::Null]],
         ] {
-            assert!(std::panic::catch_unwind(|| test_range_errors_inner(panicking_case)).is_err());
+            assert!(
+                mz_ore::panic::catch_unwind(|| test_range_errors_inner(panicking_case)).is_err()
+            );
         }
 
         let e = test_range_errors_inner(vec![vec![Datum::Int32(2)], vec![Datum::Int32(1)]]);