re_types_blueprint -> re_types::blueprint (#8419)

Having blueprint types in a separate crate makes everything more
complicated, for little to no benefits as far as I can tell.
It is particularly bad when reflection is involved, as it introduces
unavoidable dependency cycles.

This PR merges them.

ARCHITECTURE.md

@@ -88,11 +88,11 @@ Of course, this will only take us so far. In the future we plan on caching queri
 Here is an overview of the crates included in the project:
 
 <picture>
-  <img src="https://static.rerun.io/architecture/1cc75ea6e625e77e94996b1c9aef8a0cca08bfcc/full.png" alt="">
-  <source media="(max-width: 480px)" srcset="https://static.rerun.io/architecture/1cc75ea6e625e77e94996b1c9aef8a0cca08bfcc/480w.png">
-  <source media="(max-width: 768px)" srcset="https://static.rerun.io/architecture/1cc75ea6e625e77e94996b1c9aef8a0cca08bfcc/768w.png">
-  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/architecture/1cc75ea6e625e77e94996b1c9aef8a0cca08bfcc/1024w.png">
-  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/architecture/1cc75ea6e625e77e94996b1c9aef8a0cca08bfcc/1200w.png">
+  <img src="https://static.rerun.io/crates/8044a2d9cf4e26687eaaf43352c391cb7aac557b/full.png" alt="">
+  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/8044a2d9cf4e26687eaaf43352c391cb7aac557b/480w.png">
+  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/8044a2d9cf4e26687eaaf43352c391cb7aac557b/768w.png">
+  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/8044a2d9cf4e26687eaaf43352c391cb7aac557b/1024w.png">
+  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/8044a2d9cf4e26687eaaf43352c391cb7aac557b/1200w.png">
 </picture>
 
 
@@ -168,7 +168,6 @@ Update instructions:
 | re_protos             | Rerun remote store gRPC API types                                        |
 | re_query              | Querying data in the re_chunk_store                                      |
 | re_types              | The built-in Rerun data types, component types, and archetypes.          |
-| re_types_blueprint    | The core traits and types that power Rerun's Blueprint sub-system.       |
 
 
 ### Low-level store

Cargo.lock

@@ -5698,7 +5698,6 @@ dependencies = [
  "re_log_types",
  "re_tracing",
  "re_types",
- "re_types_blueprint",
  "re_types_core",
  "re_ui",
  "re_viewer_context",
@@ -6295,7 +6294,6 @@ dependencies = [
  "re_log_types",
  "re_tracing",
  "re_types",
- "re_types_blueprint",
  "re_types_core",
  "re_ui",
  "re_view",
@@ -6423,18 +6421,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "re_types_blueprint"
-version = "0.21.0-alpha.1+dev"
-dependencies = [
- "arrow",
- "once_cell",
- "re_arrow2",
- "re_tracing",
- "re_types",
- "re_types_core",
-]
-
 [[package]]
 name = "re_types_builder"
 version = "0.21.0-alpha.1+dev"
@@ -6828,7 +6814,6 @@ dependencies = [
  "re_time_panel",
  "re_tracing",
  "re_types",
- "re_types_blueprint",
  "re_types_core",
  "re_ui",
  "re_video",
@@ -6932,7 +6917,6 @@ dependencies = [
  "re_renderer",
  "re_tracing",
  "re_types",
- "re_types_blueprint",
  "re_ui",
  "re_view",
  "re_viewer_context",
@@ -6957,7 +6941,6 @@ dependencies = [
  "re_log_types",
  "re_tracing",
  "re_types",
- "re_types_blueprint",
  "re_types_core",
  "re_ui",
  "re_viewer_context",

Cargo.toml

@@ -61,7 +61,6 @@ re_log_types = { path = "crates/store/re_log_types", version = "=0.21.0-alpha.1"
 re_query = { path = "crates/store/re_query", version = "=0.21.0-alpha.1", default-features = false }
 re_sdk_comms = { path = "crates/store/re_sdk_comms", version = "=0.21.0-alpha.1", default-features = false }
 re_types = { path = "crates/store/re_types", version = "=0.21.0-alpha.1", default-features = false }
-re_types_blueprint = { path = "crates/store/re_types_blueprint", version = "=0.21.0-alpha.1", default-features = false }
 re_types_core = { path = "crates/store/re_types_core", version = "=0.21.0-alpha.1", default-features = false }
 re_ws_comms = { path = "crates/store/re_ws_comms", version = "=0.21.0-alpha.1", default-features = false }
 

crates/store/re_types/definitions/rerun/blueprint/archetypes/container_blueprint.fbs

@@ -4,8 +4,7 @@ namespace rerun.blueprint.archetypes;
 
 /// The description of a container.
 table ContainerBlueprint (
-    "attr.rerun.scope": "blueprint",
-    "attr.rust.override_crate": "re_types_blueprint"
+    "attr.rerun.scope": "blueprint"
 ) {
     // --- Required ---
 

crates/store/re_types/definitions/rerun/blueprint/archetypes/panel_blueprint.fbs

@@ -5,12 +5,13 @@ namespace rerun.blueprint.archetypes;
 /// Shared state for the 3 collapsible panels.
 table PanelBlueprint (
     "attr.rerun.scope": "blueprint",
-    "attr.rust.derive": "Default",
-    "attr.rust.override_crate": "re_types_blueprint"
+    "attr.rust.derive": "Default"
 ) {
     // --- Required ---
 
     // --- Optional ---
+
+    /// Current state of the panels.
     state: rerun.blueprint.components.PanelState ("attr.rerun.component_optional", nullable, order: 1000);
 
     // TODO(jleibs): Add a float to track how expanded the panel is.

crates/store/re_types/definitions/rerun/blueprint/archetypes/viewport_blueprint.fbs

@@ -5,8 +5,7 @@ namespace rerun.blueprint.archetypes;
 /// The top-level description of the viewport.
 table ViewportBlueprint (
     "attr.rerun.scope": "blueprint",
-    "attr.rust.derive": "Default",
-    "attr.rust.override_crate": "re_types_blueprint"
+    "attr.rust.derive": "Default"
 ) {
     // --- Required ---
 

crates/store/re_types/definitions/rerun/blueprint/components/auto_layout.fbs

@@ -6,10 +6,9 @@ namespace rerun.blueprint.components;
 /// Whether the viewport layout is determined automatically.
 struct AutoLayout (
   "attr.arrow.transparent",
-  "attr.rerun.scope": "blueprint",
   "attr.python.aliases": "bool",
+  "attr.rerun.scope": "blueprint",
   "attr.rust.derive": "Copy",
-  "attr.rust.override_crate": "re_types_blueprint",
   "attr.rust.repr": "transparent",
   "attr.rust.tuple_struct"
 ) {

crates/store/re_types/definitions/rerun/blueprint/components/auto_views.fbs

@@ -7,7 +7,6 @@ struct AutoViews (
   "attr.rerun.scope": "blueprint",
   "attr.python.aliases": "bool",
   "attr.rust.derive": "Copy, Default, PartialEq, Eq, PartialOrd, Ord",
-  "attr.rust.override_crate": "re_types_blueprint",
   "attr.rust.repr": "transparent",
   "attr.rust.tuple_struct"
 ) {

crates/store/re_types/definitions/rerun/blueprint/components/container_kind.fbs

@@ -3,8 +3,7 @@ namespace rerun.blueprint.components;
 
 /// The kind of a blueprint container (tabs, grid, …).
 enum ContainerKind: ubyte (
-    "attr.rerun.scope": "blueprint",
-    "attr.rust.override_crate": "re_types_blueprint"
+    "attr.rerun.scope": "blueprint"
 ) {
     /// Invalid value. Won't show up in generated types.
     Invalid = 0,

crates/store/re_types/definitions/rerun/blueprint/components/grid_columns.fbs

@@ -5,8 +5,7 @@ namespace rerun.blueprint.components;
 table GridColumns (
     "attr.rerun.scope": "blueprint",
     "attr.python.aliases": "int",
-    "attr.rust.derive": "Default, PartialEq, Eq, PartialOrd, Ord",
-    "attr.rust.override_crate": "re_types_blueprint"
+    "attr.rust.derive": "Default, PartialEq, Eq, PartialOrd, Ord"
 ) {
     /// The number of columns.
     columns: rerun.datatypes.UInt32 (order: 100);

crates/store/re_types/definitions/rerun/blueprint/components/root_container.fbs

@@ -7,9 +7,7 @@ namespace rerun.blueprint.components;
 table RootContainer (
   "attr.rerun.scope": "blueprint",
   "attr.python.aliases": "npt.NDArray[np.uint8], npt.ArrayLike, Sequence[int], bytes",
-  "attr.rust.derive": "Default",
-  "attr.rust.override_crate": "re_types_blueprint",
-  "attr.rust.repr": "transparent"
+  "attr.rust.derive": "Default"
 ) {
     /// `ContainerId` for the root.
     id: rerun.datatypes.Uuid (order: 100);

crates/store/re_types/definitions/rerun/blueprint/components/view_maximized.fbs

@@ -4,9 +4,7 @@ namespace rerun.blueprint.components;
 table ViewMaximized (
   "attr.rerun.scope": "blueprint",
   "attr.python.aliases": "npt.NDArray[np.uint8], npt.ArrayLike, Sequence[int], bytes",
-  "attr.rust.derive": "Default",
-  "attr.rust.override_crate": "re_types_blueprint",
-  "attr.rust.repr": "transparent"
+  "attr.rust.derive": "Default"
 ) {
     view_id: rerun.datatypes.Uuid (order: 100);
 }

crates/store/re_types/definitions/rerun/blueprint/components/visualizer_overrides.fbs

@@ -17,8 +17,7 @@ table VisualizerOverrides (
     "attr.python.array_aliases": "str",
     "attr.rerun.scope": "blueprint",
     "attr.rust.derive": "PartialEq, Eq, PartialOrd, Ord, Default",
-    "attr.rust.repr": "transparent",
-    "attr.rust.override_crate": "re_types_blueprint"
+    "attr.rust.repr": "transparent"
 ) {
     /// Names of the visualizers that should be active.
     visualizers: rerun.blueprint.datatypes.Utf8List (order: 100);

crates/store/re_types/definitions/rerun/blueprint/datatypes/utf8_list.fbs

@@ -9,8 +9,7 @@ table Utf8List (
   "attr.rerun.scope": "blueprint",
   "attr.rust.derive": "PartialEq, Eq, PartialOrd, Ord, Default, Hash",
   "attr.rust.repr": "transparent",
-  "attr.rust.tuple_struct",
-  "attr.rust.override_crate": "re_types_blueprint"
+  "attr.rust.tuple_struct"
 ) {
   value: [string] (order: 100);
 }

crates/store/re_types_blueprint/src/blueprint/components/auto_layout_ext.rs → crates/store/re_types/src/blueprint/components/auto_layout_ext.rs

@@ -1,4 +1,4 @@
-use re_types::datatypes::Bool;
+use crate::datatypes::Bool;
 
 use super::AutoLayout;