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

Commit 583f1747 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "Floss: Fix cb_variant expect message" am: 2bb6e84a am: 01b64bc5 am: 0ace34a0 

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



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

system/gd/rust/topshim/macros/src/lib.rs

+3 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ pub fn cb_variant(input: TokenStream) -> TokenStream { 
        stmts.extend(quote! { #stmt });

    }



    let dispatcher_str = quote!(#dispatcher).to_string();

    let tokens = quote! {

        #[no_mangle]

        extern "C" fn #ident(#params) {
@@ -130,10 +131,10 @@ pub fn cb_variant(input: TokenStream) -> TokenStream { 
                    .lock()

                    .expect("Couldn't lock dispatchers!")

                    .get::<#dispatcher>()

                    .expect("Couldn't find dispatcher type: #dispatcher")

                    .expect(concat!("Couldn't find dispatcher type: ", #dispatcher_str))

                    .clone()

                    .lock()

                    .expect("Couldn't lock specific dispatcher: #dispatcher")

                    .expect(concat!("Couldn't lock specific dispatcher: ", #dispatcher_str))

                    .dispatch)(#rpath(#args));

            }

    };