Use unqualified vortex_err macro in PiecewiseSequential

Signed-off-by: Daniel King <dan@spiraldb.com>

Author: danking

vortex-array/src/arrays/piecewise_sequential/mod.rs

@@ -12,6 +12,7 @@ use vortex_buffer::BufferMut;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_ensure;
+use vortex_error::vortex_err;
 
 use crate::ArrayRef;
 use crate::array::ArrayView;
@@ -69,7 +70,7 @@ fn check_index_array(name: &str, array: &ArrayRef) -> VortexResult<()> {
 pub(crate) fn checked_range_end(start: usize, length: usize) -> VortexResult<usize> {
     start
         .checked_add(length)
-        .ok_or_else(|| vortex_error::vortex_err!("PiecewiseSequentialArray range overflows usize"))
+        .ok_or_else(|| vortex_err!("PiecewiseSequentialArray range overflows usize"))
 }
 
 pub(crate) fn materialize_ranges<S, L>(
@@ -90,9 +91,9 @@ where
         let start: usize = start.as_();
         let length: usize = length.as_();
         let end = checked_range_end(start, length)?;
-        computed_len = computed_len.checked_add(length).ok_or_else(|| {
-            vortex_error::vortex_err!("PiecewiseSequentialArray output length overflows usize")
-        })?;
+        computed_len = computed_len
+            .checked_add(length)
+            .ok_or_else(|| vortex_err!("PiecewiseSequentialArray output length overflows usize"))?;
 
         values.extend((start..end).map(|value| value as u64));
     }
@@ -119,16 +120,16 @@ where
     for (&start, &length) in starts.iter().zip_eq(lengths) {
         let start: usize = start.as_();
         let length: usize = length.as_();
-        let end = start.checked_add(length).ok_or_else(|| {
-            vortex_error::vortex_err!("PiecewiseSequentialArray range overflows usize")
-        })?;
+        let end = start
+            .checked_add(length)
+            .ok_or_else(|| vortex_err!("PiecewiseSequentialArray range overflows usize"))?;
         vortex_ensure!(
             end <= source_len,
             "PiecewiseSequentialArray range {start}..{end} exceeds source length {source_len}"
         );
-        computed_len = computed_len.checked_add(length).ok_or_else(|| {
-            vortex_error::vortex_err!("PiecewiseSequentialArray output length overflows usize")
-        })?;
+        computed_len = computed_len
+            .checked_add(length)
+            .ok_or_else(|| vortex_err!("PiecewiseSequentialArray output length overflows usize"))?;
     }
 
     vortex_ensure!(

vortex-array/src/arrays/piecewise_sequential/vtable.rs

@@ -85,14 +85,10 @@ impl VTable for PiecewiseSequential {
         );
         let starts = slots[PiecewiseSequentialSlots::STARTS]
             .as_ref()
-            .ok_or_else(|| {
-                vortex_error::vortex_err!("PiecewiseSequentialArray starts slot must be present")
-            })?;
+            .ok_or_else(|| vortex_err!("PiecewiseSequentialArray starts slot must be present"))?;
         let lengths = slots[PiecewiseSequentialSlots::LENGTHS]
             .as_ref()
-            .ok_or_else(|| {
-                vortex_error::vortex_err!("PiecewiseSequentialArray lengths slot must be present")
-            })?;
+            .ok_or_else(|| vortex_err!("PiecewiseSequentialArray lengths slot must be present"))?;
         check_index_arrays(starts, lengths)
     }