Do not do eager formatting of error strings

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

vortex-array/src/arrays/list/array.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 
 use num_traits::AsPrimitive;
 use vortex_dtype::{DType, NativePType, match_each_integer_ptype, match_each_native_ptype};
-use vortex_error::{VortexExpect, VortexResult, vortex_bail, vortex_ensure};
+use vortex_error::{VortexExpect, VortexResult, vortex_bail, vortex_ensure, vortex_err};
 
 use crate::arrays::{ListVTable, PrimitiveVTable};
 use crate::compute::{min_max, sub_scalar};
@@ -191,13 +191,13 @@ impl ListArray {
 
                 vortex_ensure!(
                     max_offset
-                        <= P::try_from(elements.len()).vortex_expect(&format!(
-                            "Offsets type {} must be able to fit elements length {}",
-                            <P as NativePType>::PTYPE,
-                            elements.len()
-                        )),
-                    "Max offset {max_offset} is beyond the length of the elements array {}",
-                    elements.len()
+                        <= P::try_from(elements.len())
+                            .map_err(|e| vortex_err!(
+                                "Offsets type {} must be able to fit elements length {}",
+                                <P as NativePType>::PTYPE,
+                                elements.len()
+                            ))
+                            .vortex_expect("Offsets type must fit elements length")
                 );
             })
         } else {

vortex-array/src/patches.rs

@@ -85,7 +85,11 @@ impl PatchesMetadata {
     #[inline]
     pub fn chunk_offsets_dtype(&self) -> Option<DType> {
         self.chunk_offsets_ptype
-            .map(|t| PType::try_from(t).vortex_expect(&format!("invalid i32 value {t} for PType")))
+            .map(|t| {
+                PType::try_from(t)
+                    .map_err(|e| vortex_err!("invalid i32 value {t} for PType: {}", e))
+                    .vortex_expect("invalid i32 value for PType")
+            })
             .map(|ptype| DType::Primitive(ptype, NonNullable))
     }
 

vortex-session/src/lib.rs

@@ -10,7 +10,7 @@ use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
 use dashmap::{DashMap, Entry};
-use vortex_error::{VortexExpect, vortex_panic};
+use vortex_error::{VortexExpect, vortex_err, vortex_panic};
 
 /// A Vortex session encapsulates the set of extensible arrays, layouts, compute functions, dtypes,
 /// etc. that are available for use in a given context.
@@ -77,10 +77,10 @@ impl SessionExt for VortexSession {
         Ref(self
             .0
             .get(&TypeId::of::<V>())
-            .vortex_expect(&format!(
-                "Session has not been initialized with {}",
-                type_name::<V>()
-            ))
+            .ok_or_else(|| {
+                vortex_err!("Session has not been initialized with {}", type_name::<V>())
+            })
+            .vortex_expect("Unitialized session variable")?
             .map(|v| {
                 (**v)
                     .as_any()
@@ -96,10 +96,10 @@ impl SessionExt for VortexSession {
         RefMut(
             self.0
                 .get_mut(&TypeId::of::<V>())
-                .vortex_expect(&format!(
-                    "Session has not been initialized with {}",
-                    type_name::<V>()
-                ))
+                .ok_or_else(|| {
+                    vortex_err!("Session has not been initialized with {}", type_name::<V>())
+                })
+                .vortex_expect("Unitialized session variable")?
                 .map(|v| {
                     (**v)
                         .as_any_mut()