Post merge fix

Author: abey79

crates/store/re_sorbet/src/sorbet_columns.rs

@@ -4,8 +4,9 @@ use nohash_hasher::IntSet;
 use re_log_types::{EntityPath, TimelineName};
 
 use crate::{
-    ColumnDescriptor, ColumnKind, ComponentColumnDescriptor, ComponentColumnSelector,
-    IndexColumnDescriptor, RowIdColumnDescriptor, SorbetError, TimeColumnSelector,
+    ColumnDescriptor, ColumnDescriptorRef, ColumnKind, ComponentColumnDescriptor,
+    ComponentColumnSelector, IndexColumnDescriptor, RowIdColumnDescriptor, SorbetError,
+    TimeColumnSelector,
 };
 
 #[derive(thiserror::Error, Debug, PartialEq, Eq)]
@@ -72,6 +73,10 @@ impl SorbetColumnDescriptors {
             .collect()
     }
 
+    pub fn iter_ref(&self) -> impl Iterator<Item = ColumnDescriptorRef<'_>> {
+        self.columns.iter().map(ColumnDescriptorRef::from)
+    }
+
     pub fn row_id_columns(&self) -> impl Iterator<Item = &RowIdColumnDescriptor> {
         self.columns.iter().filter_map(|descr| {
             if let ColumnDescriptor::RowId(descr) = descr {

crates/viewer/re_dataframe_ui/src/datafusion_table_widget.rs

@@ -270,7 +270,7 @@ impl<'a> DataFusionTableWidget<'a> {
         let mut table_config = TableConfig::get_with_columns(
             ui.ctx(),
             id,
-            sorbet_schema.columns.descriptors().map(|c| {
+            sorbet_schema.columns.iter_ref().map(|c| {
                 let name = if let Some(column_name_fn) = &column_name_fn {
                     column_name_fn(&c)
                 } else {