Skip to content

Commit 7852771

Browse files
authored
Remove re_global_context (#11478)
### What The `re_global_context` crate was no longer used anywhere where `re_viewer_context` wasn't used, and created a lot of friction because of having to move stuff down to the `re_global_context` crate for `SystemCommand`s. So this PR moves `re_global_context` into `re_viewer_context`.
1 parent 626304d commit 7852771

Some content is hidden

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

53 files changed

+276
-423
lines changed

ARCHITECTURE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ Update instructions:
140140
| re_chunk_store_ui | A chunk store browser UI. |
141141
| re_component_ui | Provides UI editors for Rerun component data for registration with the Rerun Viewer component UI registry. |
142142
| re_dataframe_ui | Rich table widget over DataFusion. |
143-
| re_global_context | Rerun state that is shared with most top-level crates. |
144143
| re_recording_panel | The UI for the recording panel. |
145144
| re_selection_panel | The UI for the selection panel. |
146145
| re_view | Types & utilities for defining View classes and communicating with the Viewport. |

Cargo.lock

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8792,41 +8792,6 @@ dependencies = [
87928792
"serde_json",
87938793
]
87948794

8795-
[[package]]
8796-
name = "re_global_context"
8797-
version = "0.26.0-alpha.1+dev"
8798-
dependencies = [
8799-
"ahash",
8800-
"anyhow",
8801-
"directories",
8802-
"egui",
8803-
"egui_tiles",
8804-
"home",
8805-
"indexmap 2.11.4",
8806-
"itertools 0.14.0",
8807-
"re_capabilities",
8808-
"re_chunk",
8809-
"re_chunk_store",
8810-
"re_data_source",
8811-
"re_entity_db",
8812-
"re_log",
8813-
"re_log_types",
8814-
"re_redap_client",
8815-
"re_renderer",
8816-
"re_smart_channel",
8817-
"re_tracing",
8818-
"re_types",
8819-
"re_types_core",
8820-
"re_ui",
8821-
"re_uri",
8822-
"re_video",
8823-
"rfd",
8824-
"serde",
8825-
"strum_macros",
8826-
"uuid",
8827-
"wasm-bindgen-futures",
8828-
]
8829-
88308795
[[package]]
88318796
name = "re_grpc_client"
88328797
version = "0.26.0-alpha.1+dev"
@@ -9505,7 +9470,6 @@ dependencies = [
95059470
"re_chunk",
95069471
"re_chunk_store",
95079472
"re_entity_db",
9508-
"re_global_context",
95099473
"re_log",
95109474
"re_log_encoding",
95119475
"re_log_types",
@@ -10164,6 +10128,7 @@ dependencies = [
1016410128
"bytemuck",
1016510129
"crossbeam",
1016610130
"datafusion",
10131+
"directories",
1016710132
"egui",
1016810133
"egui-wgpu",
1016910134
"egui_tiles",
@@ -10172,6 +10137,7 @@ dependencies = [
1017210137
"half",
1017310138
"home",
1017410139
"image",
10140+
"indexmap 2.11.4",
1017510141
"itertools 0.14.0",
1017610142
"linked-hash-map",
1017710143
"macaw",
@@ -10182,16 +10148,17 @@ dependencies = [
1018210148
"re_arrow_ui",
1018310149
"re_arrow_util",
1018410150
"re_byte_size",
10151+
"re_capabilities",
1018510152
"re_chunk",
1018610153
"re_chunk_store",
1018710154
"re_data_source",
1018810155
"re_entity_db",
1018910156
"re_format",
10190-
"re_global_context",
1019110157
"re_log",
1019210158
"re_log_encoding",
1019310159
"re_log_types",
1019410160
"re_query",
10161+
"re_redap_client",
1019510162
"re_renderer",
1019610163
"re_smart_channel",
1019710164
"re_string_interner",
@@ -10201,12 +10168,15 @@ dependencies = [
1020110168
"re_ui",
1020210169
"re_uri",
1020310170
"re_video",
10171+
"rfd",
1020410172
"serde",
1020510173
"slotmap",
1020610174
"smallvec",
1020710175
"static_assertions",
10176+
"strum_macros",
1020810177
"thiserror 1.0.69",
1020910178
"tokio",
10179+
"uuid",
1021010180
"vec1",
1021110181
"wasm-bindgen-futures",
1021210182
"web-sys",
@@ -10475,7 +10445,6 @@ dependencies = [
1047510445
"re_error",
1047610446
"re_format",
1047710447
"re_format_arrow",
10478-
"re_global_context",
1047910448
"re_grpc_server",
1048010449
"re_log",
1048110450
"re_log_encoding",

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ re_context_menu = { path = "crates/viewer/re_context_menu", version = "=0.26.0-a
124124
re_chunk_store_ui = { path = "crates/viewer/re_chunk_store_ui", version = "=0.26.0-alpha.1", default-features = false }
125125
re_dataframe_ui = { path = "crates/viewer/re_dataframe_ui", version = "=0.26.0-alpha.1", default-features = false }
126126
re_data_ui = { path = "crates/viewer/re_data_ui", version = "=0.26.0-alpha.1", default-features = false }
127-
re_global_context = { path = "crates/viewer/re_global_context", version = "=0.26.0-alpha.1", default-features = false }
128127
re_recording_panel = { path = "crates/viewer/re_recording_panel", version = "=0.26.0-alpha.1", default-features = false }
129128
re_renderer = { path = "crates/viewer/re_renderer", version = "=0.26.0-alpha.1", default-features = false }
130129
re_renderer_examples = { path = "crates/viewer/re_renderer_examples", version = "=0.26.0-alpha.1", default-features = false }
@@ -463,7 +462,6 @@ debug = false
463462
"re_error".debug = true
464463
"re_format_arrow".debug = true
465464
"re_format".debug = true
466-
"re_global_context".debug = true
467465
"re_grpc_client".debug = true
468466
"re_grpc_server".debug = true
469467
"re_int_histogram".debug = true

crates/top/rerun/Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ re_chunk_store = { workspace = true, optional = true }
175175
re_crash_handler = { workspace = true, optional = true }
176176
re_data_source = { workspace = true, optional = true }
177177
re_dataframe = { workspace = true, optional = true }
178-
re_global_context = { workspace = true, optional = true }
179178
re_grpc_server = { workspace = true, optional = true }
180179
re_mcap = { workspace = true, optional = true }
181180
re_sdk = { workspace = true, optional = true }
@@ -203,9 +202,4 @@ re_build_tools.workspace = true
203202

204203
[package.metadata.cargo-shear]
205204
# We only depend on re_video so we can enable extra features for it
206-
ignored = [
207-
"re_video",
208-
"puffin",
209-
# Local runs of `cargo shear` don't bring up `re_global_context` but CI runs do.
210-
"re_global_context",
211-
]
205+
ignored = ["re_video", "puffin"]

crates/viewer/re_blueprint_tree/tests/blueprint_tree_tests.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ use re_test_context::TestContext;
1111
use re_test_viewport::TestContextExt as _;
1212
use re_types::archetypes::Points3D;
1313
use re_viewer_context::{
14-
CollapseScope, RecommendedView, ViewClass as _, ViewId,
15-
time_control_command::TimeControlCommand,
14+
CollapseScope, RecommendedView, TimeControlCommand, ViewClass as _, ViewId,
1615
};
1716
use re_viewport_blueprint::{ViewBlueprint, ViewportBlueprint};
1817

crates/viewer/re_blueprint_tree/tests/range_selection_test.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ use re_log_types::build_frame_nr;
99
use re_test_context::TestContext;
1010
use re_test_viewport::TestContextExt as _;
1111
use re_types::archetypes::Points3D;
12-
use re_viewer_context::{
13-
Contents, ViewClass as _, VisitorControlFlow, time_control_command::TimeControlCommand,
14-
};
12+
use re_viewer_context::{Contents, TimeControlCommand, ViewClass as _, VisitorControlFlow};
1513
use re_viewport_blueprint::{ViewBlueprint, ViewportBlueprint};
1614

1715
#[test]

crates/viewer/re_blueprint_tree/tests/view_structure_test.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ use re_test_context::TestContext;
1616
use re_test_viewport::TestContextExt as _;
1717
use re_types::archetypes::Points3D;
1818
use re_ui::filter_widget::FilterState;
19-
use re_viewer_context::{
20-
RecommendedView, ViewClass as _, ViewId, time_control_command::TimeControlCommand,
21-
};
19+
use re_viewer_context::{RecommendedView, TimeControlCommand, ViewClass as _, ViewId};
2220
use re_viewport_blueprint::{ViewBlueprint, ViewportBlueprint};
2321

2422
const VIEW_ID: &str = "this-is-a-view-id";

crates/viewer/re_data_ui/src/item_ui.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use re_types::{
1313
use re_ui::list_item::ListItemContentButtonsExt as _;
1414
use re_ui::{SyntaxHighlighting as _, UiExt as _, icons, list_item};
1515
use re_viewer_context::open_url::ViewerOpenUrl;
16-
use re_viewer_context::time_control_command::TimeControlCommand;
1716
use re_viewer_context::{
18-
HoverHighlight, Item, SystemCommand, SystemCommandSender as _, UiLayout, ViewId, ViewerContext,
17+
HoverHighlight, Item, SystemCommand, SystemCommandSender as _, TimeControlCommand, UiLayout,
18+
ViewId, ViewerContext,
1919
};
2020

2121
use super::DataUi as _;

crates/viewer/re_global_context/Cargo.toml

Lines changed: 0 additions & 63 deletions
This file was deleted.

crates/viewer/re_global_context/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)