From 46545e6273539e2da050aab8a0df398101aff3e4 Mon Sep 17 00:00:00 2001 From: Kamil Rojewski Date: Mon, 4 Jan 2021 23:11:59 +0100 Subject: [PATCH] fixed warnings (#6355) * semver-compatible deprecations * removed unneeded lifetimes (+ clippy warnings) * silenced too many args warning --- samples/monster_generated.rs | 37 ++++---- src/idl_gen_rust.cpp | 19 ++-- tests/include_test/include_test1_generated.rs | 4 +- .../sub/include_test2_generated.rs | 19 ++-- tests/monster_test_generated.rs | 91 ++++++++++--------- .../namespace_test1_generated.rs | 19 ++-- .../namespace_test2_generated.rs | 12 +-- tests/optional_scalars_generated.rs | 18 ++-- 8 files changed, 113 insertions(+), 106 deletions(-) diff --git a/samples/monster_generated.rs b/samples/monster_generated.rs index 53070c0df..175453d55 100644 --- a/samples/monster_generated.rs +++ b/samples/monster_generated.rs @@ -26,11 +26,11 @@ pub mod sample { extern crate flatbuffers; use self::flatbuffers::EndianScalar; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_COLOR: i8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_COLOR: i8 = 2; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_COLOR: [Color; 3] = [ Color::Red, @@ -105,8 +105,8 @@ impl flatbuffers::EndianScalar for Color { impl<'a> flatbuffers::Verifiable for Color { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; i8::run_verifier(v, pos) @@ -114,11 +114,11 @@ impl<'a> flatbuffers::Verifiable for Color { } impl flatbuffers::SimpleToVerifyInSlice for Color {} -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_EQUIPMENT: u8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_EQUIPMENT: u8 = 1; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_EQUIPMENT: [Equipment; 2] = [ Equipment::NONE, @@ -190,8 +190,8 @@ impl flatbuffers::EndianScalar for Equipment { impl<'a> flatbuffers::Verifiable for Equipment { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; u8::run_verifier(v, pos) @@ -257,14 +257,15 @@ impl<'b> flatbuffers::Push for &'b Vec3 { impl<'a> flatbuffers::Verifiable for Vec3 { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.in_buffer::(pos) } } impl Vec3 { + #[allow(clippy::too_many_arguments)] pub fn new(_x: f32, _y: f32, _z: f32) -> Self { Vec3 { x_: _x.to_little_endian(), @@ -389,8 +390,8 @@ impl<'a> Monster<'a> { impl flatbuffers::Verifiable for Monster<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -576,8 +577,8 @@ impl<'a> Weapon<'a> { impl flatbuffers::Verifiable for Weapon<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -637,13 +638,13 @@ impl std::fmt::Debug for Weapon<'_> { } } #[inline] -#[deprecated(since="1.13", note="Deprecated in favor of `root_as...` methods.")] +#[deprecated(since="2.0.0", note="Deprecated in favor of `root_as...` methods.")] pub fn get_root_as_monster<'a>(buf: &'a [u8]) -> Monster<'a> { unsafe { flatbuffers::root_unchecked::>(buf) } } #[inline] -#[deprecated(since="1.13", note="Deprecated in favor of `root_as...` methods.")] +#[deprecated(since="2.0.0", note="Deprecated in favor of `root_as...` methods.")] pub fn get_size_prefixed_root_as_monster<'a>(buf: &'a [u8]) -> Monster<'a> { unsafe { flatbuffers::size_prefixed_root_unchecked::>(buf) } } diff --git a/src/idl_gen_rust.cpp b/src/idl_gen_rust.cpp index 4e504cd87..1526d393b 100644 --- a/src/idl_gen_rust.cpp +++ b/src/idl_gen_rust.cpp @@ -561,7 +561,7 @@ class RustGenerator : public BaseGenerator { // Normal, c-modelled enums. // Deprecated associated constants; const std::string deprecation_warning = - "#[deprecated(since = \"1.13\", note = \"Use associated constants" + "#[deprecated(since = \"2.0.0\", note = \"Use associated constants" " instead. This will no longer be generated in 2021.\")]"; code_ += deprecation_warning; code_ += "pub const ENUM_MIN_{{ENUM_NAME_CAPS}}: {{BASE_TYPE}}" @@ -670,8 +670,8 @@ class RustGenerator : public BaseGenerator { // Generate verifier - deferring to the base type. code_ += "impl<'a> flatbuffers::Verifiable for {{ENUM_NAME}} {"; code_ += " #[inline]"; - code_ += " fn run_verifier<'o, 'b>("; - code_ += " v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize"; + code_ += " fn run_verifier("; + code_ += " v: &mut flatbuffers::Verifier, pos: usize"; code_ += " ) -> Result<(), flatbuffers::InvalidFlatbuffer> {"; code_ += " use self::flatbuffers::Verifiable;"; code_ += " {{BASE_TYPE}}::run_verifier(v, pos)"; @@ -1332,8 +1332,8 @@ class RustGenerator : public BaseGenerator { // Generate Verifier; code_ += "impl flatbuffers::Verifiable for {{STRUCT_NAME}}<'_> {"; code_ += " #[inline]"; - code_ += " fn run_verifier<'o, 'b>("; - code_ += " v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize"; + code_ += " fn run_verifier("; + code_ += " v: &mut flatbuffers::Verifier, pos: usize"; code_ += " ) -> Result<(), flatbuffers::InvalidFlatbuffer> {"; code_ += " use self::flatbuffers::Verifiable;"; code_ += " v.visit_table(pos)?\\"; @@ -1542,7 +1542,7 @@ class RustGenerator : public BaseGenerator { // The root datatype accessors: code_ += "#[inline]"; - code_ += "#[deprecated(since=\"1.13\", " + code_ += "#[deprecated(since=\"2.0.0\", " "note=\"Deprecated in favor of `root_as...` methods.\")]"; code_ += "pub fn get_root_as_{{STRUCT_NAME_SNAKECASE}}<'a>(buf: &'a [u8])" @@ -1553,7 +1553,7 @@ class RustGenerator : public BaseGenerator { code_ += ""; code_ += "#[inline]"; - code_ += "#[deprecated(since=\"1.13\", " + code_ += "#[deprecated(since=\"2.0.0\", " "note=\"Deprecated in favor of `root_as...` methods.\")]"; code_ += "pub fn get_size_prefixed_root_as_{{STRUCT_NAME_SNAKECASE}}" @@ -1831,8 +1831,8 @@ class RustGenerator : public BaseGenerator { // all that need to be checked. code_ += "impl<'a> flatbuffers::Verifiable for {{STRUCT_NAME}} {"; code_ += " #[inline]"; - code_ += " fn run_verifier<'o, 'b>("; - code_ += " v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize"; + code_ += " fn run_verifier("; + code_ += " v: &mut flatbuffers::Verifier, pos: usize"; code_ += " ) -> Result<(), flatbuffers::InvalidFlatbuffer> {"; code_ += " use self::flatbuffers::Verifiable;"; code_ += " v.in_buffer::(pos)"; @@ -1843,6 +1843,7 @@ class RustGenerator : public BaseGenerator { code_ += "impl {{STRUCT_NAME}} {"; // TODO(cneo): Stop generating args on one line. Make it simpler. bool first_arg = true; + code_ += " #[allow(clippy::too_many_arguments)]"; code_ += " pub fn new(\\"; ForAllStructFields(struct_def, [&](const FieldDef &field) { if (first_arg) first_arg = false; else code_ += ", \\"; diff --git a/tests/include_test/include_test1_generated.rs b/tests/include_test/include_test1_generated.rs index cf63626e1..23c0d3f44 100644 --- a/tests/include_test/include_test1_generated.rs +++ b/tests/include_test/include_test1_generated.rs @@ -51,8 +51,8 @@ impl<'a> TableA<'a> { impl flatbuffers::Verifiable for TableA<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? diff --git a/tests/include_test/sub/include_test2_generated.rs b/tests/include_test/sub/include_test2_generated.rs index a461b82a1..ec0ca0734 100644 --- a/tests/include_test/sub/include_test2_generated.rs +++ b/tests/include_test/sub/include_test2_generated.rs @@ -29,11 +29,11 @@ pub mod other_name_space { extern crate flatbuffers; use self::flatbuffers::EndianScalar; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_FROM_INCLUDE: i64 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_FROM_INCLUDE: i64 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_FROM_INCLUDE: [FromInclude; 1] = [ FromInclude::IncludeVal, @@ -100,8 +100,8 @@ impl flatbuffers::EndianScalar for FromInclude { impl<'a> flatbuffers::Verifiable for FromInclude { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; i64::run_verifier(v, pos) @@ -163,14 +163,15 @@ impl<'b> flatbuffers::Push for &'b Unused { impl<'a> flatbuffers::Verifiable for Unused { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.in_buffer::(pos) } } impl Unused { + #[allow(clippy::too_many_arguments)] pub fn new(_a: i32) -> Self { Unused { a_: _a.to_little_endian(), @@ -223,8 +224,8 @@ impl<'a> TableB<'a> { impl flatbuffers::Verifiable for TableB<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? diff --git a/tests/monster_test_generated.rs b/tests/monster_test_generated.rs index f38ce6ade..1c408cddc 100644 --- a/tests/monster_test_generated.rs +++ b/tests/monster_test_generated.rs @@ -60,8 +60,8 @@ impl<'a> InParentNamespace<'a> { impl flatbuffers::Verifiable for InParentNamespace<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -153,8 +153,8 @@ impl<'a> Monster<'a> { impl flatbuffers::Verifiable for Monster<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -258,8 +258,8 @@ impl flatbuffers::EndianScalar for Color { impl<'a> flatbuffers::Verifiable for Color { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; u8::run_verifier(v, pos) @@ -267,11 +267,11 @@ impl<'a> flatbuffers::Verifiable for Color { } impl flatbuffers::SimpleToVerifyInSlice for Color {} -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_RACE: i8 = -1; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_RACE: i8 = 2; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_RACE: [Race; 4] = [ Race::None, @@ -350,8 +350,8 @@ impl flatbuffers::EndianScalar for Race { impl<'a> flatbuffers::Verifiable for Race { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; i8::run_verifier(v, pos) @@ -359,11 +359,11 @@ impl<'a> flatbuffers::Verifiable for Race { } impl flatbuffers::SimpleToVerifyInSlice for Race {} -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_ANY: u8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_ANY: u8 = 3; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_ANY: [Any; 4] = [ Any::NONE, @@ -443,8 +443,8 @@ impl flatbuffers::EndianScalar for Any { impl<'a> flatbuffers::Verifiable for Any { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; u8::run_verifier(v, pos) @@ -452,11 +452,11 @@ impl<'a> flatbuffers::Verifiable for Any { } impl flatbuffers::SimpleToVerifyInSlice for Any {} -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_ANY_UNIQUE_ALIASES: u8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_ANY_UNIQUE_ALIASES: u8 = 3; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_ANY_UNIQUE_ALIASES: [AnyUniqueAliases; 4] = [ AnyUniqueAliases::NONE, @@ -536,8 +536,8 @@ impl flatbuffers::EndianScalar for AnyUniqueAliases { impl<'a> flatbuffers::Verifiable for AnyUniqueAliases { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; u8::run_verifier(v, pos) @@ -545,11 +545,11 @@ impl<'a> flatbuffers::Verifiable for AnyUniqueAliases { } impl flatbuffers::SimpleToVerifyInSlice for AnyUniqueAliases {} -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_ANY_AMBIGUOUS_ALIASES: u8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_ANY_AMBIGUOUS_ALIASES: u8 = 3; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_ANY_AMBIGUOUS_ALIASES: [AnyAmbiguousAliases; 4] = [ AnyAmbiguousAliases::NONE, @@ -629,8 +629,8 @@ impl flatbuffers::EndianScalar for AnyAmbiguousAliases { impl<'a> flatbuffers::Verifiable for AnyAmbiguousAliases { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; u8::run_verifier(v, pos) @@ -695,14 +695,15 @@ impl<'b> flatbuffers::Push for &'b Test { impl<'a> flatbuffers::Verifiable for Test { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.in_buffer::(pos) } } impl Test { + #[allow(clippy::too_many_arguments)] pub fn new(_a: i16, _b: i8) -> Self { Test { a_: _a.to_little_endian(), @@ -790,14 +791,15 @@ impl<'b> flatbuffers::Push for &'b Vec3 { impl<'a> flatbuffers::Verifiable for Vec3 { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.in_buffer::(pos) } } impl Vec3 { + #[allow(clippy::too_many_arguments)] pub fn new(_x: f32, _y: f32, _z: f32, _test1: f64, _test2: Color, _test3: &Test) -> Self { Vec3 { x_: _x.to_little_endian(), @@ -892,14 +894,15 @@ impl<'b> flatbuffers::Push for &'b Ability { impl<'a> flatbuffers::Verifiable for Ability { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.in_buffer::(pos) } } impl Ability { + #[allow(clippy::too_many_arguments)] pub fn new(_id: u32, _distance: u32) -> Self { Ability { id_: _id.to_little_endian(), @@ -974,8 +977,8 @@ impl<'a> TestSimpleTableWithEnum<'a> { impl flatbuffers::Verifiable for TestSimpleTableWithEnum<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -1083,8 +1086,8 @@ impl<'a> Stat<'a> { impl flatbuffers::Verifiable for Stat<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -1206,8 +1209,8 @@ impl<'a> Referrable<'a> { impl flatbuffers::Verifiable for Referrable<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -1706,8 +1709,8 @@ impl<'a> Monster<'a> { impl flatbuffers::Verifiable for Monster<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -2350,8 +2353,8 @@ impl<'a> TypeAliases<'a> { impl flatbuffers::Verifiable for TypeAliases<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -2491,13 +2494,13 @@ impl std::fmt::Debug for TypeAliases<'_> { } } #[inline] -#[deprecated(since="1.13", note="Deprecated in favor of `root_as...` methods.")] +#[deprecated(since="2.0.0", note="Deprecated in favor of `root_as...` methods.")] pub fn get_root_as_monster<'a>(buf: &'a [u8]) -> Monster<'a> { unsafe { flatbuffers::root_unchecked::>(buf) } } #[inline] -#[deprecated(since="1.13", note="Deprecated in favor of `root_as...` methods.")] +#[deprecated(since="2.0.0", note="Deprecated in favor of `root_as...` methods.")] pub fn get_size_prefixed_root_as_monster<'a>(buf: &'a [u8]) -> Monster<'a> { unsafe { flatbuffers::size_prefixed_root_unchecked::>(buf) } } diff --git a/tests/namespace_test/namespace_test1_generated.rs b/tests/namespace_test/namespace_test1_generated.rs index b5f062b13..a828313d3 100644 --- a/tests/namespace_test/namespace_test1_generated.rs +++ b/tests/namespace_test/namespace_test1_generated.rs @@ -26,11 +26,11 @@ pub mod namespace_b { extern crate flatbuffers; use self::flatbuffers::EndianScalar; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_ENUM_IN_NESTED_NS: i8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_ENUM_IN_NESTED_NS: i8 = 2; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_ENUM_IN_NESTED_NS: [EnumInNestedNS; 3] = [ EnumInNestedNS::A, @@ -105,8 +105,8 @@ impl flatbuffers::EndianScalar for EnumInNestedNS { impl<'a> flatbuffers::Verifiable for EnumInNestedNS { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; i8::run_verifier(v, pos) @@ -170,14 +170,15 @@ impl<'b> flatbuffers::Push for &'b StructInNestedNS { impl<'a> flatbuffers::Verifiable for StructInNestedNS { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.in_buffer::(pos) } } impl StructInNestedNS { + #[allow(clippy::too_many_arguments)] pub fn new(_a: i32, _b: i32) -> Self { StructInNestedNS { a_: _a.to_little_endian(), @@ -242,8 +243,8 @@ impl<'a> TableInNestedNS<'a> { impl flatbuffers::Verifiable for TableInNestedNS<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? diff --git a/tests/namespace_test/namespace_test2_generated.rs b/tests/namespace_test/namespace_test2_generated.rs index 641200504..490dd6b9b 100644 --- a/tests/namespace_test/namespace_test2_generated.rs +++ b/tests/namespace_test/namespace_test2_generated.rs @@ -77,8 +77,8 @@ impl<'a> TableInFirstNS<'a> { impl flatbuffers::Verifiable for TableInFirstNS<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -190,8 +190,8 @@ impl<'a> SecondTableInA<'a> { impl flatbuffers::Verifiable for SecondTableInA<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -305,8 +305,8 @@ impl<'a> TableInC<'a> { impl flatbuffers::Verifiable for TableInC<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? diff --git a/tests/optional_scalars_generated.rs b/tests/optional_scalars_generated.rs index 08468d85d..702df823f 100644 --- a/tests/optional_scalars_generated.rs +++ b/tests/optional_scalars_generated.rs @@ -18,11 +18,11 @@ pub mod optional_scalars { extern crate flatbuffers; use self::flatbuffers::EndianScalar; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_OPTIONAL_BYTE: i8 = 0; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MAX_OPTIONAL_BYTE: i8 = 2; -#[deprecated(since = "1.13", note = "Use associated constants instead. This will no longer be generated in 2021.")] +#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] pub const ENUM_VALUES_OPTIONAL_BYTE: [OptionalByte; 3] = [ OptionalByte::None, @@ -97,8 +97,8 @@ impl flatbuffers::EndianScalar for OptionalByte { impl<'a> flatbuffers::Verifiable for OptionalByte { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; i8::run_verifier(v, pos) @@ -357,8 +357,8 @@ impl<'a> ScalarStuff<'a> { impl flatbuffers::Verifiable for ScalarStuff<'_> { #[inline] - fn run_verifier<'o, 'b>( - v: &mut flatbuffers::Verifier<'o, 'b>, pos: usize + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize ) -> Result<(), flatbuffers::InvalidFlatbuffer> { use self::flatbuffers::Verifiable; v.visit_table(pos)? @@ -690,13 +690,13 @@ impl std::fmt::Debug for ScalarStuff<'_> { } } #[inline] -#[deprecated(since="1.13", note="Deprecated in favor of `root_as...` methods.")] +#[deprecated(since="2.0.0", note="Deprecated in favor of `root_as...` methods.")] pub fn get_root_as_scalar_stuff<'a>(buf: &'a [u8]) -> ScalarStuff<'a> { unsafe { flatbuffers::root_unchecked::>(buf) } } #[inline] -#[deprecated(since="1.13", note="Deprecated in favor of `root_as...` methods.")] +#[deprecated(since="2.0.0", note="Deprecated in favor of `root_as...` methods.")] pub fn get_size_prefixed_root_as_scalar_stuff<'a>(buf: &'a [u8]) -> ScalarStuff<'a> { unsafe { flatbuffers::size_prefixed_root_unchecked::>(buf) } }