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

Commit 5331ec5c authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "floss: Convert DBus method returns from rust type" am: 22e81604 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1773325

Change-Id: I897ffb90baa6313e079d01e698c00a3d3f597f7b
parents 581a8392 22e81604

system/gd/rust/linux/dbus_projection/dbus_macros/src/lib.rs

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ pub fn generate_dbus_exporter(attr: TokenStream, item: TokenStream) -> TokenStre 
            let mut output_type = quote! {};

            let mut ret = quote! {Ok(())};

            if let ReturnType::Type(_, t) = method.sig.output {

                output_type = quote! {#t,};

                ret = quote! {Ok((ret,))};

                output_type = quote! {<#t as DBusArg>::DBusType,};

                ret = quote! {Ok((<#t as DBusArg>::to_dbus(ret).unwrap(),))};

                output_names = quote! { "out", };

            }