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

Commit 8a655ae5 authored by James Farrell's avatar James Farrell
Browse files

Changes for Rust 1.72 

Remove unneeded import and call to into_iter().

Bug: 295883071
Test: m libbluetooth_core_rs
Change-Id: I7f8ab535a7993fa249df710505dd19e8a43c2f48
parent 7e0b6227

system/rust/src/connection/ffi.rs

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ use tokio::{ 
    task::spawn_local,

};



use crate::{core::address::AddressWithType, do_in_rust_thread};

use crate::do_in_rust_thread;



use super::{

    attempt_manager::ConnectionMode,

system/rust/src/gatt/callbacks.rs

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ impl<T: GattDatastore + ?Sized> RawGattDatastore for T { 
    /// Execute or cancel any prepared writes

    async fn execute(&self, _: TransportIndex, _: TransactionDecision) -> Result<(), AttErrorCode> {

        // we never do prepared writes, so who cares

        return Ok(());

        Ok(())

    }

}

system/rust/src/gatt/server/gatt_database.rs

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ impl GattDatabase { 
        }



        // if we made it here, we successfully loaded the new service

        static_data.attributes.extend(attributes.clone().into_iter());

        static_data.attributes.extend(attributes.clone());



        // re-entrancy via the listeners is possible, so we prevent it by dropping here

        drop(static_data);