Skip to content

Commit

Permalink
Cleanup rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
jleibs committed Jul 19, 2023
1 parent 8b6378f commit b5d567b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 0 additions & 2 deletions crates/re_query/src/dataframe_util.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use std::borrow::Borrow;

use arrow2::{
array::{Array, StructArray},
datatypes::PhysicalType,
Expand Down
5 changes: 4 additions & 1 deletion crates/re_types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}

Expand Down Expand Up @@ -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,
}
}

Expand Down
1 change: 0 additions & 1 deletion tests/rust/test_api/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ use rerun::{
re_log_types::external::{arrow2, arrow2_convert},
re_types,
},
transform::{Angle, RotationAxisAngle, TranslationRotationScale3D},
Component, EntityPath, MsgSender, RecordingStream,
};

Expand Down

0 comments on commit b5d567b

Please sign in to comment.