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

Commit db57f167 authored by Martin Geisler's avatar Martin Geisler Committed by Cherrypicker Worker
Browse files

pdl: Make primite enums repr(u64) again 

This was accidentally lost in https://r.android.com/2507964. Our tests
didn’t catch this because we disable all Rust lints when compiling the
generated backend.

Tag: #feature
Bug: 228306436
Test: atest pdl_tests pdl_rust_generator_tests_{le,be} pdl_generated_files_compile
(cherry picked from https://android-review.googlesource.com/q/commit:7a06b86be9449fc55cf5b2829eb3c232ecfd6c4e)
Merged-In: I5c0c2c9fa05069e9d91326ad8d6d2e740322fb75
Change-Id: I5c0c2c9fa05069e9d91326ad8d6d2e740322fb75
parent 2e6b6448

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"))]