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

Commit 16c4ccaa authored by Charisee's avatar Charisee Committed by Henri Chataing
Browse files

Update for Rust v1.62.0 

See https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string
Test: run --rust
Tag:#compatibility

Bug: 236723597
Bug: 245578454
Ignore-AOSP-First: cherry-pick from AOSP
Merged-In: Ideb3e7f1cfba76e7bbb12fe80555c733d286f16f
Change-Id: Ideb3e7f1cfba76e7bbb12fe80555c733d286f16f
(cherry picked from commit f0b6afce)
parent e521730c

tools/rootcanal/lmp/src/procedure/secure_simple_pairing.rs

+3 −3
Original line number Diff line number Diff line
@@ -375,12 +375,12 @@ pub async fn initiate(ctx: &impl Context) -> Result<(), ()> { 
            AuthenticationMethod::NumericComparaison => {

                send_commitment(ctx, true).await;



                let _user_confirmation = user_confirmation_request(ctx).await?;

                user_confirmation_request(ctx).await?;

                Ok(())

            }

            AuthenticationMethod::PasskeyEntry => {

                if initiator.io_capability == hci::IoCapability::KeyboardOnly {

                    let _user_passkey = user_passkey_request(ctx).await?;

                    user_passkey_request(ctx).await?;

                } else {

                    ctx.send_hci_event(

                        hci::UserPasskeyNotificationBuilder {
@@ -397,7 +397,7 @@ pub async fn initiate(ctx: &impl Context) -> Result<(), ()> { 
            }

            AuthenticationMethod::OutOfBand => {

                if initiator.oob_data_present != hci::OobDataPresent::NotPresent {

                    let _remote_oob_data = remote_oob_data_request(ctx).await?;

                    remote_oob_data_request(ctx).await?;

                }



                send_commitment(ctx, false).await;