Removes 'size' and 'alignment' as Rust keywords (#8139)

csmulhern · web-flow · commit 5f453ef738d7 · 2024-11-12T05:13:02.000Z
* Adds fields for possibly reserved words to rust_namer_test

* Removes size and alignment as rust reserved words
diff --git a/samples/rust_generated/my_game/sample/vec_3_generated.rs b/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]
diff --git a/src/idl_gen_rust.cpp b/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]";
diff --git a/tests/arrays_test/my_game/example/array_struct_generated.rs b/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]
diff --git a/tests/arrays_test/my_game/example/nested_struct_generated.rs b/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]
diff --git a/tests/include_test1/my_game/other_name_space/unused_generated.rs b/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]
diff --git a/tests/include_test2/my_game/other_name_space/unused_generated.rs b/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]
diff --git a/tests/monster_test/my_game/example/ability_generated.rs b/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]
diff --git a/tests/monster_test/my_game/example/struct_of_structs_generated.rs b/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]
diff --git a/tests/monster_test/my_game/example/struct_of_structs_of_structs_generated.rs b/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]
diff --git a/tests/monster_test/my_game/example/test_generated.rs b/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]
diff --git a/tests/monster_test/my_game/example/vec_3_generated.rs b/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]
diff --git a/tests/monster_test/my_game/other_name_space/unused_generated.rs b/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]
diff --git a/tests/monster_test_serialize/my_game/example/ability_generated.rs b/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]
diff --git a/tests/monster_test_serialize/my_game/example/struct_of_structs_generated.rs b/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]
diff --git a/tests/monster_test_serialize/my_game/example/struct_of_structs_of_structs_generated.rs b/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]
diff --git a/tests/monster_test_serialize/my_game/example/test_generated.rs b/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]
diff --git a/tests/monster_test_serialize/my_game/example/vec_3_generated.rs b/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]
diff --git a/tests/monster_test_serialize/my_game/other_name_space/unused_generated.rs b/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]
diff --git a/tests/namespace_test/namespace_a/namespace_b/struct_in_nested_ns_generated.rs b/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]
diff --git a/tests/private_annotation_test/object_generated.rs b/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]
diff --git a/tests/rust_namer_test.fbs b/tests/rust_namer_test.fbs
@@ -16,12 +16,22 @@ table PlayerInputChange {}
 
 union GameMessage
 {
-    PlayerStatEvent,
-    PlayerSpectate,
+  PlayerStatEvent,
+  PlayerSpectate,
 	PlayerInputChange
 }
 
 table GameMessageWrapper
 {
 	Message:GameMessage;
-}
+}
+
+struct PossiblyReservedWords
+{
+  // Keywords reserved by Rust namer
+  follow: float;
+  push: float;
+  // Keywords no longer reserved by Rust namer
+  size: float;
+  alignment: float;
+}
diff --git a/tests/rust_namer_test/mod.rs b/tests/rust_namer_test/mod.rs
@@ -18,4 +18,6 @@ pub mod rust_namer_test {
   pub use self::player_input_change_generated::*;
   mod game_message_wrapper_generated;
   pub use self::game_message_wrapper_generated::*;
+  mod possibly_reserved_words_generated;
+  pub use self::possibly_reserved_words_generated::*;
 } // rust_namer_test
diff --git a/tests/rust_namer_test/rust_namer_test/possibly_reserved_words_generated.rs b/tests/rust_namer_test/rust_namer_test/possibly_reserved_words_generated.rs

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ impl<'b> flatbuffers::Push for Vec3 {`
`47`	`47`	`type Output = Vec3;`
`48`	`48`	`#[inline]`
`49`	`49`	`unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {`
`50`		`- let src = ::core::slice::from_raw_parts(self as const Vec3 as const u8, Self::size());`
	`50`	`+ let src = ::core::slice::from_raw_parts(self as const Vec3 as const u8, <Self as flatbuffers::Push>::size());`
`51`	`51`	`dst.copy_from_slice(src);`
`52`	`52`	`}`
`53`	`53`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ impl<'b> flatbuffers::Push for ArrayStruct {`
`50`	`50`	`type Output = ArrayStruct;`
`51`	`51`	`#[inline]`
`52`	`52`	`unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {`
`53`		`- let src = ::core::slice::from_raw_parts(self as const ArrayStruct as const u8, Self::size());`
	`53`	`+ let src = ::core::slice::from_raw_parts(self as const ArrayStruct as const u8, <Self as flatbuffers::Push>::size());`
`54`	`54`	`dst.copy_from_slice(src);`
`55`	`55`	`}`
`56`	`56`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ impl<'b> flatbuffers::Push for NestedStruct {`
`48`	`48`	`type Output = NestedStruct;`
`49`	`49`	`#[inline]`
`50`	`50`	`unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {`
`51`		`- let src = ::core::slice::from_raw_parts(self as const NestedStruct as const u8, Self::size());`
	`51`	`+ let src = ::core::slice::from_raw_parts(self as const NestedStruct as const u8, <Self as flatbuffers::Push>::size());`
`52`	`52`	`dst.copy_from_slice(src);`
`53`	`53`	`}`
`54`	`54`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ impl<'b> flatbuffers::Push for Unused {`
`45`	`45`	`type Output = Unused;`
`46`	`46`	`#[inline]`
`47`	`47`	`unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {`
`48`		`- let src = ::core::slice::from_raw_parts(self as const Unused as const u8, Self::size());`
	`48`	`+ let src = ::core::slice::from_raw_parts(self as const Unused as const u8, <Self as flatbuffers::Push>::size());`
`49`	`49`	`dst.copy_from_slice(src);`
`50`	`50`	`}`
`51`	`51`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ impl<'b> flatbuffers::Push for Ability {`
`46`	`46`	`type Output = Ability;`
`47`	`47`	`#[inline]`
`48`	`48`	`unsafe fn push(&self, dst: &mut [u8], _written_len: usize) {`
`49`		`- let src = ::core::slice::from_raw_parts(self as const Ability as const u8, Self::size());`
	`49`	`+ let src = ::core::slice::from_raw_parts(self as const Ability as const u8, <Self as flatbuffers::Push>::size());`
`50`	`50`	`dst.copy_from_slice(src);`
`51`	`51`	`}`
`52`	`52`	`#[inline]`