From b5d567b7a11b40e85248680108791459f72bb229 Mon Sep 17 00:00:00 2001
From: Jeremy Leibs <jeremy@rerun.io>
Date: Wed, 19 Jul 2023 21:57:19 +0200
Subject: [PATCH] Cleanup rebase

---
 crates/re_query/src/dataframe_util.rs | 2 --
 crates/re_types/src/lib.rs            | 5 ++++-
 tests/rust/test_api/src/main.rs       | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/re_query/src/dataframe_util.rs b/crates/re_query/src/dataframe_util.rs
index f410e00142f9..fe620298fb13 100644
--- a/crates/re_query/src/dataframe_util.rs
+++ b/crates/re_query/src/dataframe_util.rs
@@ -1,5 +1,3 @@
-use std::borrow::Borrow;
-
 use arrow2::{
     array::{Array, StructArray},
     datatypes::PhysicalType,
diff --git a/crates/re_types/src/lib.rs b/crates/re_types/src/lib.rs
index fa87fe8e5b42..77b9f071f83e 100644
--- a/crates/re_types/src/lib.rs
+++ b/crates/re_types/src/lib.rs
@@ -381,7 +381,9 @@ impl<T> ResultExt<T> for SerializationResult<T> {
     fn detailed_unwrap(self) -> T {
         fn find_backtrace(err: &SerializationError) -> Option<_Backtrace> {
             match err {
-                SerializationError::Context { .. } => None,
+                SerializationError::Context { .. } | SerializationError::ArrowConvertFailure(_) => {
+                    None
+                }
             }
         }
 
@@ -417,6 +419,7 @@ impl<T> ResultExt<T> for DeserializationResult<T> {
                 | DeserializationError::OffsetsMismatch { backtrace, .. }
                 | DeserializationError::ArrayLengthMismatch { backtrace, .. }
                 | DeserializationError::MonoMismatch { backtrace, .. } => Some(backtrace.clone()),
+                DeserializationError::ArrowConvertFailure(_) => None,
             }
         }
 
diff --git a/tests/rust/test_api/src/main.rs b/tests/rust/test_api/src/main.rs
index 8dc7fd14d57a..7e979eca8d68 100644
--- a/tests/rust/test_api/src/main.rs
+++ b/tests/rust/test_api/src/main.rs
@@ -27,7 +27,6 @@ use rerun::{
         re_log_types::external::{arrow2, arrow2_convert},
         re_types,
     },
-    transform::{Angle, RotationAxisAngle, TranslationRotationScale3D},
     Component, EntityPath, MsgSender, RecordingStream,
 };