Skip to content

Commit 0d95ef4

Browse files
committed
Merge branch 'main' into jan/auto-approve-workflow-runs
2 parents faf3f5d + 3c912be commit 0d95ef4

File tree

270 files changed

+4630
-3063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+4630
-3063
lines changed

Cargo.lock

Lines changed: 23 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ re_tensor_ops = { path = "crates/re_tensor_ops", version = "=0.10.0-alpha.7", de
5858
re_time_panel = { path = "crates/re_time_panel", version = "=0.10.0-alpha.7", default-features = false }
5959
re_tracing = { path = "crates/re_tracing", version = "=0.10.0-alpha.7", default-features = false }
6060
re_tuid = { path = "crates/re_tuid", version = "=0.10.0-alpha.7", default-features = false }
61+
re_types_core = { path = "crates/re_types_core", version = "=0.10.0-alpha.7", default-features = false }
6162
re_types = { path = "crates/re_types", version = "=0.10.0-alpha.7", default-features = false }
6263
re_types_builder = { path = "crates/re_types_builder", version = "=0.10.0-alpha.7", default-features = false }
6364
re_ui = { path = "crates/re_ui", version = "=0.10.0-alpha.7", default-features = false }
@@ -158,9 +159,12 @@ puffin_http = "0.13"
158159
rand = { version = "0.8", default-features = false }
159160
rayon = "1.7"
160161
rfd = { version = "0.12", default_features = false, features = ["xdg-portal"] }
162+
rmp-serde = "1"
161163
ron = "0.8.0"
162164
serde = "1"
165+
serde_bytes = "0.11"
163166
serde_json = { version = "1", default-features = false, features = ["std"] }
167+
serde_test = "1"
164168
serde_yaml = { version = "0.9.21", default-features = false }
165169
sha2 = "0.10"
166170
similar-asserts = "1.4.2"

crates/re_arrow_store/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ re_format.workspace = true
4040
re_log_types.workspace = true
4141
re_log.workspace = true
4242
re_tracing.workspace = true
43+
# NOTE: We're on our way to make this crate re_types-free, which is why we import both.
44+
re_types_core.workspace = true
4345
re_types.workspace = true
4446

4547
# External dependencies:

crates/re_arrow_store/benches/arrow2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ use arrow2::array::{Array, PrimitiveArray, StructArray, UnionArray};
99
use criterion::Criterion;
1010
use itertools::Itertools;
1111

12-
use re_log_types::{DataCell, SizeBytes as _};
12+
use re_log_types::DataCell;
1313
use re_types::datagen::{build_some_instances, build_some_positions2d};
1414
use re_types::{
1515
components::{InstanceKey, Position2D},
1616
testing::{build_some_large_structs, LargeStruct},
17-
Component,
1817
};
18+
use re_types_core::{Component, SizeBytes as _};
1919

2020
// ---
2121

crates/re_arrow_store/benches/data_store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use re_types::datagen::build_some_instances;
1515
use re_types::{
1616
components::InstanceKey,
1717
testing::{build_some_large_structs, LargeStruct},
18-
ComponentName, Loggable as _,
1918
};
19+
use re_types_core::{ComponentName, Loggable as _};
2020

2121
criterion_group!(benches, insert, latest_at, latest_at_missing, range, gc);
2222
criterion_main!(benches);

crates/re_arrow_store/examples/dump_dataframe.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
use re_arrow_store::{test_row, DataStore};
88
use re_log_types::{build_frame_nr, build_log_time, EntityPath, Time};
99
use re_types::datagen::{build_some_instances, build_some_instances_from, build_some_positions2d};
10-
use re_types::{components::InstanceKey, testing::build_some_large_structs, Loggable};
10+
use re_types::{components::InstanceKey, testing::build_some_large_structs};
11+
use re_types_core::Loggable as _;
1112

1213
// ---
1314

crates/re_arrow_store/examples/latest_component.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use re_types::datagen::build_some_positions2d;
1111
use re_types::{
1212
components::{InstanceKey, Position2D},
1313
testing::{build_some_large_structs, LargeStruct},
14-
Loggable,
1514
};
15+
use re_types_core::Loggable as _;
1616

1717
fn main() {
1818
let mut store = DataStore::new(InstanceKey::name(), Default::default());

crates/re_arrow_store/examples/latest_components.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use re_types::datagen::build_some_positions2d;
1313
use re_types::{
1414
components::{InstanceKey, Position2D},
1515
testing::{build_some_large_structs, LargeStruct},
16-
Loggable,
1716
};
17+
use re_types_core::Loggable as _;
1818

1919
fn main() {
2020
let mut store = DataStore::new(InstanceKey::name(), Default::default());

crates/re_arrow_store/examples/range_components.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use re_types::datagen::build_some_positions2d;
1111
use re_types::{
1212
components::{InstanceKey, Position2D},
1313
testing::{build_some_large_structs, LargeStruct},
14-
Loggable as _,
1514
};
15+
use re_types_core::Loggable as _;
1616

1717
fn main() {
1818
let mut store = DataStore::new(InstanceKey::name(), Default::default());

crates/re_arrow_store/src/polars_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use itertools::Itertools;
22
use polars_core::{prelude::*, series::Series};
33
use polars_ops::prelude::*;
44
use re_log_types::{DataCell, EntityPath, RowId, TimeInt};
5-
use re_types::ComponentName;
5+
use re_types_core::ComponentName;
66

77
use crate::{ArrayExt, DataStore, LatestAtQuery, RangeQuery};
88

0 commit comments

Comments
 (0)