BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

Updates Rust codegen to use proper indentation (#8952)

Browse Source 
* Fixes identation of generated Rust code

* Regenerates generated schemas
This commit is contained in:
Cameron Mulhern
2026-03-05 09:04:55 -05:00
committed by GitHub
parent 2b8e4d3af0
commit 57659d9f38
105 changed files with 16456 additions and 16412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
goldens/rust/basic_generated.rs
View File

@@ -306,12 +306,16 @@ pub mod flatbuffers {
#[inline]
pub fn finish_universe_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Universe<'a>>) {
root: ::flatbuffers::WIPOffset<Universe<'a>>
) {
fbb.finish(root, None);
}
#[inline]
pub fn finish_size_prefixed_universe_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, root: ::flatbuffers::WIPOffset<Universe<'a>>) {
pub fn finish_size_prefixed_universe_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Universe<'a>>
) {
fbb.finish_size_prefixed(root, None);
}
} // pub mod goldens

8
samples/rust_generated/my_game/sample/monster_generated.rs
View File

@@ -491,11 +491,15 @@ pub unsafe fn size_prefixed_root_as_monster_unchecked(buf: &[u8]) -> Monster<'_>
#[inline]
pub fn finish_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Monster<'a>>) {
root: ::flatbuffers::WIPOffset<Monster<'a>>
) {
fbb.finish(root, None);
}
#[inline]
pub fn finish_size_prefixed_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, root: ::flatbuffers::WIPOffset<Monster<'a>>) {
pub fn finish_size_prefixed_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Monster<'a>>
) {
fbb.finish_size_prefixed(root, None);
}

84
src/idl_gen_rust.cpp
View File

@@ -794,8 +794,10 @@ class RustGenerator : public BaseGenerator {
});
code_ += "";
// Generate Associated constants
code_ += " pub const ENUM_MIN: {{BASE_TYPE}} = {{ENUM_MIN_BASE_VALUE}};";
code_ += " pub const ENUM_MAX: {{BASE_TYPE}} = {{ENUM_MAX_BASE_VALUE}};";
code_ +=
" pub const ENUM_MIN: {{BASE_TYPE}} = {{ENUM_MIN_BASE_VALUE}};";
code_ +=
" pub const ENUM_MAX: {{BASE_TYPE}} = {{ENUM_MAX_BASE_VALUE}};";
code_ += " pub const ENUM_VALUES: &'static [Self] = &[";
ForAllEnumValues(enum_def, [&]() { code_ += " Self::{{VARIANT}},"; });
code_ += " ];";
@@ -821,7 +823,8 @@ class RustGenerator : public BaseGenerator {
code_ += " if let Some(name) = self.variant_name() {";
code_ += " f.write_str(name)";
code_ += " } else {";
code_ += " f.write_fmt(format_args!(\"<UNKNOWN {:?}>\", self.0))";
code_ +=
" f.write_fmt(format_args!(\"<UNKNOWN {:?}>\", self.0))";
code_ += " }";
code_ += " }";
code_ += "}";
@@ -834,7 +837,8 @@ class RustGenerator : public BaseGenerator {
if (parser_.opts.rust_serialize) {
code_ += "impl Serialize for {{ENUM_TY}} {";
code_ +=
" fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>";
" fn serialize<S>(&self, serializer: S) -> Result<S::Ok, "
"S::Error>";
code_ += " where";
code_ += " S: Serializer,";
code_ += " {";
@@ -859,7 +863,9 @@ class RustGenerator : public BaseGenerator {
code_ += " {";
code_ += " let s = String::deserialize(deserializer)?;";
code_ += " for item in {{ENUM_TY}}::ENUM_VALUES {";
code_ += " if let Some(item_name) = item.variant_name() {";
code_ +=
" if let Some(item_name) = "
"item.variant_name() {";
code_ += " if item_name == s {";
code_ += " return Ok(item.clone());";
code_ += " }";
@@ -1013,7 +1019,8 @@ class RustGenerator : public BaseGenerator {
// Pack flatbuffers union value
code_ +=
" pub fn pack<'b, A: ::flatbuffers::Allocator + 'b>(&self, fbb: &mut "
" pub fn pack<'b, A: ::flatbuffers::Allocator + 'b>(&self, fbb: "
"&mut "
"::flatbuffers::FlatBufferBuilder<'b, A>)"
" -> Option<::flatbuffers::WIPOffset<::flatbuffers::UnionWIPOffset>>"
" {";
@@ -1768,7 +1775,8 @@ class RustGenerator : public BaseGenerator {
" pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: "
"::flatbuffers::Allocator + 'bldr>(";
code_ +=
" _fbb: &'mut_bldr mut ::flatbuffers::FlatBufferBuilder<'bldr, A>,";
" _fbb: &'mut_bldr mut ::flatbuffers::FlatBufferBuilder<'bldr, "
"A>,";
code_ += " {{MAYBE_US}}args: &'args {{STRUCT_TY}}Args{{MAYBE_LT}}";
code_ += " ) -> ::flatbuffers::WIPOffset<{{STRUCT_TY}}<'bldr>> {";
@@ -1967,7 +1975,8 @@ class RustGenerator : public BaseGenerator {
code_ += " // Created from a valid Table for this object";
code_ += " // Which contains a valid flatbuffer in this slot";
code_ +=
" unsafe { <::flatbuffers::ForwardsUOffset<{{NESTED}}<'a>>>"
" unsafe { "
"<::flatbuffers::ForwardsUOffset<{{NESTED}}<'a>>>"
"::follow(data.bytes(), 0) }";
code_ += " })";
}
@@ -2014,10 +2023,13 @@ class RustGenerator : public BaseGenerator {
} else {
code_ += " self.{{FIELD}}().map(|t| {";
code_ += " // Safety:";
code_ += " // Created from a valid Table for this object";
code_ += " // Which contains a valid union in this slot";
code_ +=
" unsafe { {{U_ELEMENT_TABLE_TYPE}}::init_from_table(t) "
" // Created from a valid Table for this object";
code_ +=
" // Which contains a valid union in this slot";
code_ +=
" unsafe { "
"{{U_ELEMENT_TABLE_TYPE}}::init_from_table(t) "
"}";
code_ += " })";
}
@@ -2036,7 +2048,7 @@ class RustGenerator : public BaseGenerator {
code_ += " fn run_verifier(";
code_ += " v: &mut ::flatbuffers::Verifier, pos: usize";
code_ += " ) -> Result<(), ::flatbuffers::InvalidFlatbuffer> {";
code_ += " v.visit_table(pos)?\\";
code_ += " v.visit_table(pos)?";
// Escape newline and insert it onthe next line so we can end the builder
// with a nice semicolon.
ForAllTableFields(struct_def, [&](const FieldDef& field) {
@@ -2047,8 +2059,8 @@ class RustGenerator : public BaseGenerator {
// All types besides unions.
code_.SetValue("TY", FollowType(field.value.type, "'_"));
code_ +=
"\n .visit_field::<{{TY}}>(\"{{FIELD}}\", "
"Self::{{OFFSET_NAME}}, {{IS_REQ}})?\\";
" .visit_field::<{{TY}}>(\"{{FIELD}}\", "
"Self::{{OFFSET_NAME}}, {{IS_REQ}})?";
return;
}
// Unions.
@@ -2059,7 +2071,7 @@ class RustGenerator : public BaseGenerator {
code_.SetValue("UNION_TYPE_METHOD",
namer_.LegacyRustUnionTypeMethod(field));
code_ +=
"\n .visit_union::<{{UNION_TYPE}}, _>("
" .visit_union::<{{UNION_TYPE}}, _>("
"\"{{UNION_TYPE_METHOD}}\", Self::{{UNION_TYPE_OFFSET_NAME}}, "
"\"{{FIELD}}\", Self::{{OFFSET_NAME}}, {{IS_REQ}}, "
"|key, v, pos| {";
@@ -2067,15 +2079,16 @@ class RustGenerator : public BaseGenerator {
ForAllUnionVariantsBesidesNone(union_def, [&](const EnumVal& unused) {
(void)unused;
code_ +=
" {{U_ELEMENT_ENUM_TYPE}} => v.verify_union_variant::"
" {{U_ELEMENT_ENUM_TYPE}} => "
"v.verify_union_variant::"
"<::flatbuffers::ForwardsUOffset<{{U_ELEMENT_TABLE_TYPE}}>>("
"\"{{U_ELEMENT_ENUM_TYPE}}\", pos),";
});
code_ += " _ => Ok(()),";
code_ += " }";
code_ += " })?\\";
code_ += " })?";
});
code_ += "\n .finish();";
code_ += " .finish();";
code_ += " Ok(())";
code_ += " }";
code_ += "}";
@@ -2087,7 +2100,7 @@ class RustGenerator : public BaseGenerator {
code_ += "{{ACCESS_TYPE}} struct {{STRUCT_TY}}Args{{MAYBE_LT}} {";
ForAllTableFields(struct_def, [&](const FieldDef& field) {
code_.SetValue("PARAM_TYPE", TableBuilderArgsDefnType(field, "'a"));
code_ += " pub {{FIELD}}: {{PARAM_TYPE}},";
code_ += "pub {{FIELD}}: {{PARAM_TYPE}},";
});
code_ += "}";
code_ += "";
@@ -2112,17 +2125,19 @@ class RustGenerator : public BaseGenerator {
code_.SetValue("NUM_FIELDS", NumToString(numFields));
code_ += "impl Serialize for {{STRUCT_TY}}<'_> {";
code_ +=
" fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>";
" fn serialize<S>(&self, serializer: S) -> Result<S::Ok, "
"S::Error>";
code_ += " where";
code_ += " S: Serializer,";
code_ += " {";
if (numFields == 0) {
code_ +=
" let s = serializer.serialize_struct(\"{{STRUCT_TY}}\", 0)?;";
" let s = serializer.serialize_struct(\"{{STRUCT_TY}}\", "
"0)?;";
} else {
code_ +=
" let mut s = serializer.serialize_struct(\"{{STRUCT_TY}}\", "
"{{NUM_FIELDS}})?;";
" let mut s = "
"serializer.serialize_struct(\"{{STRUCT_TY}}\", {{NUM_FIELDS}})?;";
}
ForAllTableFields(struct_def, [&](const FieldDef& field) {
const Type& type = field.value.type;
@@ -2549,7 +2564,8 @@ class RustGenerator : public BaseGenerator {
code_ +=
") -> Result<{{STRUCT_TY}}<'b>, ::flatbuffers::InvalidFlatbuffer>"
" {";
code_ += " ::flatbuffers::root_with_opts::<{{STRUCT_TY}}<'b>>(opts, buf)";
code_ +=
" ::flatbuffers::root_with_opts::<{{STRUCT_TY}}<'b>>(opts, buf)";
code_ += "}";
code_ += "";
@@ -2586,7 +2602,8 @@ class RustGenerator : public BaseGenerator {
code_ +=
"pub unsafe fn root_as_{{STRUCT_FN}}_unchecked"
"(buf: &[u8]) -> {{STRUCT_TY}}<'_> {";
code_ += " unsafe { ::flatbuffers::root_unchecked::<{{STRUCT_TY}}>(buf) }";
code_ +=
" unsafe { ::flatbuffers::root_unchecked::<{{STRUCT_TY}}>(buf) }";
code_ += "}";
code_ += "";
@@ -2645,7 +2662,8 @@ class RustGenerator : public BaseGenerator {
"pub fn finish_{{STRUCT_FN}}_buffer<'a, 'b, A: "
"::flatbuffers::Allocator + 'a>(";
code_ += " fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,";
code_ += " root: ::flatbuffers::WIPOffset<{{STRUCT_TY}}<'a>>) {";
code_ += " root: ::flatbuffers::WIPOffset<{{STRUCT_TY}}<'a>>";
code_ += ") {";
if (parser_.file_identifier_.length()) {
code_ += " fbb.finish(root, Some({{STRUCT_CONST}}_IDENTIFIER));";
} else {
@@ -2656,9 +2674,10 @@ class RustGenerator : public BaseGenerator {
code_ += "#[inline]";
code_ +=
"pub fn finish_size_prefixed_{{STRUCT_FN}}_buffer"
"<'a, 'b, A: ::flatbuffers::Allocator + 'a>("
"fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, "
"root: ::flatbuffers::WIPOffset<{{STRUCT_TY}}<'a>>) {";
"<'a, 'b, A: ::flatbuffers::Allocator + 'a>(";
code_ += " fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,";
code_ += " root: ::flatbuffers::WIPOffset<{{STRUCT_TY}}<'a>>";
code_ += ") {";
if (parser_.file_identifier_.length()) {
code_ +=
" fbb.finish_size_prefixed(root, "
@@ -2740,8 +2759,8 @@ class RustGenerator : public BaseGenerator {
code_ += "{{ACCESS_TYPE}} struct {{STRUCT_TY}}(pub [u8; {{STRUCT_SIZE}}]);";
code_ += "";
code_ += "impl Default for {{STRUCT_TY}} { ";
code_ += " fn default() -> Self { ";
code_ += "impl Default for {{STRUCT_TY}} {";
code_ += " fn default() -> Self {";
code_ += " Self([0; {{STRUCT_SIZE}}])";
code_ += " }";
code_ += "}";
@@ -2828,7 +2847,8 @@ class RustGenerator : public BaseGenerator {
code_.SetValue("NUM_FIELDS", NumToString(numFields));
code_ += "impl Serialize for {{STRUCT_TY}} {";
code_ +=
" fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>";
" fn serialize<S>(&self, serializer: S) -> Result<S::Ok, "
"S::Error>";
code_ += " where";
code_ += " S: Serializer,";
code_ += " {";

8
tests/arrays_test/my_game/example/array_table_generated.rs
View File

@@ -229,11 +229,15 @@ pub const ARRAY_TABLE_EXTENSION: &str = "mon";
#[inline]
pub fn finish_array_table_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<ArrayTable<'a>>) {
root: ::flatbuffers::WIPOffset<ArrayTable<'a>>
) {
fbb.finish(root, Some(ARRAY_TABLE_IDENTIFIER));
}
#[inline]
pub fn finish_size_prefixed_array_table_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, root: ::flatbuffers::WIPOffset<ArrayTable<'a>>) {
pub fn finish_size_prefixed_array_table_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<ArrayTable<'a>>
) {
fbb.finish_size_prefixed(root, Some(ARRAY_TABLE_IDENTIFIER));
}

8
tests/monster_test/my_game/example/monster_generated.rs
View File

@@ -2138,11 +2138,15 @@ pub const MONSTER_EXTENSION: &str = "mon";
#[inline]
pub fn finish_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Monster<'a>>) {
root: ::flatbuffers::WIPOffset<Monster<'a>>
) {
fbb.finish(root, Some(MONSTER_IDENTIFIER));
}
#[inline]
pub fn finish_size_prefixed_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, root: ::flatbuffers::WIPOffset<Monster<'a>>) {
pub fn finish_size_prefixed_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Monster<'a>>
) {
fbb.finish_size_prefixed(root, Some(MONSTER_IDENTIFIER));
}

8
tests/monster_test_serialize/my_game/example/monster_generated.rs
View File

@@ -2365,11 +2365,15 @@ pub const MONSTER_EXTENSION: &str = "mon";
#[inline]
pub fn finish_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Monster<'a>>) {
root: ::flatbuffers::WIPOffset<Monster<'a>>
) {
fbb.finish(root, Some(MONSTER_IDENTIFIER));
}
#[inline]
pub fn finish_size_prefixed_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, root: ::flatbuffers::WIPOffset<Monster<'a>>) {
pub fn finish_size_prefixed_monster_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<Monster<'a>>
) {
fbb.finish_size_prefixed(root, Some(MONSTER_IDENTIFIER));
}

8
tests/optional_scalars/optional_scalars/scalar_stuff_generated.rs
View File

@@ -1101,11 +1101,15 @@ pub const SCALAR_STUFF_EXTENSION: &str = "mon";
#[inline]
pub fn finish_scalar_stuff_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<ScalarStuff<'a>>) {
root: ::flatbuffers::WIPOffset<ScalarStuff<'a>>
) {
fbb.finish(root, Some(SCALAR_STUFF_IDENTIFIER));
}
#[inline]
pub fn finish_size_prefixed_scalar_stuff_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>, root: ::flatbuffers::WIPOffset<ScalarStuff<'a>>) {
pub fn finish_size_prefixed_scalar_stuff_buffer<'a, 'b, A: ::flatbuffers::Allocator + 'a>(
fbb: &'b mut ::flatbuffers::FlatBufferBuilder<'a, A>,
root: ::flatbuffers::WIPOffset<ScalarStuff<'a>>
) {
fbb.finish_size_prefixed(root, Some(SCALAR_STUFF_IDENTIFIER));
}