Removes size and alignment as rust reserved words

samples/rust_generated/my_game/sample/vec_3_generated.rs

@@ -47,7 +47,7 @@ impl<'b> flatbuffers::Push for Vec3 {
     type Output = Vec3;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Vec3 as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Vec3 as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

src/idl_gen_rust.cpp

@@ -131,8 +131,6 @@ static std::set<std::string> RustKeywords() {
     // Terms that we use ourselves
     "follow",
     "push",
-    "size",
-    "alignment",
     "to_little_endian",
     "from_little_endian",
     "ENUM_MAX",
@@ -2700,7 +2698,7 @@ class RustGenerator : public BaseGenerator {
     code_ += "    unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {";
     code_ +=
         "        let src = ::core::slice::from_raw_parts(self as *const "
-        "{{STRUCT_TY}} as *const u8, Self::size());";
+        "{{STRUCT_TY}} as *const u8, <Self as flatbuffers::Push>::size());";
     code_ += "        dst.copy_from_slice(src);";
     code_ += "    }";
     code_ += "    #[inline]";

tests/arrays_test/my_game/example/array_struct_generated.rs

@@ -50,7 +50,7 @@ impl<'b> flatbuffers::Push for ArrayStruct {
     type Output = ArrayStruct;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const ArrayStruct as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const ArrayStruct as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/arrays_test/my_game/example/nested_struct_generated.rs

@@ -48,7 +48,7 @@ impl<'b> flatbuffers::Push for NestedStruct {
     type Output = NestedStruct;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const NestedStruct as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const NestedStruct as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/include_test1/my_game/other_name_space/unused_generated.rs

@@ -45,7 +45,7 @@ impl<'b> flatbuffers::Push for Unused {
     type Output = Unused;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/include_test2/my_game/other_name_space/unused_generated.rs

@@ -45,7 +45,7 @@ impl<'b> flatbuffers::Push for Unused {
     type Output = Unused;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test/my_game/example/ability_generated.rs

@@ -46,7 +46,7 @@ impl<'b> flatbuffers::Push for Ability {
     type Output = Ability;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Ability as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Ability as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test/my_game/example/struct_of_structs_generated.rs

@@ -47,7 +47,7 @@ impl<'b> flatbuffers::Push for StructOfStructs {
     type Output = StructOfStructs;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const StructOfStructs as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const StructOfStructs as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test/my_game/example/struct_of_structs_of_structs_generated.rs

@@ -45,7 +45,7 @@ impl<'b> flatbuffers::Push for StructOfStructsOfStructs {
     type Output = StructOfStructsOfStructs;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const StructOfStructsOfStructs as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const StructOfStructsOfStructs as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test/my_game/example/test_generated.rs

@@ -46,7 +46,7 @@ impl<'b> flatbuffers::Push for Test {
     type Output = Test;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Test as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Test as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test/my_game/example/vec_3_generated.rs

@@ -50,7 +50,7 @@ impl<'b> flatbuffers::Push for Vec3 {
     type Output = Vec3;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Vec3 as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Vec3 as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test/my_game/other_name_space/unused_generated.rs

@@ -45,7 +45,7 @@ impl<'b> flatbuffers::Push for Unused {
     type Output = Unused;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test_serialize/my_game/example/ability_generated.rs

@@ -48,7 +48,7 @@ impl<'b> flatbuffers::Push for Ability {
     type Output = Ability;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Ability as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Ability as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test_serialize/my_game/example/struct_of_structs_generated.rs

@@ -49,7 +49,7 @@ impl<'b> flatbuffers::Push for StructOfStructs {
     type Output = StructOfStructs;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const StructOfStructs as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const StructOfStructs as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test_serialize/my_game/example/struct_of_structs_of_structs_generated.rs

@@ -47,7 +47,7 @@ impl<'b> flatbuffers::Push for StructOfStructsOfStructs {
     type Output = StructOfStructsOfStructs;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const StructOfStructsOfStructs as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const StructOfStructsOfStructs as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test_serialize/my_game/example/test_generated.rs

@@ -48,7 +48,7 @@ impl<'b> flatbuffers::Push for Test {
     type Output = Test;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Test as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Test as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test_serialize/my_game/example/vec_3_generated.rs

@@ -52,7 +52,7 @@ impl<'b> flatbuffers::Push for Vec3 {
     type Output = Vec3;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Vec3 as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Vec3 as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/monster_test_serialize/my_game/other_name_space/unused_generated.rs

@@ -47,7 +47,7 @@ impl<'b> flatbuffers::Push for Unused {
     type Output = Unused;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Unused as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/namespace_test/namespace_a/namespace_b/struct_in_nested_ns_generated.rs

@@ -46,7 +46,7 @@ impl<'b> flatbuffers::Push for StructInNestedNS {
     type Output = StructInNestedNS;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const StructInNestedNS as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const StructInNestedNS as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/private_annotation_test/object_generated.rs

@@ -45,7 +45,7 @@ impl<'b> flatbuffers::Push for Object {
     type Output = Object;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const Object as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const Object as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
     #[inline]

tests/rust_namer_test.fbs

@@ -31,6 +31,7 @@ struct PossiblyReservedWords
   // Keywords reserved by Rust namer
   follow: float;
   push: float;
+  // Keywords no longer reserved by Rust namer
   size: float;
   alignment: float;
 }

tests/rust_namer_test/rust_namer_test/possibly_reserved_words_generated.rs

@@ -23,8 +23,8 @@ impl core::fmt::Debug for PossiblyReservedWords {
     f.debug_struct("PossiblyReservedWords")
       .field("follow_", &self.follow_())
       .field("push_", &self.push_())
-      .field("size_", &self.size_())
-      .field("alignment_", &self.alignment_())
+      .field("size", &self.size())
+      .field("alignment", &self.alignment())
       .finish()
   }
 }
@@ -48,9 +48,13 @@ impl<'b> flatbuffers::Push for PossiblyReservedWords {
     type Output = PossiblyReservedWords;
     #[inline]
     unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {
-        let src = ::core::slice::from_raw_parts(self as *const PossiblyReservedWords as *const u8, Self::size());
+        let src = ::core::slice::from_raw_parts(self as *const PossiblyReservedWords as *const u8, <Self as flatbuffers::Push>::size());
         dst.copy_from_slice(src);
     }
+    #[inline]
+    fn alignment() -> flatbuffers::PushAlignment {
+        flatbuffers::PushAlignment::new(4)
+    }
 }
 
 impl<'a> flatbuffers::Verifiable for PossiblyReservedWords {
@@ -68,14 +72,14 @@ impl<'a> PossiblyReservedWords {
   pub fn new(
     follow_: f32,
     push_: f32,
-    size_: f32,
-    alignment_: f32,
+    size: f32,
+    alignment: f32,
   ) -> Self {
     let mut s = Self([0; 16]);
     s.set_follow_(follow_);
     s.set_push_(push_);
-    s.set_size_(size_);
-    s.set_alignment_(alignment_);
+    s.set_size(size);
+    s.set_alignment(alignment);
     s
   }
 
@@ -141,7 +145,7 @@ impl<'a> PossiblyReservedWords {
     }
   }
 
-  pub fn size_(&self) -> f32 {
+  pub fn size(&self) -> f32 {
     let mut mem = core::mem::MaybeUninit::<<f32 as EndianScalar>::Scalar>::uninit();
     // Safety:
     // Created from a valid Table for this object
@@ -156,7 +160,7 @@ impl<'a> PossiblyReservedWords {
     })
   }
 
-  pub fn set_size_(&mut self, x: f32) {
+  pub fn set_size(&mut self, x: f32) {
     let x_le = x.to_little_endian();
     // Safety:
     // Created from a valid Table for this object
@@ -170,7 +174,7 @@ impl<'a> PossiblyReservedWords {
     }
   }
 
-  pub fn alignment_(&self) -> f32 {
+  pub fn alignment(&self) -> f32 {
     let mut mem = core::mem::MaybeUninit::<<f32 as EndianScalar>::Scalar>::uninit();
     // Safety:
     // Created from a valid Table for this object
@@ -185,7 +189,7 @@ impl<'a> PossiblyReservedWords {
     })
   }
 
-  pub fn set_alignment_(&mut self, x: f32) {
+  pub fn set_alignment(&mut self, x: f32) {
     let x_le = x.to_little_endian();
     // Safety:
     // Created from a valid Table for this object
@@ -203,8 +207,8 @@ impl<'a> PossiblyReservedWords {
     PossiblyReservedWordsT {
       follow_: self.follow_(),
       push_: self.push_(),
-      size_: self.size_(),
-      alignment_: self.alignment_(),
+      size: self.size(),
+      alignment: self.alignment(),
     }
   }
 }
@@ -213,16 +217,16 @@ impl<'a> PossiblyReservedWords {
 pub struct PossiblyReservedWordsT {
   pub follow_: f32,
   pub push_: f32,
-  pub size_: f32,
-  pub alignment_: f32,
+  pub size: f32,
+  pub alignment: f32,
 }
 impl PossiblyReservedWordsT {
   pub fn pack(&self) -> PossiblyReservedWords {
     PossiblyReservedWords::new(
       self.follow_,
       self.push_,
-      self.size_,
-      self.alignment_,
+      self.size,
+      self.alignment,
     )
   }
 }