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

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

Merge "Fixed warnings generated by rustc 1.57.0" am: 6c1ac64c am: e8738b77 

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

Change-Id: I2c53005337521501e7e723a230c7a40289d00c81
parents 933a7c02 e8738b77

system/gd/rust/stack/src/link/acl/classic/mod.rs

+6 −0
Original line number Original line Diff line number Diff line
@@ -54,11 +54,16 @@ pub enum Event { 
/// A classic ACL connection

/// A classic ACL connection

#[derive(Debug)]

#[derive(Debug)]

pub struct Connection {

pub struct Connection {

    #[allow(dead_code)]

    addr: Address,

    addr: Address,

    #[allow(dead_code)]

    rx: Receiver<Bytes>,

    rx: Receiver<Bytes>,

    #[allow(dead_code)]

    tx: Sender<Bytes>,

    tx: Sender<Bytes>,

    #[allow(dead_code)]

    shared: Arc<Mutex<ConnectionShared>>,

    shared: Arc<Mutex<ConnectionShared>>,

    requests: Sender<ConnectionRequest>,

    requests: Sender<ConnectionRequest>,

    #[allow(dead_code)]

    evt_rx: Receiver<ConnectionEvent>,

    evt_rx: Receiver<ConnectionEvent>,

}

}
@@ -94,6 +99,7 @@ struct ConnectionInternal { 




#[derive(Debug)]

#[derive(Debug)]

struct ConnectionShared {

struct ConnectionShared {

    #[allow(dead_code)]

    role: Role,

    role: Role,

}

}

system/gd/rust/stack/src/link/acl/core.rs

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,7 +30,9 @@ module! { 
pub struct Connection {

pub struct Connection {

    pub rx: Option<Receiver<Bytes>>,

    pub rx: Option<Receiver<Bytes>>,

    pub tx: Option<Sender<Bytes>>,

    pub tx: Option<Sender<Bytes>>,

    #[allow(dead_code)]

    handle: u16,

    handle: u16,

    #[allow(dead_code)]

    requests: Sender<Request>,

    requests: Sender<Request>,

    pub evt_rx: Receiver<EventPacket>,

    pub evt_rx: Receiver<EventPacket>,

    pub evt_tx: Sender<EventPacket>,

    pub evt_tx: Sender<EventPacket>,

system/gd/rust/topshim/facade/src/adapter_service.rs

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,9 +40,11 @@ fn get_bt_dispatcher( 
/// Main object for Adapter facade service

/// Main object for Adapter facade service

#[derive(Clone)]

#[derive(Clone)]

pub struct AdapterServiceImpl {

pub struct AdapterServiceImpl {

    #[allow(dead_code)]

    rt: Arc<Runtime>,

    rt: Arc<Runtime>,

    btif_intf: Arc<Mutex<BluetoothInterface>>,

    btif_intf: Arc<Mutex<BluetoothInterface>>,

    event_rx: Arc<TokioMutex<mpsc::Receiver<BaseCallbacks>>>,

    event_rx: Arc<TokioMutex<mpsc::Receiver<BaseCallbacks>>>,

    #[allow(dead_code)]

    event_tx: mpsc::Sender<BaseCallbacks>,

    event_tx: mpsc::Sender<BaseCallbacks>,

}

}

system/gd/rust/topshim/facade/src/media_service.rs

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ fn get_avrcp_dispatcher() -> AvrcpCallbacksDispatcher { 
/// Main object for Media facade service

/// Main object for Media facade service

#[derive(Clone)]

#[derive(Clone)]

pub struct MediaServiceImpl {

pub struct MediaServiceImpl {

    #[allow(dead_code)]

    rt: Arc<Runtime>,

    rt: Arc<Runtime>,

    pub btif_a2dp: Arc<Mutex<A2dp>>,

    pub btif_a2dp: Arc<Mutex<A2dp>>,

    btif_a2dp_sink: Arc<Mutex<A2dpSink>>,

    btif_a2dp_sink: Arc<Mutex<A2dpSink>>,