diff --git a/Cargo.lock b/Cargo.lock index 91dee99e4484..f036cb4bcfee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5734,7 +5734,6 @@ dependencies = [ "once_cell", "parking_lot", "rand", - "re_arrow2", "re_arrow_util", "re_byte_size", "re_chunk", diff --git a/crates/store/re_chunk/src/merge.rs b/crates/store/re_chunk/src/merge.rs index 0b2831bea12d..d54990e836a1 100644 --- a/crates/store/re_chunk/src/merge.rs +++ b/crates/store/re_chunk/src/merge.rs @@ -1,12 +1,10 @@ use arrow::array::StructArray as ArrowStructArray; -use arrow::buffer::ScalarBuffer as ArrowScalarBuffer; use arrow::array::{Array as ArrowArray, ListArray as ArrowListArray}; +use arrow::buffer::ScalarBuffer as ArrowScalarBuffer; use itertools::{izip, Itertools}; use nohash_hasher::IntMap; -use re_arrow_util::{ - arrow_util, ArrowArrayDowncastRef as _, -}; +use re_arrow_util::{arrow_util, ArrowArrayDowncastRef as _}; use crate::{chunk::ChunkComponents, Chunk, ChunkError, ChunkId, ChunkResult, TimeColumn}; @@ -108,9 +106,7 @@ impl Chunk { let list_array = arrow_util::concat_arrays(&[lhs_list_array, rhs_list_array]).ok()?; - let list_array = list_array - .downcast_array_ref::()? - .clone(); + let list_array = list_array.downcast_array_ref::()?.clone(); Some((component_desc.clone(), list_array)) } else { @@ -149,9 +145,7 @@ impl Chunk { let list_array = arrow_util::concat_arrays(&[lhs_list_array, rhs_list_array]).ok()?; - let list_array = list_array - .downcast_array_ref::()? - .clone(); + let list_array = list_array.downcast_array_ref::()?.clone(); Some((component_desc.clone(), list_array)) } else { diff --git a/crates/store/re_chunk_store/Cargo.toml b/crates/store/re_chunk_store/Cargo.toml index bb712e49da6a..5d842838ffdc 100644 --- a/crates/store/re_chunk_store/Cargo.toml +++ b/crates/store/re_chunk_store/Cargo.toml @@ -43,7 +43,6 @@ re_types_core.workspace = true ahash.workspace = true anyhow.workspace = true arrow.workspace = true -arrow2 = { workspace = true, features = ["compute_concatenate"] } document-features.workspace = true indent.workspace = true itertools.workspace = true diff --git a/crates/viewer/re_view_spatial/src/visualizers/boxes2d.rs b/crates/viewer/re_view_spatial/src/visualizers/boxes2d.rs index 59ac190c5759..5fb61892a63d 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/boxes2d.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/boxes2d.rs @@ -259,7 +259,8 @@ impl VisualizerSystem for Boxes2DVisualizer { labels: labels.unwrap_or_default(), class_ids: class_ids .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } }, diff --git a/crates/viewer/re_view_spatial/src/visualizers/boxes3d.rs b/crates/viewer/re_view_spatial/src/visualizers/boxes3d.rs index 16829040a39d..ba6bc35e343d 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/boxes3d.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/boxes3d.rs @@ -194,7 +194,8 @@ impl VisualizerSystem for Boxes3DVisualizer { labels: labels.unwrap_or_default(), class_ids: class_ids .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } }, diff --git a/crates/viewer/re_view_spatial/src/visualizers/capsules3d.rs b/crates/viewer/re_view_spatial/src/visualizers/capsules3d.rs index c68496f91938..c7f016a50d9f 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/capsules3d.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/capsules3d.rs @@ -203,7 +203,8 @@ impl VisualizerSystem for Capsules3DVisualizer { labels: labels.unwrap_or_default(), class_ids: class_ids .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } }, diff --git a/crates/viewer/re_view_spatial/src/visualizers/ellipsoids.rs b/crates/viewer/re_view_spatial/src/visualizers/ellipsoids.rs index 9e31dc47d0b3..43e2f707ae13 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/ellipsoids.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/ellipsoids.rs @@ -202,7 +202,8 @@ impl VisualizerSystem for Ellipsoids3DVisualizer { labels: labels.unwrap_or_default(), class_ids: class_ids .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } }, diff --git a/crates/viewer/re_view_spatial/src/visualizers/lines3d.rs b/crates/viewer/re_view_spatial/src/visualizers/lines3d.rs index 704781634022..81c3bb5803c0 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/lines3d.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/lines3d.rs @@ -239,7 +239,8 @@ impl VisualizerSystem for Lines3DVisualizer { labels: labels.unwrap_or_default(), class_ids: class_ids .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } }, diff --git a/crates/viewer/re_view_spatial/src/visualizers/points2d.rs b/crates/viewer/re_view_spatial/src/visualizers/points2d.rs index e4aac02cdf30..b6b9a00c1d39 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/points2d.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/points2d.rs @@ -266,7 +266,8 @@ impl VisualizerSystem for Points2DVisualizer { .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), keypoint_ids: keypoint_ids .map_or(&[], |keypoint_ids| bytemuck::cast_slice(keypoint_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } }, diff --git a/crates/viewer/re_view_spatial/src/visualizers/points3d.rs b/crates/viewer/re_view_spatial/src/visualizers/points3d.rs index 6f535c5cedc5..9114f9e9f159 100644 --- a/crates/viewer/re_view_spatial/src/visualizers/points3d.rs +++ b/crates/viewer/re_view_spatial/src/visualizers/points3d.rs @@ -256,7 +256,8 @@ impl VisualizerSystem for Points3DVisualizer { .map_or(&[], |class_ids| bytemuck::cast_slice(class_ids)), keypoint_ids: keypoint_ids .map_or(&[], |keypoint_ids| bytemuck::cast_slice(keypoint_ids)), - show_labels: show_labels.map(|b| !b.is_empty() && b.value(0)) + show_labels: show_labels + .map(|b| !b.is_empty() && b.value(0)) .map(Into::into), } },