commit 4450590727a5994324bb929cc2c52c4005044e95
author howardchung <howardchung@google.com> Thu Aug 03 05:08:13 2023 +0000
committer Yun-hao Chung <howardchung@google.com> Fri Aug 04 04:38:10 2023 +0000
tree dab6f9a925db992535963f94a1fa72ecd5c95c72
parent 724d3f64f5fcc931855fe0877cb7a02e22eedbff

Floss: Fix build warnings in SigData

Bug: 294319446
Tag: #floss
Test: run ./build.py
Test: mma -j32
Change-Id: I91796fe2115e227e84376b78783ca1220067c107

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

diff --git a/system/gd/rust/linux/client/src/dbus_iface.rs b/system/gd/rust/linux/client/src/dbus_iface.rs
index 5b87b9e..98e2e0c 100644
--- a/system/gd/rust/linux/client/src/dbus_iface.rs
+++ b/system/gd/rust/linux/client/src/dbus_iface.rs
@@ -731,7 +731,7 @@
         dbus_generated!()
     }
 
-    fn init(&mut self, init_flags: Vec<String>) -> bool {
+    fn init(&mut self, _init_flags: Vec<String>) -> bool {
         // Not implemented by server
         true
     }

system/gd/rust/linux/service/src/iface_bluetooth.rs

diff --git a/system/gd/rust/linux/service/src/iface_bluetooth.rs b/system/gd/rust/linux/service/src/iface_bluetooth.rs
index e006675..ea651d5 100644
--- a/system/gd/rust/linux/service/src/iface_bluetooth.rs
+++ b/system/gd/rust/linux/service/src/iface_bluetooth.rs
@@ -441,7 +441,7 @@
     }
 
     // Not exposed over D-Bus. The stack is automatically initialized when the daemon starts.
-    fn init(&mut self, init_flags: Vec<String>) -> bool {
+    fn init(&mut self, _init_flags: Vec<String>) -> bool {
         dbus_generated!()
     }
 

system/gd/rust/linux/service/src/main.rs

diff --git a/system/gd/rust/linux/service/src/main.rs b/system/gd/rust/linux/service/src/main.rs
index 0f00105..1f9a586 100644
--- a/system/gd/rust/linux/service/src/main.rs
+++ b/system/gd/rust/linux/service/src/main.rs
@@ -431,7 +431,7 @@
 
 lazy_static! {
     /// Data needed for signal handling.
-    static ref SIG_DATA: Mutex<Option<(Sender<Message>, Arc<(SigData)>)>> = Mutex::new(None);
+    static ref SIG_DATA: Mutex<Option<(Sender<Message>, Arc<SigData>)>> = Mutex::new(None);
 }
 
 extern "C" fn handle_sigterm(_signum: i32) {

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

diff --git a/system/gd/rust/linux/stack/src/bluetooth.rs b/system/gd/rust/linux/stack/src/bluetooth.rs
index a30f07c..a62ec4c 100644
--- a/system/gd/rust/linux/stack/src/bluetooth.rs
+++ b/system/gd/rust/linux/stack/src/bluetooth.rs
@@ -509,7 +509,7 @@
     discoverable_timeout: Option<JoinHandle<()>>,
 
     /// Used to notify signal handler that we have turned off the stack.
-    sig_notifier: Arc<(SigData)>,
+    sig_notifier: Arc<SigData>,
 }
 
 impl Bluetooth {
@@ -518,7 +518,7 @@
         adapter_index: i32,
         hci_index: i32,
         tx: Sender<Message>,
-        sig_notifier: Arc<(SigData)>,
+        sig_notifier: Arc<SigData>,
         intf: Arc<Mutex<BluetoothInterface>>,
         bluetooth_admin: Arc<Mutex<Box<BluetoothAdmin>>>,
         bluetooth_gatt: Arc<Mutex<Box<BluetoothGatt>>>,