mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-02 04:04:19 +00:00
* Bugfix for Rust generation of union fields named with language keywords
Looking at ParseField, it appears that in the case of unions, an extra field with a `UnionTypeFieldSuffix` is added to the type definition, however, if the name of this field is a keyword in the target language, it isn't escaped.
For example, if generating code for rust for a union field named `type`, flatc will generate a (non-keyword escaped) field named `type_type` for this hidden union field, and one (keyword escaped) called `type_` for the actual union contents.
When the union accessors are generated, they refer to this `type_type` field, but they will escape it mistakenly, generating code like this:
```
#[inline]
#[allow(non_snake_case)]
pub fn type__as_int(&self) -> Option<Int<'a>> {
if self.type__type() == Type::Int {
self.type_().map(|u| Int::init_from_table(u))
} else {
None
}
}
```
Which will fail to build because the field is called `self.type_type()`, not `self.type__type()`.
* [Rust] Add crate-relative use statements for FBS includes.
At present if a flatbuffer description includes a reference to a type in
another file, the generated Rust code needs to be hand-modified to add
the appropriate `use` statements.
This assumes that the dependencies are built into the same crate, which
I think is a reasonable assumption?
* Revert "[Rust] Add crate-relative use statements for FBS includes."
This reverts commit d554d79fec.
* Add updated generated test files.
* Fixing Rust test harness to handle new includes.
Test binaries need to add references to generated code that's
transitively included.
This also has the knock-on in that this code (which is referenced by
include directives directly in the flatbuffer schema files) also needs
to be generated, hence the changes to generate_code.sh.
* Test harnesses expect test data to be checked in.
Put include_test2 files into the same directory as the include_test2
schema definition.
Update all code generation scripts (forgot the batch file from last
time).
Path updates in Rust test.
* Include updated generated code
* Address comments raised in PR
* Fix failing Rust tests.
* Previous merge clobbered this branch change.
* Add updated imports to benchmarks.
* Clarifying comment per PR request
* Update documentation comments per feedback
* Remove non-Rust generated files for include tests, per feedback from @rw/@aardappel
* Broken code generation batch file
* Fix typo
* Add TODO for tidying up use declaration traversal sometime in the future
* Update test files.
223 lines
5.5 KiB
Rust
223 lines
5.5 KiB
Rust
// automatically generated by the FlatBuffers compiler, do not modify
|
|
|
|
|
|
|
|
use crate::include_test1_generated::*;
|
|
use std::mem;
|
|
use std::cmp::Ordering;
|
|
|
|
extern crate flatbuffers;
|
|
use self::flatbuffers::EndianScalar;
|
|
|
|
#[allow(unused_imports, dead_code)]
|
|
pub mod my_game {
|
|
|
|
use crate::include_test1_generated::*;
|
|
use std::mem;
|
|
use std::cmp::Ordering;
|
|
|
|
extern crate flatbuffers;
|
|
use self::flatbuffers::EndianScalar;
|
|
#[allow(unused_imports, dead_code)]
|
|
pub mod other_name_space {
|
|
|
|
use crate::include_test1_generated::*;
|
|
use std::mem;
|
|
use std::cmp::Ordering;
|
|
|
|
extern crate flatbuffers;
|
|
use self::flatbuffers::EndianScalar;
|
|
|
|
#[allow(non_camel_case_types)]
|
|
#[repr(i64)]
|
|
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
|
|
pub enum FromInclude {
|
|
IncludeVal = 0,
|
|
|
|
}
|
|
|
|
pub const ENUM_MIN_FROM_INCLUDE: i64 = 0;
|
|
pub const ENUM_MAX_FROM_INCLUDE: i64 = 0;
|
|
|
|
impl<'a> flatbuffers::Follow<'a> for FromInclude {
|
|
type Inner = Self;
|
|
#[inline]
|
|
fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
|
|
flatbuffers::read_scalar_at::<Self>(buf, loc)
|
|
}
|
|
}
|
|
|
|
impl flatbuffers::EndianScalar for FromInclude {
|
|
#[inline]
|
|
fn to_little_endian(self) -> Self {
|
|
let n = i64::to_le(self as i64);
|
|
let p = &n as *const i64 as *const FromInclude;
|
|
unsafe { *p }
|
|
}
|
|
#[inline]
|
|
fn from_little_endian(self) -> Self {
|
|
let n = i64::from_le(self as i64);
|
|
let p = &n as *const i64 as *const FromInclude;
|
|
unsafe { *p }
|
|
}
|
|
}
|
|
|
|
impl flatbuffers::Push for FromInclude {
|
|
type Output = FromInclude;
|
|
#[inline]
|
|
fn push(&self, dst: &mut [u8], _rest: &[u8]) {
|
|
flatbuffers::emplace_scalar::<FromInclude>(dst, *self);
|
|
}
|
|
}
|
|
|
|
#[allow(non_camel_case_types)]
|
|
pub const ENUM_VALUES_FROM_INCLUDE:[FromInclude; 1] = [
|
|
FromInclude::IncludeVal
|
|
];
|
|
|
|
#[allow(non_camel_case_types)]
|
|
pub const ENUM_NAMES_FROM_INCLUDE:[&'static str; 1] = [
|
|
"IncludeVal"
|
|
];
|
|
|
|
pub fn enum_name_from_include(e: FromInclude) -> &'static str {
|
|
let index = e as i64;
|
|
ENUM_NAMES_FROM_INCLUDE[index as usize]
|
|
}
|
|
|
|
// struct Unused, aligned to 4
|
|
#[repr(C, align(4))]
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
pub struct Unused {
|
|
a_: i32,
|
|
} // pub struct Unused
|
|
impl flatbuffers::SafeSliceAccess for Unused {}
|
|
impl<'a> flatbuffers::Follow<'a> for Unused {
|
|
type Inner = &'a Unused;
|
|
#[inline]
|
|
fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
|
|
<&'a Unused>::follow(buf, loc)
|
|
}
|
|
}
|
|
impl<'a> flatbuffers::Follow<'a> for &'a Unused {
|
|
type Inner = &'a Unused;
|
|
#[inline]
|
|
fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
|
|
flatbuffers::follow_cast_ref::<Unused>(buf, loc)
|
|
}
|
|
}
|
|
impl<'b> flatbuffers::Push for Unused {
|
|
type Output = Unused;
|
|
#[inline]
|
|
fn push(&self, dst: &mut [u8], _rest: &[u8]) {
|
|
let src = unsafe {
|
|
::std::slice::from_raw_parts(self as *const Unused as *const u8, Self::size())
|
|
};
|
|
dst.copy_from_slice(src);
|
|
}
|
|
}
|
|
impl<'b> flatbuffers::Push for &'b Unused {
|
|
type Output = Unused;
|
|
|
|
#[inline]
|
|
fn push(&self, dst: &mut [u8], _rest: &[u8]) {
|
|
let src = unsafe {
|
|
::std::slice::from_raw_parts(*self as *const Unused as *const u8, Self::size())
|
|
};
|
|
dst.copy_from_slice(src);
|
|
}
|
|
}
|
|
|
|
|
|
impl Unused {
|
|
pub fn new<'a>(_a: i32) -> Self {
|
|
Unused {
|
|
a_: _a.to_little_endian(),
|
|
|
|
}
|
|
}
|
|
pub fn a<'a>(&'a self) -> i32 {
|
|
self.a_.from_little_endian()
|
|
}
|
|
}
|
|
|
|
pub enum TableBOffset {}
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
|
|
|
pub struct TableB<'a> {
|
|
pub _tab: flatbuffers::Table<'a>,
|
|
}
|
|
|
|
impl<'a> flatbuffers::Follow<'a> for TableB<'a> {
|
|
type Inner = TableB<'a>;
|
|
#[inline]
|
|
fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
|
|
Self {
|
|
_tab: flatbuffers::Table { buf: buf, loc: loc },
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'a> TableB<'a> {
|
|
#[inline]
|
|
pub fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
|
|
TableB {
|
|
_tab: table,
|
|
}
|
|
}
|
|
#[allow(unused_mut)]
|
|
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
|
|
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
|
|
args: &'args TableBArgs<'args>) -> flatbuffers::WIPOffset<TableB<'bldr>> {
|
|
let mut builder = TableBBuilder::new(_fbb);
|
|
if let Some(x) = args.a { builder.add_a(x); }
|
|
builder.finish()
|
|
}
|
|
|
|
pub const VT_A: flatbuffers::VOffsetT = 4;
|
|
|
|
#[inline]
|
|
pub fn a(&self) -> Option<super::super::TableA<'a>> {
|
|
self._tab.get::<flatbuffers::ForwardsUOffset<super::super::TableA<'a>>>(TableB::VT_A, None)
|
|
}
|
|
}
|
|
|
|
pub struct TableBArgs<'a> {
|
|
pub a: Option<flatbuffers::WIPOffset<super::super::TableA<'a >>>,
|
|
}
|
|
impl<'a> Default for TableBArgs<'a> {
|
|
#[inline]
|
|
fn default() -> Self {
|
|
TableBArgs {
|
|
a: None,
|
|
}
|
|
}
|
|
}
|
|
pub struct TableBBuilder<'a: 'b, 'b> {
|
|
fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>,
|
|
start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
|
|
}
|
|
impl<'a: 'b, 'b> TableBBuilder<'a, 'b> {
|
|
#[inline]
|
|
pub fn add_a(&mut self, a: flatbuffers::WIPOffset<super::super::TableA<'b >>) {
|
|
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<super::super::TableA>>(TableB::VT_A, a);
|
|
}
|
|
#[inline]
|
|
pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> TableBBuilder<'a, 'b> {
|
|
let start = _fbb.start_table();
|
|
TableBBuilder {
|
|
fbb_: _fbb,
|
|
start_: start,
|
|
}
|
|
}
|
|
#[inline]
|
|
pub fn finish(self) -> flatbuffers::WIPOffset<TableB<'a>> {
|
|
let o = self.fbb_.end_table(self.start_);
|
|
flatbuffers::WIPOffset::new(o.value())
|
|
}
|
|
}
|
|
|
|
} // pub mod OtherNameSpace
|
|
} // pub mod MyGame
|
|
|