Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28eee400 authored May 09, 2023 by Martin Geisler Committed by Automerger Merge Worker May 09, 2023

pdl: Use explicit type when converting enum value am: 97436526

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22984495

Change-Id: Ifd3e96a6a362ebcad9a965f3aa0dc0dd333d38ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f44de186 97436526

tools/pdl/src/backends/rust/parser.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ impl<'a> FieldParser<'a> {
		let enum_id = format_ident!("{enum_id}");
		let tag_id = format_ident!("{}", tag_id.to_upper_camel_case());
		quote! {
		if #v != #enum_id::#tag_id.into() {
		if #v != #value_type::from(#enum_id::#tag_id) {
		return Err(Error::InvalidFixedValue {
		expected: #value_type::from(#enum_id::#tag_id) as u64,
		actual: #v as u64,

tools/pdl/tests/generated/packet_decl_fixed_enum_field_big_endian.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ impl FooData {
		});
		}
		let chunk = bytes.get_mut().get_u64();
		if (chunk & 0x7f) as u8 != Enum7::A.into() {
		if (chunk & 0x7f) as u8 != u8::from(Enum7::A) {
		return Err(Error::InvalidFixedValue {
		expected: u8::from(Enum7::A) as u64,
		actual: (chunk & 0x7f) as u8 as u64,

tools/pdl/tests/generated/packet_decl_fixed_enum_field_little_endian.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ impl FooData {
		});
		}
		let chunk = bytes.get_mut().get_u64_le();
		if (chunk & 0x7f) as u8 != Enum7::A.into() {
		if (chunk & 0x7f) as u8 != u8::from(Enum7::A) {
		return Err(Error::InvalidFixedValue {
		expected: u8::from(Enum7::A) as u64,
		actual: (chunk & 0x7f) as u8 as u64,