add polars_err!(col_not_found= shortcut

crates/polars-arrow/src/legacy/kernels/string.rs

@@ -1,18 +1,18 @@
 use crate::array::{Array, ArrayRef, UInt32Array, Utf8ViewArray};
 use crate::buffer::Buffer;
 use crate::datatypes::ArrowDataType;
-use crate::legacy::trusted_len::TrustedLenPush;
 
 pub fn utf8view_len_bytes(array: &Utf8ViewArray) -> ArrayRef {
-    let values = array.len_iter().collect::<Vec<_>>();
-    let values: Buffer<_> = values.into();
+    let values: Buffer<_> = array.len_iter().collect();
     let array = UInt32Array::new(ArrowDataType::UInt32, values, array.validity().cloned());
     Box::new(array)
 }
 
 pub fn string_len_chars(array: &Utf8ViewArray) -> ArrayRef {
-    let values = array.values_iter().map(|x| x.chars().count() as u32);
-    let values: Buffer<_> = Vec::from_trusted_len_iter(values).into();
+    let values: Buffer<_> = array
+        .values_iter()
+        .map(|x| x.chars().count() as u32)
+        .collect();
     let array = UInt32Array::new(ArrowDataType::UInt32, values, array.validity().cloned());
     Box::new(array)
 }

crates/polars-core/src/frame/explode.rs

@@ -305,11 +305,9 @@ impl DataFrame {
 
         // values will all be placed in single column, so we must find their supertype
         let schema = self.schema();
-        let mut iter = on.iter().map(|v| {
-            schema
-                .get(v)
-                .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", v))
-        });
+        let mut iter = on
+            .iter()
+            .map(|v| schema.get(v).ok_or_else(|| polars_err!(col_not_found = v)));
         let mut st = iter.next().unwrap()?.clone();
         for dt in iter {
             st = try_get_supertype(&st, dt?)?;

crates/polars-core/src/frame/mod.rs

@@ -189,7 +189,7 @@ impl DataFrame {
     /// Get the index of the column.
     fn check_name_to_idx(&self, name: &str) -> PolarsResult<usize> {
         self.get_column_index(name)
-            .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", name))
+            .ok_or_else(|| polars_err!(col_not_found = name))
     }
 
     fn check_already_present(&self, name: &str) -> PolarsResult<()> {
@@ -1361,7 +1361,7 @@ impl DataFrame {
     /// Get column index of a [`Series`] by name.
     pub fn try_get_column_index(&self, name: &str) -> PolarsResult<usize> {
         self.get_column_index(name)
-            .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", name))
+            .ok_or_else(|| polars_err!(col_not_found = name))
     }
 
     /// Select a single column by name.
@@ -1560,7 +1560,7 @@ impl DataFrame {
                 .map(|name| {
                     let idx = *name_to_idx
                         .get(name.as_str())
-                        .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", name))?;
+                        .ok_or_else(|| polars_err!(col_not_found = name))?;
                     Ok(self
                         .select_at_idx(idx)
                         .unwrap()
@@ -1588,7 +1588,7 @@ impl DataFrame {
                 .map(|name| {
                     let idx = *name_to_idx
                         .get(name.as_str())
-                        .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", name))?;
+                        .ok_or_else(|| polars_err!(col_not_found = name))?;
                     Ok(self.select_at_idx(idx).unwrap().clone())
                 })
                 .collect::<PolarsResult<Vec<_>>>()?
@@ -1696,7 +1696,7 @@ impl DataFrame {
     /// ```
     pub fn rename(&mut self, column: &str, name: &str) -> PolarsResult<&mut Self> {
         self.select_mut(column)
-            .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", column))
+            .ok_or_else(|| polars_err!(col_not_found = column))
             .map(|s| s.rename(name))?;
         let unique_names: AHashSet<&str, ahash::RandomState> =
             AHashSet::from_iter(self.columns.iter().map(|s| s.name()));
@@ -2968,7 +2968,7 @@ impl DataFrame {
             for col in cols {
                 let _ = schema
                     .get(&col)
-                    .ok_or_else(|| polars_err!(ColumnNotFound: "{:?}", col))?;
+                    .ok_or_else(|| polars_err!(col_not_found = col))?;
             }
         }
         DataFrame::new(new_cols)

crates/polars-error/src/lib.rs

@@ -328,6 +328,9 @@ on startup."#.trim_start())
     (duplicate = $name:expr) => {
         polars_err!(Duplicate: "column with name '{}' has more than one occurrences", $name)
     };
+    (col_not_found = $name:expr) => {
+        polars_err!(ColumnNotFound: "{:?} not found", $name)
+    };
     (oob = $idx:expr, $len:expr) => {
         polars_err!(OutOfBounds: "index {} is out of bounds for sequence of length {}", $idx, $len)
     };