Skip to content

Commit

Permalink
add all mising order attributes everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
teh-cmc committed Jul 7, 2023
1 parent 616df85 commit 525a3e7
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion crates/re_types/definitions/rerun/components/class_id.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ struct ClassId (
"attr.rust.tuple_struct",
order: 100
) {
id: ushort;
id: ushort (order: 100);
}
2 changes: 1 addition & 1 deletion crates/re_types/definitions/rerun/components/color.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ struct Color (
"attr.rust.tuple_struct",
order: 100
) {
rgba: uint;
rgba: uint (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ struct DrawOrder (
"attr.rust.tuple_struct",
order: 100
) {
value: float;
value: float (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ struct InstanceKey (
"attr.rust.derive": "Copy, PartialEq, Eq, PartialOrd, Ord",
order: 100
) {
value: uint64;
value: uint64 (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ struct KeypointId (
"attr.rust.tuple_struct",
order: 200
) {
id: ushort;
id: ushort (order: 100);
}
2 changes: 1 addition & 1 deletion crates/re_types/definitions/rerun/components/radius.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ struct Radius (
"attr.rust.derive": "Copy, PartialEq, PartialOrd",
order: 100
) {
value: float;
value: float (order: 100);
}
2 changes: 1 addition & 1 deletion crates/re_types/definitions/rerun/datatypes/vec2d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ struct Vec2D (
"attr.rust.tuple_struct",
order: 100
) {
xy: [float: 2];
xy: [float: 2] (order: 100);
}
26 changes: 13 additions & 13 deletions crates/re_types/definitions/rerun/testing/components/fuzzy.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,93 +12,93 @@ table AffixFuzzer1 (
"attr.rust.derive": "PartialEq",
order: 100
) {
single_required: rerun.testing.datatypes.AffixFuzzer1 (required);
single_required: rerun.testing.datatypes.AffixFuzzer1 (required, order: 101);
}

table AffixFuzzer2 (
"attr.rust.derive": "PartialEq",
"attr.rust.tuple_struct",
order: 200
) {
single_required: rerun.testing.datatypes.AffixFuzzer1 (required);
single_required: rerun.testing.datatypes.AffixFuzzer1 (required, order: 102);
}

table AffixFuzzer3 (
"attr.rust.derive": "PartialEq",
order: 300
) {
single_required: rerun.testing.datatypes.AffixFuzzer1 (required);
single_required: rerun.testing.datatypes.AffixFuzzer1 (required, order: 103);
}

table AffixFuzzer4 (
"attr.rust.derive": "PartialEq",
order: 400
) {
single_optional: rerun.testing.datatypes.AffixFuzzer1;
single_optional: rerun.testing.datatypes.AffixFuzzer1 (order: 104);
}

table AffixFuzzer5 (
"attr.rust.derive": "PartialEq",
"attr.rust.tuple_struct",
order: 500
) {
single_optional: rerun.testing.datatypes.AffixFuzzer1;
single_optional: rerun.testing.datatypes.AffixFuzzer1 (order: 105);
}

table AffixFuzzer6 (
"attr.rust.derive": "PartialEq",
order: 600
) {
single_optional: rerun.testing.datatypes.AffixFuzzer1;
single_optional: rerun.testing.datatypes.AffixFuzzer1 (order: 106);
}

table AffixFuzzer7 (
"attr.rust.derive": "PartialEq",
order: 700
) {
many_optional: [rerun.testing.datatypes.AffixFuzzer1] (order: 100);
many_optional: [rerun.testing.datatypes.AffixFuzzer1] (order: 107);
}

table AffixFuzzer8 (
"attr.rust.derive": "PartialEq",
order: 800
) {
single_float_optional: float (order: 101);
single_float_optional: float (order: 108);
}

table AffixFuzzer9 (
"attr.rust.derive": "PartialEq, Eq",
order: 900
) {
single_string_required: string (order: 102, required);
single_string_required: string (required, order: 109);
}

table AffixFuzzer10 (
"attr.rust.derive": "PartialEq, Eq",
order: 1000
) {
single_string_optional: string (order: 103);
single_string_optional: string (order: 110);
}

table AffixFuzzer11 (
"attr.rust.derive": "PartialEq",
order: 1100
) {
many_floats_optional: [float] (order: 104);
many_floats_optional: [float] (order: 111);
}

table AffixFuzzer12 (
"attr.rust.derive": "PartialEq, Eq",
order: 1200
) {
many_strings_required: [string] (order: 105, required);
many_strings_required: [string] (required, order: 112);
}

table AffixFuzzer13 (
"attr.rust.derive": "PartialEq, Eq",
order: 1300
) {
many_strings_optional: [string] (order: 106);
many_strings_optional: [string] (order: 113);
}

// TODO(cmc): the ugly bug we need to take care of at some point
Expand Down
2 changes: 1 addition & 1 deletion crates/re_types/source_hash.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
# It can be safely removed at anytime to force the build script to run again.
# Check out build.rs to see how it's computed.
d05383876b33ae3b108ceffac46e0292a0dbc2253e3e777028181b4ed338315f
7dfe285eaa19872ddde875b16aa511da2b0e1f9fbeed723fa7a86920a2cc1738
1 change: 1 addition & 0 deletions crates/re_types_builder/src/objects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ impl Objects {
docs: _,
typ,
attrs,
order: _,
is_nullable: _,
is_deprecated: _,
datatype,
Expand Down

0 comments on commit 525a3e7

Please sign in to comment.