rebase shenanigans

rerun-io · Jul 7, 2023 · e070c0f · e070c0f
1 parent ae1df3a
commit e070c0f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/crates/re_types/definitions/rerun/testing/archetypes/fuzzy.fbs b/crates/re_types/definitions/rerun/testing/archetypes/fuzzy.fbs
@@ -68,6 +68,12 @@ table AffixFuzzer1 (
   fuzz2011: rerun.testing.components.AffixFuzzer11 ("attr.rerun.component_optional", nullable, order: 2011);
   fuzz2012: rerun.testing.components.AffixFuzzer12 ("attr.rerun.component_optional", nullable, order: 2012);
   fuzz2013: rerun.testing.components.AffixFuzzer13 ("attr.rerun.component_optional", nullable, order: 2013);
+  fuzz2014: rerun.testing.components.AffixFuzzer14 ("attr.rerun.component_optional", nullable, order: 2014);
+  // NOTE: nullable union -- illegal!
+  // fuzz2015: rerun.testing.components.AffixFuzzer15 ("attr.rerun.component_optional", nullable, order: 2015);
+  fuzz2016: rerun.testing.components.AffixFuzzer16 ("attr.rerun.component_optional", nullable, order: 2016);
+  fuzz2017: rerun.testing.components.AffixFuzzer17 ("attr.rerun.component_optional", nullable, order: 2017);
+  fuzz2018: rerun.testing.components.AffixFuzzer18 ("attr.rerun.component_optional", nullable, order: 2018);
 
   fuzz2101: [rerun.testing.components.AffixFuzzer1] ("attr.rerun.component_optional", nullable, order: 2101);
   fuzz2102: [rerun.testing.components.AffixFuzzer2] ("attr.rerun.component_optional", nullable, order: 2102);
@@ -82,4 +88,10 @@ table AffixFuzzer1 (
   fuzz2111: [rerun.testing.components.AffixFuzzer11] ("attr.rerun.component_optional", nullable, order: 2111);
   fuzz2112: [rerun.testing.components.AffixFuzzer12] ("attr.rerun.component_optional", nullable, order: 2112);
   fuzz2113: [rerun.testing.components.AffixFuzzer13] ("attr.rerun.component_optional", nullable, order: 2113);
+  fuzz2114: [rerun.testing.components.AffixFuzzer14] ("attr.rerun.component_optional", nullable, order: 2114);
+  // NOTE: nullable union -- illegal!
+  // fuzz2115: [rerun.testing.components.AffixFuzzer15] ("attr.rerun.component_optional", nullable, order: 2115);
+  fuzz2116: [rerun.testing.components.AffixFuzzer16] ("attr.rerun.component_optional", nullable, order: 2116);
+  fuzz2117: [rerun.testing.components.AffixFuzzer17] ("attr.rerun.component_optional", nullable, order: 2117);
+  fuzz2118: [rerun.testing.components.AffixFuzzer18] ("attr.rerun.component_optional", nullable, order: 2118);
 }
diff --git a/crates/re_types/definitions/rerun/testing/components/fuzzy.fbs b/crates/re_types/definitions/rerun/testing/components/fuzzy.fbs
@@ -113,7 +113,7 @@ table AffixFuzzer14 (
 //   "attr.rust.derive": "PartialEq",
 //   order: 1500
 // ) {
-//   single_optional_union: rerun.testing.datatypes.AffixFuzzer3 (is_nullable, order: 115);
+//   single_optional_union: rerun.testing.datatypes.AffixFuzzer3 (nullable, order: 115);
 // }
 
 table AffixFuzzer16 (
@@ -127,14 +127,14 @@ table AffixFuzzer17 (
   "attr.rust.derive": "PartialEq",
   order: 1700
 ) {
-  many_optional_unions: [rerun.testing.datatypes.AffixFuzzer3] (is_nullable, order: 117);
+  many_optional_unions: [rerun.testing.datatypes.AffixFuzzer3] (nullable, order: 117);
 }
 
 table AffixFuzzer18 (
   "attr.rust.derive": "PartialEq",
   order: 1800
 ) {
-  many_optional_unions: [rerun.testing.datatypes.AffixFuzzer4] (is_nullable, order: 118);
+  many_optional_unions: [rerun.testing.datatypes.AffixFuzzer4] (nullable, order: 118);
 }
 
 // TODO(cmc): the ugly bug we need to take care of at some point
@@ -143,5 +143,5 @@ table AffixFuzzer18 (
 //   order: 1400
 // ) {
 //
-//   many_transparent_optionals: rerun.testing.datatypes.AffixFuzzer2 (is_nullable, order: 107);
+//   many_transparent_optionals: rerun.testing.datatypes.AffixFuzzer2 (nullable, order: 107);
 // }
diff --git a/crates/re_types/definitions/rerun/testing/datatypes/fuzzy.fbs b/crates/re_types/definitions/rerun/testing/datatypes/fuzzy.fbs
@@ -54,7 +54,7 @@ union AffixFuzzer3 (
   order: 300
 ) {
   degrees: FlattenedScalar (transparent, order: 100),
-  radians: FlattenedScalar (transparent, is_nullable, order: 101),
+  radians: FlattenedScalar (transparent, nullable, order: 101),
   craziness: __AffixFuzzer1Vec (transparent, order: 102),
 }
 
@@ -72,5 +72,5 @@ union AffixFuzzer4 (
 ) {
   single_required: __AffixFuzzer3 (transparent, order: 100),
   many_required: __AffixFuzzer3Vec (transparent, order: 101),
-  many_optional: __AffixFuzzer3Vec (transparent, order: 102, is_nullable),
+  many_optional: __AffixFuzzer3Vec (transparent, order: 102, nullable),
 }
diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt
@@ -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.
-b0b0d5d6d0f4131e52331303a2c2dfdfa11e03936e97242ef897c2b158979273
+51e4e1d21a853de2f4d3b55d7d34d75cb3d6f0f7c01b701e9750256c759e9827