BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 03:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust generator: fix builder lifetime switch (#4912)

Browse Source
This commit is contained in:
Robert
2018-09-04 14:29:27 -07:00
committed by Wouter van Oortmerssen
parent c504a45404
commit 660c491265
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/idl_gen_rust.cpp
View File

@@ -351,7 +351,6 @@ class RustGenerator : public BaseGenerator {
case ftInteger: case ftInteger:
case ftFloat: case ftFloat:
case ftBool: case ftBool:
case ftTable:
case ftEnumKey: case ftEnumKey:
case ftUnionKey: case ftUnionKey:
case ftStruct: { return false; } case ftStruct: { return false; }

18
tests/namespace_test/namespace_test2_generated.rs
View File

@@ -42,7 +42,7 @@ impl<'a> TableInFirstNS<'a> {
#[allow(unused_mut)] #[allow(unused_mut)]
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>( pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>, _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
args: &'args TableInFirstNSArgs) -> flatbuffers::WIPOffset<TableInFirstNS<'bldr>> { args: &'args TableInFirstNSArgs<'args>) -> flatbuffers::WIPOffset<TableInFirstNS<'bldr>> {
let mut builder = TableInFirstNSBuilder::new(_fbb); let mut builder = TableInFirstNSBuilder::new(_fbb);
if let Some(x) = args.foo_struct { builder.add_foo_struct(x); } if let Some(x) = args.foo_struct { builder.add_foo_struct(x); }
if let Some(x) = args.foo_table { builder.add_foo_table(x); } if let Some(x) = args.foo_table { builder.add_foo_table(x); }
@@ -68,12 +68,12 @@ impl<'a> TableInFirstNS<'a> {
} }
} }
pub struct TableInFirstNSArgs { pub struct TableInFirstNSArgs<'a> {
pub foo_table: Option<flatbuffers::WIPOffset<namespace_b::TableInNestedNS<'a >>>, pub foo_table: Option<flatbuffers::WIPOffset<namespace_b::TableInNestedNS<'a >>>,
pub foo_enum: namespace_b::EnumInNestedNS, pub foo_enum: namespace_b::EnumInNestedNS,
pub foo_struct: Option<&'a namespace_b::StructInNestedNS>, pub foo_struct: Option<&'a namespace_b::StructInNestedNS>,
} }
impl<'a> Default for TableInFirstNSArgs { impl<'a> Default for TableInFirstNSArgs<'a> {
#[inline] #[inline]
fn default() -> Self { fn default() -> Self {
TableInFirstNSArgs { TableInFirstNSArgs {
@@ -142,7 +142,7 @@ impl<'a> SecondTableInA<'a> {
#[allow(unused_mut)] #[allow(unused_mut)]
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>( pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>, _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
args: &'args SecondTableInAArgs) -> flatbuffers::WIPOffset<SecondTableInA<'bldr>> { args: &'args SecondTableInAArgs<'args>) -> flatbuffers::WIPOffset<SecondTableInA<'bldr>> {
let mut builder = SecondTableInABuilder::new(_fbb); let mut builder = SecondTableInABuilder::new(_fbb);
if let Some(x) = args.refer_to_c { builder.add_refer_to_c(x); } if let Some(x) = args.refer_to_c { builder.add_refer_to_c(x); }
builder.finish() builder.finish()
@@ -156,10 +156,10 @@ impl<'a> SecondTableInA<'a> {
} }
} }
pub struct SecondTableInAArgs { pub struct SecondTableInAArgs<'a> {
pub refer_to_c: Option<flatbuffers::WIPOffset<super::namespace_c::TableInC<'a >>>, pub refer_to_c: Option<flatbuffers::WIPOffset<super::namespace_c::TableInC<'a >>>,
} }
impl<'a> Default for SecondTableInAArgs { impl<'a> Default for SecondTableInAArgs<'a> {
#[inline] #[inline]
fn default() -> Self { fn default() -> Self {
SecondTableInAArgs { SecondTableInAArgs {
@@ -230,7 +230,7 @@ impl<'a> TableInC<'a> {
#[allow(unused_mut)] #[allow(unused_mut)]
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>( pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>, _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
args: &'args TableInCArgs) -> flatbuffers::WIPOffset<TableInC<'bldr>> { args: &'args TableInCArgs<'args>) -> flatbuffers::WIPOffset<TableInC<'bldr>> {
let mut builder = TableInCBuilder::new(_fbb); let mut builder = TableInCBuilder::new(_fbb);
if let Some(x) = args.refer_to_a2 { builder.add_refer_to_a2(x); } if let Some(x) = args.refer_to_a2 { builder.add_refer_to_a2(x); }
if let Some(x) = args.refer_to_a1 { builder.add_refer_to_a1(x); } if let Some(x) = args.refer_to_a1 { builder.add_refer_to_a1(x); }
@@ -250,11 +250,11 @@ impl<'a> TableInC<'a> {
} }
} }
pub struct TableInCArgs { pub struct TableInCArgs<'a> {
pub refer_to_a1: Option<flatbuffers::WIPOffset<super::namespace_a::TableInFirstNS<'a >>>, pub refer_to_a1: Option<flatbuffers::WIPOffset<super::namespace_a::TableInFirstNS<'a >>>,
pub refer_to_a2: Option<flatbuffers::WIPOffset<super::namespace_a::SecondTableInA<'a >>>, pub refer_to_a2: Option<flatbuffers::WIPOffset<super::namespace_a::SecondTableInA<'a >>>,
} }
impl<'a> Default for TableInCArgs { impl<'a> Default for TableInCArgs<'a> {
#[inline] #[inline]
fn default() -> Self { fn default() -> Self {
TableInCArgs { TableInCArgs {