Skip to content

Commit 0aba4a9

Browse files
committed
Fix a name clash in the codegen'd python
1 parent 2a5d0d2 commit 0aba4a9

File tree

6 files changed

+52
-57
lines changed

6 files changed

+52
-57
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ table ComponentColumnSelector (
1212
entity_path: rerun.datatypes.EntityPath (order: 100);
1313

1414
/// The name of the component.
15-
component_name: rerun.datatypes.Utf8 (order: 200);
15+
// NOTE: this field cannot be named `component_name`, because it would then clash with
16+
// `ComponentMixin.component_name()` in the Python API.
17+
component: rerun.datatypes.Utf8 (order: 200);
1618

17-
//TODO(ab, jleibs): many more fields to come.
19+
//TODO(ab, jleibs): many more fields to come (archetype, etc.)
1820
}

crates/store/re_types/src/blueprint/components/component_column_selector_ext.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ impl super::ComponentColumnSelector {
66
pub fn new(entity_path: &EntityPath, component_name: ComponentName) -> Self {
77
crate::blueprint::datatypes::ComponentColumnSelector {
88
entity_path: entity_path.into(),
9-
component_name: component_name.as_str().into(),
9+
component: component_name.as_str().into(),
1010
}
1111
.into()
1212
}

crates/store/re_types/src/blueprint/datatypes/component_column_selector.rs

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

rerun_cpp/src/rerun/blueprint/datatypes/component_column_selector.cpp

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

rerun_cpp/src/rerun/blueprint/datatypes/component_column_selector.hpp

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rerun_py/rerun_sdk/rerun/blueprint/datatypes/component_column_selector.py

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

0 commit comments

Comments
 (0)