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

Commit c8cff8b5 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Gerrit Code Review
Browse files

Merge "floss: Fix build warnings" into main

parents e757a02d 5851829e

system/gd/rust/linux/client/src/callbacks.rs

+2 −2
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ impl RPCProxy for MediaCallback { 


pub(crate) struct TelephonyCallback {

    objpath: String,

    context: Arc<Mutex<ClientContext>>,

    _context: Arc<Mutex<ClientContext>>,



    dbus_connection: Arc<SyncConnection>,

    dbus_crossroads: Arc<Mutex<Crossroads>>,
@@ -1443,7 +1443,7 @@ impl TelephonyCallback { 
        dbus_connection: Arc<SyncConnection>,

        dbus_crossroads: Arc<Mutex<Crossroads>>,

    ) -> Self {

        Self { objpath, context, dbus_connection, dbus_crossroads }

        Self { objpath, _context: context, dbus_connection, dbus_crossroads }

    }

}

system/gd/rust/linux/stack/src/socket_manager.rs

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ impl BluetoothSocketManager { 
                                                        Ok(None)

                                                    }

                                                }

                                                Err(e) => Ok(None),

                                                Err(_) => Ok(None),

                                            };

                                        }