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

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

Merge "Update code for Rust 1.82.0" into main am: 0cea3ea4 am: 49e78ac7 

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



Change-Id: Ib82810eadb8a21d098133160b578ba39a8b4ac49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 425ee2f2 49e78ac7

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

+6 −10
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ pub fn cb_variant(input: TokenStream) -> TokenStream { 
        let ident = format_ident!("_{}", i);

        params.extend(quote! { #ident: #start, });



        match end {

            Some(v) => {

        if let Some(v) = end {

            // Argument needs an into translation if it doesn't match the start

            if start != v {

                args.extend(quote! { #end::from(#ident), });
@@ -112,9 +111,6 @@ pub fn cb_variant(input: TokenStream) -> TokenStream { 
                args.extend(quote! {#ident,});

            }

        }

            // If there's no end type, just consume it instead.

            None => (),

        }

    }



    let mut stmts = proc_macro2::TokenStream::new();