Skip to content

Commit

Permalink
repr: fix merge skew prohibiting std::panic::catch_unwind
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean Loiselle committed Dec 5, 2022
1 parent 08da877 commit b7310e3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/repr/src/row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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)]]);
Expand Down

0 comments on commit b7310e3

Please sign in to comment.