Floss: Fix build warnings
Bug: 284100355
Test: emerge and run ./build.py on aosp ToT
Change-Id: I2a016e72f35cdba23776473a87ba59faabe70db8
diff --git a/system/gd/rust/linux/client/src/command_handler.rs b/system/gd/rust/linux/client/src/command_handler.rs
index bd39340..2a918eb 100644
--- a/system/gd/rust/linux/client/src/command_handler.rs
+++ b/system/gd/rust/linux/client/src/command_handler.rs
@@ -1536,7 +1536,7 @@
let (addr, sock_type, psm_or_uuid) =
(&get_arg(args, 1)?, &get_arg(args, 2)?, &get_arg(args, 3)?);
let device = BluetoothDevice {
- address: addr.clone().into(),
+ address: String::from(*addr),
name: String::from("Socket Connect Device"),
};
@@ -1558,7 +1558,7 @@
match &sock_type[0..] {
"l2cap" => {
- let psm = match psm_or_uuid.clone().parse::<i32>() {
+ let psm = match psm_or_uuid.parse::<i32>() {
Ok(v) => v,
Err(e) => {
return Err(CommandError::Failed(format!(
@@ -1583,7 +1583,7 @@
}
}
"rfcomm" => {
- let uuid = match UuidHelper::parse_string(psm_or_uuid.clone()) {
+ let uuid = match UuidHelper::parse_string(*psm_or_uuid) {
Some(uu) => uu,
None => {
return Err(CommandError::Failed(format!(
diff --git a/system/gd/rust/linux/stack/src/bluetooth_gatt.rs b/system/gd/rust/linux/stack/src/bluetooth_gatt.rs
index c950611..c5b68b2 100644
--- a/system/gd/rust/linux/stack/src/bluetooth_gatt.rs
+++ b/system/gd/rust/linux/stack/src/bluetooth_gatt.rs
@@ -3146,7 +3146,7 @@
}
fn congestion_cb(&mut self, conn_id: i32, congested: bool) {
- if let Some(mut client) = self.context_map.get_client_by_conn_id_mut(conn_id) {
+ if let Some(client) = self.context_map.get_client_by_conn_id_mut(conn_id) {
client.is_congested = congested;
if !client.is_congested {
let cbid = client.cbid;
@@ -3682,7 +3682,7 @@
}
fn congestion_cb(&mut self, conn_id: i32, congested: bool) {
- if let Some(mut server) = self.server_context_map.get_mut_by_conn_id(conn_id) {
+ if let Some(server) = self.server_context_map.get_mut_by_conn_id(conn_id) {
server.is_congested = congested;
if !server.is_congested {
let cbid = server.cbid;
diff --git a/system/gd/rust/topshim/src/btif.rs b/system/gd/rust/topshim/src/btif.rs
index 30edb0f..ece8ebe 100644
--- a/system/gd/rust/topshim/src/btif.rs
+++ b/system/gd/rust/topshim/src/btif.rs
@@ -559,7 +559,7 @@
// Do an unsafe cast to binding:: type and assign the values
// The underlying memory location is provided by |data| which will
// have enough space because it uses get_len()
- let mut record =
+ let record =
unsafe { &mut *(data.as_mut_ptr() as *mut bindings::bt_service_record_t) };
record.uuid = sr.uuid;
record.channel = sr.channel;
