Avoid using enum = null for older flatc versions (ubuntu 22.04)

Author: Tristramg

schema/lrs.fbs

@@ -52,14 +52,14 @@ table Node {
     connections:[Connection] (required);
 }
 
-enum Endpoint : byte { Begin = 1, End = 2 }
+enum Endpoint : byte { Unknown = 0, Begin = 1, End = 2 }
 /// A connection links a node to a segment
 table Connection {
     properties:[Property];
 
     segment_index:uint64;
     /// A segment is oriented. The endpoint indicates what end of the segment is connected to the node
-    endpoint:Endpoint = null;
+    endpoint:Endpoint;
 }
 
 ///  A traversal is a path in a network.
@@ -143,7 +143,7 @@ enum GeometryType : byte { Geographic = 1, Schematic = 2 }
 table GeometryView {
     properties:[Property];
 
-    geometry_type:GeometryType = null;
+    geometry_type:GeometryType = Geographic;
     anchors:[AnchorGeometry] (required);
     /// Must be the same size as the top level network array
     networks:[NetworkGeometry] (required);

src/lrs_generated.rs

@@ -10,12 +10,13 @@ extern crate flatbuffers;
 use self::flatbuffers::{EndianScalar, Follow};
 
 #[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")]
-pub const ENUM_MIN_ENDPOINT: i8 = 1;
+pub const ENUM_MIN_ENDPOINT: i8 = 0;
 #[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")]
 pub const ENUM_MAX_ENDPOINT: i8 = 2;
 #[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")]
 #[allow(non_camel_case_types)]
-pub const ENUM_VALUES_ENDPOINT: [Endpoint; 2] = [
+pub const ENUM_VALUES_ENDPOINT: [Endpoint; 3] = [
+  Endpoint::Unknown,
   Endpoint::Begin,
   Endpoint::End,
 ];
@@ -25,18 +26,21 @@ pub const ENUM_VALUES_ENDPOINT: [Endpoint; 2] = [
 pub struct Endpoint(pub i8);
 #[allow(non_upper_case_globals)]
 impl Endpoint {
+  pub const Unknown: Self = Self(0);
   pub const Begin: Self = Self(1);
   pub const End: Self = Self(2);
 
-  pub const ENUM_MIN: i8 = 1;
+  pub const ENUM_MIN: i8 = 0;
   pub const ENUM_MAX: i8 = 2;
   pub const ENUM_VALUES: &'static [Self] = &[
+    Self::Unknown,
     Self::Begin,
     Self::End,
   ];
   /// Returns the variant's name or "" if unknown.
   pub fn variant_name(self) -> Option<&'static str> {
     match self {
+      Self::Unknown => Some("Unknown"),
       Self::Begin => Some("Begin"),
       Self::End => Some("End"),
       _ => None,
@@ -1497,7 +1501,7 @@ impl<'a> Connection<'a> {
     let mut builder = ConnectionBuilder::new(_fbb);
     builder.add_segment_index(args.segment_index);
     if let Some(x) = args.properties { builder.add_properties(x); }
-    if let Some(x) = args.endpoint { builder.add_endpoint(x); }
+    builder.add_endpoint(args.endpoint);
     builder.finish()
   }
 
@@ -1518,11 +1522,11 @@ impl<'a> Connection<'a> {
   }
   /// A segment is oriented. The endpoint indicates what end of the segment is connected to the node
   #[inline]
-  pub fn endpoint(&self) -> Option<Endpoint> {
+  pub fn endpoint(&self) -> Endpoint {
     // Safety:
     // Created from valid Table for this object
     // which contains a valid value in this slot
-    unsafe { self._tab.get::<Endpoint>(Connection::VT_ENDPOINT, None)}
+    unsafe { self._tab.get::<Endpoint>(Connection::VT_ENDPOINT, Some(Endpoint::Unknown)).unwrap()}
   }
 }
 
@@ -1543,15 +1547,15 @@ impl flatbuffers::Verifiable for Connection<'_> {
 pub struct ConnectionArgs<'a> {
     pub properties: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Property<'a>>>>>,
     pub segment_index: u64,
-    pub endpoint: Option<Endpoint>,
+    pub endpoint: Endpoint,
 }
 impl<'a> Default for ConnectionArgs<'a> {
   #[inline]
   fn default() -> Self {
     ConnectionArgs {
       properties: None,
       segment_index: 0,
-      endpoint: None,
+      endpoint: Endpoint::Unknown,
     }
   }
 }
@@ -1571,7 +1575,7 @@ impl<'a: 'b, 'b> ConnectionBuilder<'a, 'b> {
   }
   #[inline]
   pub fn add_endpoint(&mut self, endpoint: Endpoint) {
-    self.fbb_.push_slot_always::<Endpoint>(Connection::VT_ENDPOINT, endpoint);
+    self.fbb_.push_slot::<Endpoint>(Connection::VT_ENDPOINT, endpoint, Endpoint::Unknown);
   }
   #[inline]
   pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> ConnectionBuilder<'a, 'b> {
@@ -2134,7 +2138,7 @@ impl<'a> GeometryView<'a> {
     if let Some(x) = args.networks { builder.add_networks(x); }
     if let Some(x) = args.anchors { builder.add_anchors(x); }
     if let Some(x) = args.properties { builder.add_properties(x); }
-    if let Some(x) = args.geometry_type { builder.add_geometry_type(x); }
+    builder.add_geometry_type(args.geometry_type);
     builder.finish()
   }
 
@@ -2147,11 +2151,11 @@ impl<'a> GeometryView<'a> {
     unsafe { self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Property>>>>(GeometryView::VT_PROPERTIES, None)}
   }
   #[inline]
-  pub fn geometry_type(&self) -> Option<GeometryType> {
+  pub fn geometry_type(&self) -> GeometryType {
     // Safety:
     // Created from valid Table for this object
     // which contains a valid value in this slot
-    unsafe { self._tab.get::<GeometryType>(GeometryView::VT_GEOMETRY_TYPE, None)}
+    unsafe { self._tab.get::<GeometryType>(GeometryView::VT_GEOMETRY_TYPE, Some(GeometryType::Geographic)).unwrap()}
   }
   #[inline]
   pub fn anchors(&self) -> flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<AnchorGeometry<'a>>> {
@@ -2187,7 +2191,7 @@ impl flatbuffers::Verifiable for GeometryView<'_> {
 }
 pub struct GeometryViewArgs<'a> {
     pub properties: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Property<'a>>>>>,
-    pub geometry_type: Option<GeometryType>,
+    pub geometry_type: GeometryType,
     pub anchors: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<AnchorGeometry<'a>>>>>,
     pub networks: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<NetworkGeometry<'a>>>>>,
 }
@@ -2196,7 +2200,7 @@ impl<'a> Default for GeometryViewArgs<'a> {
   fn default() -> Self {
     GeometryViewArgs {
       properties: None,
-      geometry_type: None,
+      geometry_type: GeometryType::Geographic,
       anchors: None, // required field
       networks: None, // required field
     }
@@ -2214,7 +2218,7 @@ impl<'a: 'b, 'b> GeometryViewBuilder<'a, 'b> {
   }
   #[inline]
   pub fn add_geometry_type(&mut self, geometry_type: GeometryType) {
-    self.fbb_.push_slot_always::<GeometryType>(GeometryView::VT_GEOMETRY_TYPE, geometry_type);
+    self.fbb_.push_slot::<GeometryType>(GeometryView::VT_GEOMETRY_TYPE, geometry_type, GeometryType::Geographic);
   }
   #[inline]
   pub fn add_anchors(&mut self, anchors: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<AnchorGeometry<'b >>>>) {