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

Commit 7faf4d03 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "Floss: Propagate error at Option<T> decoding" am: 628be691 

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



Change-Id: I14e6b4632cd6551b357161872d45f358071c6e18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 279dc84e 628be691

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

+2 −3
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ pub fn dbus_proxy_obj(attr: TokenStream, item: TokenStream) -> TokenStream { 
#[proc_macro]

pub fn generate_dbus_arg(_item: TokenStream) -> TokenStream {

    let gen = quote! {

        use dbus::arg::{PropMap, RefArg};

        use dbus::arg::RefArg;

        use dbus::nonblock::SyncConnection;

        use dbus::strings::BusName;

        use dbus_projection::DisconnectWatcher;
@@ -1144,7 +1144,6 @@ pub fn generate_dbus_arg(_item: TokenStream) -> TokenStream { 
                remote: Option<BusName<'static>>,

                disconnect_watcher: Option<Arc<Mutex<DisconnectWatcher>>>)

                -> Result<Option<T>, Box<dyn Error>> {

                let mut result: Option<T> = None;



                // It's Ok if the key doesn't exist. That just means we have an empty option (i.e.

                // None).
@@ -1174,7 +1173,7 @@ pub fn generate_dbus_arg(_item: TokenStream) -> TokenStream { 


                let value = match T::from_dbus(ref_value, conn, remote, disconnect_watcher) {

                    Ok(v) => Some(v),

                    Err(_) => None,

                    Err(e) => return Err(e),

                };



                Ok(value)