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

Commit 9c9807b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder_rs: allow attributes for enumerators" am: 77078f73 am:...

Merge "libbinder_rs: allow attributes for enumerators" am: 77078f73 am: 68b7cdca am: b368a96e am: a6506333

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2031663

Change-Id: I3e1ddaa53f741be927f92cffe21922110eb8805e
parents 6aba1080 a6506333
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ macro_rules! declare_binder_enum {
    {
        $( #[$attr:meta] )*
        $enum:ident : [$backing:ty; $size:expr] {
            $( $name:ident = $value:expr, )*
            $( $( #[$value_attr:meta] )* $name:ident = $value:expr, )*
        }
    } => {
        $( #[$attr] )*
@@ -1094,7 +1094,7 @@ macro_rules! declare_binder_enum {
        #[allow(missing_docs)]
        pub struct $enum(pub $backing);
        impl $enum {
            $( #[allow(missing_docs)] pub const $name: Self = Self($value); )*
            $( $( #[$value_attr] )* #[allow(missing_docs)] pub const $name: Self = Self($value); )*

            #[inline(always)]
            #[allow(missing_docs)]