Merge branch 'main' into resolve-clippy-unwrap_used-in-re_viewer

.gitignore

@@ -60,6 +60,7 @@ wheels
 /compare_screenshot
 **/tests/snapshots/**/*.diff.png
 **/tests/snapshots/**/*.new.png
+**/tests/snapshots/**/*.old.png
 
 # Mesa install
 mesa

ARCHITECTURE.md

@@ -181,9 +181,10 @@ Update instructions:
 | --------------- | --------------------------------------------------------------------------------------------- |
 | re_chunk        | A chunk of Rerun data, encoded using Arrow. Used for logging, transport, storage and compute. |
 | re_chunk_store  | An in-memory time series database for Rerun log data, based on Apache Arrow.                  |
+| re_format_arrow | Formatting of Apache Arrow tables.                                                            |
 | re_log_types    | The basic building blocks of the Rerun data types and tables.                                 |
+| re_sorbet       | Rerun arrow metadata and record batch definitions.                                            |
 | re_types_core   | The core traits and types that power Rerun's data model.                                      |
-| re_format_arrow | Formatting of Apache Arrow tables.                                                            |
 
 ### Data flow
 

Cargo.lock

@@ -508,7 +508,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9579b9d8bce47aa41389fe344f2c6758279983b7c0ebb4013e283e3e91bb450e"
 dependencies = [
  "bitflags 2.8.0",
- "serde",
 ]
 
 [[package]]
@@ -1958,7 +1957,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 [[package]]
 name = "ecolor"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "bytemuck",
  "color-hex",
@@ -1975,7 +1974,7 @@ checksum = "18aade80d5e09429040243ce1143ddc08a92d7a22820ac512610410a4dd5214f"
 [[package]]
 name = "eframe"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2014,7 +2013,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "accesskit",
  "ahash",
@@ -2032,7 +2031,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2051,7 +2050,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "accesskit_winit",
  "ahash",
@@ -2092,7 +2091,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "ahash",
  "egui",
@@ -2109,7 +2108,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2126,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "egui_kittest"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "dify",
  "eframe",
@@ -2197,7 +2196,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "emath"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2313,7 +2312,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -2332,7 +2331,7 @@ dependencies = [
 [[package]]
 name = "epaint_default_fonts"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
+source = "git+https://github.com/emilk/egui.git?branch=master#83649f2e295a4c27ea08023b6e7f591d3e60ea7f"
 
 [[package]]
 name = "equivalent"
@@ -3635,6 +3634,9 @@ dependencies = [
  "console",
  "lazy_static",
  "linked-hash-map",
+ "pest",
+ "pest_derive",
+ "serde",
  "similar",
 ]
 
@@ -3900,7 +3902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4940,6 +4942,51 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pest"
+version = "2.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+dependencies = [
+ "memchr",
+ "thiserror 2.0.7",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
+dependencies = [
+ "once_cell",
+ "pest",
+ "sha2",
+]
+
 [[package]]
 name = "petgraph"
 version = "0.6.5"
@@ -5446,7 +5493,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5638,6 +5685,8 @@ version = "0.22.0-alpha.1+dev"
 dependencies = [
  "egui",
  "egui_kittest",
+ "egui_tiles",
+ "insta",
  "itertools 0.13.0",
  "re_chunk_store",
  "re_context_menu",
@@ -5651,6 +5700,7 @@ dependencies = [
  "re_view_spatial",
  "re_viewer_context",
  "re_viewport_blueprint",
+ "serde",
  "smallvec",
 ]
 
@@ -5739,7 +5789,6 @@ dependencies = [
  "ahash",
  "anyhow",
  "arrow",
- "arrow-schema",
  "criterion",
  "document-features",
  "indent",
@@ -5758,10 +5807,10 @@ dependencies = [
  "re_log_encoding",
  "re_log_types",
  "re_protos",
+ "re_sorbet",
  "re_tracing",
  "re_types",
  "re_types_core",
- "serde_json",
  "similar-asserts",
  "thiserror 1.0.65",
  "tinyvec",
@@ -6165,7 +6214,6 @@ dependencies = [
  "re_byte_size",
  "re_format",
  "re_log",
- "re_protos",
  "re_string_interner",
  "re_tracing",
  "re_tuid",
@@ -6230,8 +6278,13 @@ dependencies = [
 name = "re_protos"
 version = "0.22.0-alpha.1+dev"
 dependencies = [
+ "arrow",
  "prost",
+ "re_build_info",
  "re_byte_size",
+ "re_log_types",
+ "re_sorbet",
+ "re_tuid",
  "thiserror 1.0.65",
  "tonic",
  "tonic-web-wasm-client",
@@ -6469,6 +6522,17 @@ dependencies = [
  "web-time",
 ]
 
+[[package]]
+name = "re_sorbet"
+version = "0.22.0-alpha.1+dev"
+dependencies = [
+ "arrow",
+ "re_log",
+ "re_log_types",
+ "re_types_core",
+ "thiserror 1.0.65",
+]
+
 [[package]]
 name = "re_string_interner"
 version = "0.22.0-alpha.1+dev"
@@ -6502,10 +6566,12 @@ dependencies = [
  "re_log_types",
  "re_tracing",
  "re_types",
+ "re_types_core",
  "re_ui",
  "re_viewer_context",
  "re_viewport_blueprint",
  "serde",
+ "smallvec",
  "vec1",
 ]
 
@@ -6529,7 +6595,6 @@ dependencies = [
  "getrandom",
  "once_cell",
  "re_byte_size",
- "re_protos",
  "serde",
  "web-time",
 ]
@@ -6665,6 +6730,7 @@ dependencies = [
  "strum_macros",
  "sublime_fuzzy",
  "time",
+ "url",
 ]
 
 [[package]]
@@ -7447,6 +7513,7 @@ dependencies = [
  "re_memory",
  "re_protos",
  "re_sdk",
+ "re_sorbet",
  "re_video",
  "re_web_viewer_server",
  "re_ws_comms",
@@ -9212,6 +9279,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[package]]
+name = "ucd-trie"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+
 [[package]]
 name = "uds_windows"
 version = "1.1.0"
@@ -9962,7 +10035,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

Cargo.toml

@@ -60,6 +60,7 @@ re_log_encoding = { path = "crates/store/re_log_encoding", version = "=0.22.0-al
 re_log_types = { path = "crates/store/re_log_types", version = "=0.22.0-alpha.1", default-features = false }
 re_query = { path = "crates/store/re_query", version = "=0.22.0-alpha.1", default-features = false }
 re_sdk_comms = { path = "crates/store/re_sdk_comms", version = "=0.22.0-alpha.1", default-features = false }
+re_sorbet = { path = "crates/store/re_sorbet", version = "=0.22.0-alpha.1", default-features = false }
 re_types = { path = "crates/store/re_types", version = "=0.22.0-alpha.1", default-features = false }
 re_types_core = { path = "crates/store/re_types_core", version = "=0.22.0-alpha.1", default-features = false }
 re_ws_comms = { path = "crates/store/re_ws_comms", version = "=0.22.0-alpha.1", default-features = false }
@@ -154,7 +155,6 @@ anyhow = { version = "1.0", default-features = false }
 argh = "0.1.12"
 array-init = "2.1"
 arrow = { version = "53.4", default-features = false }
-arrow-schema = { version = "53.4", default-features = false }
 arrow2 = { package = "re_arrow2", version = "0.18.2", features = ["arrow"] }
 async-executor = "1.0"
 async-stream = "0.3"

crates/build/re_types_builder/src/codegen/cpp/includes.rs

@@ -89,6 +89,12 @@ impl Includes {
             self.insert_rerun(&format!("{path}/{typname}.hpp"));
         }
     }
+
+    /// Remove all includes that are also in `other`.
+    pub fn remove_includes(&mut self, other: &Self) {
+        self.system.retain(|name| !other.system.contains(name));
+        self.local.retain(|name| !other.local.contains(name));
+    }
 }
 
 impl quote::ToTokens for Includes {

crates/build/re_types_builder/src/codegen/cpp/method.rs

@@ -83,7 +83,12 @@ impl MethodDocumentation {
             Self::None => {
                 quote!()
             }
-            Self::String(s) => quote_doc_comment(s),
+            Self::String(s) => {
+                let lines = s.lines().map(quote_doc_comment);
+                quote! {
+                    #(#lines)*
+                }
+            }
             Self::Docs(docs) => {
                 let lines = lines_from_docs(reporter, objects, docs);
                 quote_doc_lines(&lines)