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

Commit f44de186 authored by Martin Geisler's avatar Martin Geisler Committed by Automerger Merge Worker
Browse files

pdl: Make primite enums repr(u64) again am: db57f167 

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



Change-Id: Ide3e4f82c6713422190aca431a372b17e18bcc3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dc5ef1c db57f167

tools/pdl/src/backends/rust.rs

+2 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ fn generate_enum_decl( 
    // Generate the variant cases for the enum declaration.

    // Tags declared in ranges are flattened in the same declaration.

    let use_variant_values = is_primitive && (is_complete || !open);

    let repr_u64 = use_variant_values.then(|| quote! { #[repr(u64)] });

    let mut variants = vec![];

    for tag in tags.iter() {

        match tag {
@@ -857,6 +858,7 @@ fn generate_enum_decl( 
    let derived_into_types = derived_signed_into_types.chain(derived_unsigned_into_types);



    quote! {

        #repr_u64

        #[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

        #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

        #[cfg_attr(feature = "serde", serde(try_from = #backing_type_str, into = #backing_type_str))]

tools/pdl/tests/generated/enum_declaration_big_endian.rs

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ pub trait Packet { 
    fn to_vec(self) -> Vec<u8>;

}



#[repr(u64)]

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

#[cfg_attr(feature = "serde", serde(try_from = "u8", into = "u8"))]
@@ -187,6 +188,7 @@ impl From<IncompleteTruncatedWithRange> for u64 { 
    }

}



#[repr(u64)]

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

#[cfg_attr(feature = "serde", serde(try_from = "u8", into = "u8"))]

tools/pdl/tests/generated/enum_declaration_little_endian.rs

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ pub trait Packet { 
    fn to_vec(self) -> Vec<u8>;

}



#[repr(u64)]

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

#[cfg_attr(feature = "serde", serde(try_from = "u8", into = "u8"))]
@@ -187,6 +188,7 @@ impl From<IncompleteTruncatedWithRange> for u64 { 
    }

}



#[repr(u64)]

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

#[cfg_attr(feature = "serde", serde(try_from = "u8", into = "u8"))]

tools/pdl/tests/generated/packet_decl_24bit_enum_array_big_endian.rs

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ pub trait Packet { 
    fn to_vec(self) -> Vec<u8>;

}



#[repr(u64)]

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

#[cfg_attr(feature = "serde", serde(try_from = "u32", into = "u32"))]

tools/pdl/tests/generated/packet_decl_24bit_enum_array_little_endian.rs

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ pub trait Packet { 
    fn to_vec(self) -> Vec<u8>;

}



#[repr(u64)]

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]

#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

#[cfg_attr(feature = "serde", serde(try_from = "u32", into = "u32"))]