system/rust: Apply cargo fmt

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, formatting
Change-Id: Ibda132cef7bc849eea175bb9b978c6b58e311afc

12 files changed, 111 insertions, 89 deletions

diff --git a/system/rust/src/connection.rs b/system/rust/src/connection.rs
index 7391b15b4f..99dc4c6cb3 100644
--- a/system/rust/src/connection.rs
+++ b/system/rust/src/connection.rs
@@ -190,7 +190,7 @@ impl WeakBoxRef<'_, ConnectionManager> {
         Ok(async move {
             let Some((attempt, guard)) = attempt_and_guard else {
                 // if we did not make an attempt, the connection must be ready
-                return Ok(LeConnection { remote_address: address })
+                return Ok(LeConnection { remote_address: address });
             };
             // otherwise, wait until the attempt resolves
             let ret = attempt.await;
diff --git a/system/rust/src/connection/attempt_manager.rs b/system/rust/src/connection/attempt_manager.rs
index 1ca2fc3a20..54a2e66240 100644
--- a/system/rust/src/connection/attempt_manager.rs
+++ b/system/rust/src/connection/attempt_manager.rs
@@ -92,7 +92,7 @@ impl ConnectionAttempts {
 
         let id = self.new_attempt_id();
         let Entry::Vacant(entry) = self.attempts.entry(attempt) else {
-            return Err(CreateConnectionFailure::ConnectionAlreadyPending)
+            return Err(CreateConnectionFailure::ConnectionAlreadyPending);
         };
         let (tx, rx) = oneshot::channel();
         entry.insert(ConnectionAttemptData { conn_tx: Some(tx), id });
@@ -120,7 +120,7 @@ impl ConnectionAttempts {
 
         let id = self.new_attempt_id();
         let Entry::Vacant(entry) = self.attempts.entry(attempt) else {
-            return Err(CreateConnectionFailure::ConnectionAlreadyPending)
+            return Err(CreateConnectionFailure::ConnectionAlreadyPending);
         };
         entry.insert(ConnectionAttemptData { conn_tx: None, id });
 
diff --git a/system/rust/src/gatt/mtu.rs b/system/rust/src/gatt/mtu.rs
index 838cfcda8b..3e7eaa4dbe 100644
--- a/system/rust/src/gatt/mtu.rs
+++ b/system/rust/src/gatt/mtu.rs
@@ -75,7 +75,7 @@ impl AttMtu {
 
     fn on_outgoing_request(&self) -> Result<()> {
         let Ok(pending_mtu) = self.stable_mtu.try_lock() else {
-          bail!("Sent ATT_EXCHANGE_MTU_REQ while an existing MTU exchange is taking place");
+            bail!("Sent ATT_EXCHANGE_MTU_REQ while an existing MTU exchange is taking place");
         };
         info!("Sending MTU_REQ, pausing indications/notifications");
         self.pending_exchange.replace(Some(pending_mtu));
diff --git a/system/rust/src/gatt/server/command_handler.rs b/system/rust/src/gatt/server/command_handler.rs
index e27eb31695..365ed3bc1e 100644
--- a/system/rust/src/gatt/server/command_handler.rs
+++ b/system/rust/src/gatt/server/command_handler.rs
@@ -19,8 +19,8 @@ impl<Db: AttDatabase> AttCommandHandler<Db> {
         match packet.get_opcode() {
             AttOpcode::WRITE_COMMAND => {
                 let Ok(packet) = AttWriteCommandView::try_parse(packet) else {
-                  warn!("failed to parse WRITE_COMMAND packet");
-                  return;
+                    warn!("failed to parse WRITE_COMMAND packet");
+                    return;
                 };
                 snapshotted_db
                     .write_no_response_attribute(packet.get_handle().into(), packet.get_value());
diff --git a/system/rust/src/gatt/server/gatt_database.rs b/system/rust/src/gatt/server/gatt_database.rs
index 2f7a3f4220..806ab4e7c2 100644
--- a/system/rust/src/gatt/server/gatt_database.rs
+++ b/system/rust/src/gatt/server/gatt_database.rs
@@ -814,13 +814,14 @@ mod test {
             join!(
                 async {
                     let MockDatastoreEvents::Read(
-                    TCB_IDX,
-                    CHARACTERISTIC_VALUE_HANDLE,
-                    AttributeBackingType::Characteristic,
-                    reply,
-                ) = data_evts.recv().await.unwrap() else {
-                    unreachable!()
-                };
+                        TCB_IDX,
+                        CHARACTERISTIC_VALUE_HANDLE,
+                        AttributeBackingType::Characteristic,
+                        reply,
+                    ) = data_evts.recv().await.unwrap()
+                    else {
+                        unreachable!()
+                    };
                     reply.send(Ok(data.clone())).unwrap();
                 },
                 att_db.read_attribute(CHARACTERISTIC_VALUE_HANDLE)
@@ -951,7 +952,8 @@ mod test {
                 AttributeBackingType::Characteristic,
                 recv_data,
                 _,
-            ) = data_evts.recv().await.unwrap() else {
+            ) = data_evts.recv().await.unwrap()
+            else {
                 unreachable!();
             };
             recv_data
@@ -992,7 +994,9 @@ mod test {
         let res = tokio_test::block_on(async {
             join!(
                 async {
-                    let MockDatastoreEvents::Write(_,_,_,_,reply) = data_evts.recv().await.unwrap() else {
+                    let MockDatastoreEvents::Write(_, _, _, _, reply) =
+                        data_evts.recv().await.unwrap()
+                    else {
                         unreachable!();
                     };
                     reply.send(Err(AttErrorCode::UNLIKELY_ERROR)).unwrap();
@@ -1073,7 +1077,8 @@ mod test {
                 DESCRIPTOR_HANDLE,
                 AttributeBackingType::Descriptor,
                 reply,
-            ) = data_evts.recv().await.unwrap() else {
+            ) = data_evts.recv().await.unwrap()
+            else {
                 unreachable!();
             };
 
@@ -1126,7 +1131,8 @@ mod test {
                 AttributeBackingType::Descriptor,
                 _,
                 _,
-            ) = data_evts.recv().await.unwrap() else {
+            ) = data_evts.recv().await.unwrap()
+            else {
                 unreachable!();
             };
         });
@@ -1252,13 +1258,14 @@ mod test {
             join!(
                 async {
                     let MockDatastoreEvents::Read(
-                    TCB_IDX,
-                    AttHandle(6),
-                    AttributeBackingType::Characteristic,
-                    reply,
-                ) = data_evts_2.recv().await.unwrap() else {
-                    unreachable!()
-                };
+                        TCB_IDX,
+                        AttHandle(6),
+                        AttributeBackingType::Characteristic,
+                        reply,
+                    ) = data_evts_2.recv().await.unwrap()
+                    else {
+                        unreachable!()
+                    };
                     reply.send(Ok(data.clone())).unwrap();
                 },
                 att_db.read_attribute(AttHandle(6))
@@ -1511,7 +1518,13 @@ mod test {
 
         // assert: we got a callback
         let event = data_evts.blocking_recv().unwrap();
-        let MockRawDatastoreEvents::WriteNoResponse(TCB_IDX, CHARACTERISTIC_VALUE_HANDLE, AttributeBackingType::Characteristic, recv_data) = event else {
+        let MockRawDatastoreEvents::WriteNoResponse(
+            TCB_IDX,
+            CHARACTERISTIC_VALUE_HANDLE,
+            AttributeBackingType::Characteristic,
+            recv_data,
+        ) = event
+        else {
             unreachable!("{event:?}");
         };
         assert_eq!(
diff --git a/system/rust/src/gatt/server/services/gatt.rs b/system/rust/src/gatt/server/services/gatt.rs
index a1ca4a448d..ba42a0ca6d 100644
--- a/system/rust/src/gatt/server/services/gatt.rs
+++ b/system/rust/src/gatt/server/services/gatt.rs
@@ -261,7 +261,8 @@ mod test {
             block_on_locally(att_db.read_attribute(SERVICE_CHANGE_CCC_DESCRIPTOR_HANDLE)).unwrap();
 
         // assert: we are not registered for either indications/notifications
-        let AttAttributeDataChild::GattClientCharacteristicConfiguration(configuration) = resp else {
+        let AttAttributeDataChild::GattClientCharacteristicConfiguration(configuration) = resp
+        else {
             unreachable!()
         };
         assert_eq!(
@@ -300,7 +301,8 @@ mod test {
             block_on_locally(att_db.read_attribute(SERVICE_CHANGE_CCC_DESCRIPTOR_HANDLE)).unwrap();
 
         // assert: we are registered for indications
-        let AttAttributeDataChild::GattClientCharacteristicConfiguration(configuration) = resp else {
+        let AttAttributeDataChild::GattClientCharacteristicConfiguration(configuration) = resp
+        else {
             unreachable!()
         };
         assert_eq!(
@@ -344,7 +346,8 @@ mod test {
             block_on_locally(att_db.read_attribute(SERVICE_CHANGE_CCC_DESCRIPTOR_HANDLE)).unwrap();
 
         // assert: we are not registered for indications
-        let AttAttributeDataChild::GattClientCharacteristicConfiguration(configuration) = resp else {
+        let AttAttributeDataChild::GattClientCharacteristicConfiguration(configuration) = resp
+        else {
             unreachable!()
         };
         assert_eq!(
diff --git a/system/rust/src/gatt/server/transactions/find_by_type_value.rs b/system/rust/src/gatt/server/transactions/find_by_type_value.rs
index 8efc4f7ed6..b09e7f7ef6 100644
--- a/system/rust/src/gatt/server/transactions/find_by_type_value.rs
+++ b/system/rust/src/gatt/server/transactions/find_by_type_value.rs
@@ -238,9 +238,7 @@ mod test {
             tokio_test::block_on(handle_find_by_type_value_request(att_view.view(), 128, &db));
 
         // assert
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{response:?}")
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{response:?}") };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
@@ -274,9 +272,7 @@ mod test {
             tokio_test::block_on(handle_find_by_type_value_request(att_view.view(), 128, &db));
 
         // assert: got ATTRIBUTE_NOT_FOUND erro
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{response:?}")
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{response:?}") };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
diff --git a/system/rust/src/gatt/server/transactions/find_information_request.rs b/system/rust/src/gatt/server/transactions/find_information_request.rs
index e444f3192d..26a573ffe0 100644
--- a/system/rust/src/gatt/server/transactions/find_information_request.rs
+++ b/system/rust/src/gatt/server/transactions/find_information_request.rs
@@ -29,7 +29,7 @@ pub fn handle_find_information_request<T: AttDatabase>(
             handle_in_error: AttHandle::from(request.get_starting_handle()).into(),
             error_code: AttErrorCode::INVALID_HANDLE,
         }
-        .into()
+        .into();
     };
 
     if let Some(resp) = handle_find_information_request_short(attrs.clone(), mtu) {
diff --git a/system/rust/src/gatt/server/transactions/read_by_group_type_request.rs b/system/rust/src/gatt/server/transactions/read_by_group_type_request.rs
index 7049eccdfa..5e53222022 100644
--- a/system/rust/src/gatt/server/transactions/read_by_group_type_request.rs
+++ b/system/rust/src/gatt/server/transactions/read_by_group_type_request.rs
@@ -190,9 +190,7 @@ mod test {
                 .unwrap();
 
         // assert: got UNSUPPORTED_GROUP_TYPE
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{:?}", response)
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{:?}", response) };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
@@ -219,9 +217,7 @@ mod test {
                 .unwrap();
 
         // assert: we return an INVALID_HANDLE error
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{:?}", response)
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{:?}", response) };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
@@ -404,9 +400,7 @@ mod test {
                 .unwrap();
 
         // assert: we return ATTRIBUTE_NOT_FOUND
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{:?}", response)
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{:?}", response) };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
diff --git a/system/rust/src/gatt/server/transactions/read_by_type_request.rs b/system/rust/src/gatt/server/transactions/read_by_type_request.rs
index 7d8bf27fcb..6d663b2536 100644
--- a/system/rust/src/gatt/server/transactions/read_by_type_request.rs
+++ b/system/rust/src/gatt/server/transactions/read_by_type_request.rs
@@ -271,9 +271,7 @@ mod test {
             tokio_test::block_on(handle_read_by_type_request(att_view.view(), 31, &db)).unwrap();
 
         // assert: we return ATTRIBUTE_NOT_FOUND
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{:?}", response)
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{:?}", response) };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
@@ -299,9 +297,7 @@ mod test {
             tokio_test::block_on(handle_read_by_type_request(att_view.view(), 31, &db)).unwrap();
 
         // assert: we return an INVALID_HANDLE error
-        let AttChild::AttErrorResponse(response) = response else {
-            unreachable!("{:?}", response)
-        };
+        let AttChild::AttErrorResponse(response) = response else { unreachable!("{:?}", response) };
         assert_eq!(
             response,
             AttErrorResponseBuilder {
diff --git a/system/rust/tests/gatt_callbacks_test.rs b/system/rust/tests/gatt_callbacks_test.rs
index 30a83fe21b..9ba62a5946 100644
--- a/system/rust/tests/gatt_callbacks_test.rs
+++ b/system/rust/tests/gatt_callbacks_test.rs
@@ -60,10 +60,10 @@ fn test_read_characteristic_callback() {
         });
 
         // assert: verify the read callback is received
-        let MockCallbackEvents::OnServerRead(
-            CONN_ID, _, HANDLE_1, BACKING_TYPE, OFFSET,
-        ) = callbacks_rx.recv().await.unwrap() else {
-          unreachable!()
+        let MockCallbackEvents::OnServerRead(CONN_ID, _, HANDLE_1, BACKING_TYPE, OFFSET) =
+            callbacks_rx.recv().await.unwrap()
+        else {
+            unreachable!()
         };
     });
 }
@@ -240,9 +240,15 @@ fn test_write_characteristic_callback() {
 
         // assert: verify the write callback is received
         let MockCallbackEvents::OnServerWrite(
-            CONN_ID, _, HANDLE_1, BACKING_TYPE, GattWriteType::Request(WRITE_REQUEST_TYPE), recv_data
-        ) = callbacks_rx.recv().await.unwrap() else {
-          unreachable!()
+            CONN_ID,
+            _,
+            HANDLE_1,
+            BACKING_TYPE,
+            GattWriteType::Request(WRITE_REQUEST_TYPE),
+            recv_data,
+        ) = callbacks_rx.recv().await.unwrap()
+        else {
+            unreachable!()
         };
         assert_eq!(
             recv_data.view().get_raw_payload().collect::<Vec<_>>(),
@@ -366,9 +372,15 @@ fn test_write_no_response_callback() {
 
         // assert: verify the write callback is received
         let MockCallbackEvents::OnServerWrite(
-            CONN_ID, _, HANDLE_1, BACKING_TYPE, GattWriteType::Command, recv_data
-        ) = callbacks_rx.recv().await.unwrap() else {
-          unreachable!()
+            CONN_ID,
+            _,
+            HANDLE_1,
+            BACKING_TYPE,
+            GattWriteType::Command,
+            recv_data,
+        ) = callbacks_rx.recv().await.unwrap()
+        else {
+            unreachable!()
         };
         assert_eq!(
             recv_data.view().get_raw_payload().collect::<Vec<_>>(),
@@ -392,10 +404,10 @@ fn test_execute_characteristic_callback() {
         });
 
         // assert: verify the execute callback is received
-        let MockCallbackEvents::OnExecute(
-            CONN_ID, _, TransactionDecision::Cancel
-        ) = callbacks_rx.recv().await.unwrap() else {
-          unreachable!()
+        let MockCallbackEvents::OnExecute(CONN_ID, _, TransactionDecision::Cancel) =
+            callbacks_rx.recv().await.unwrap()
+        else {
+            unreachable!()
         };
     });
 }
diff --git a/system/rust/tests/gatt_server_test.rs b/system/rust/tests/gatt_server_test.rs
index 20532ab835..8aae62105a 100644
--- a/system/rust/tests/gatt_server_test.rs
+++ b/system/rust/tests/gatt_server_test.rs
@@ -424,20 +424,13 @@ fn test_multiple_servers() {
             .view(),
         );
         // service the first read with `data`
-        let MockDatastoreEvents::Read(
-            TCB_IDX,
-            _, _,
-            tx,
-        ) = data_rx_1.recv().await.unwrap() else {
+        let MockDatastoreEvents::Read(TCB_IDX, _, _, tx) = data_rx_1.recv().await.unwrap() else {
             unreachable!()
         };
         tx.send(Ok(data.clone())).unwrap();
         // and then the second read with `another_data`
-        let MockDatastoreEvents::Read(
-            ANOTHER_TCB_IDX,
-            _, _,
-            tx,
-        ) = data_rx_2.recv().await.unwrap() else {
+        let MockDatastoreEvents::Read(ANOTHER_TCB_IDX, _, _, tx) = data_rx_2.recv().await.unwrap()
+        else {
             unreachable!()
         };
         tx.send(Ok(another_data.clone())).unwrap();
@@ -525,7 +518,9 @@ fn test_service_change_indication() {
             })
             .view(),
         );
-        let AttChild::AttFindByTypeValueResponse(resp) = transport_rx.recv().await.unwrap().1._child_ else {
+        let AttChild::AttFindByTypeValueResponse(resp) =
+            transport_rx.recv().await.unwrap().1._child_
+        else {
             unreachable!()
         };
         let (starting_handle, ending_handle) = (
@@ -541,19 +536,27 @@ fn test_service_change_indication() {
             })
             .view(),
         );
-        let AttChild::AttReadByTypeResponse(resp) = transport_rx.recv().await.unwrap().1._child_ else {
+        let AttChild::AttReadByTypeResponse(resp) = transport_rx.recv().await.unwrap().1._child_
+        else {
             unreachable!()
         };
-        let service_change_char_handle = resp.data.into_vec().into_iter().find_map(|characteristic| {
-            let AttAttributeDataChild::GattCharacteristicDeclarationValue(decl) = characteristic.value._child_ else {
-                unreachable!();
-            };
-            if decl.uuid == SERVICE_CHANGE_UUID.into() {
-                Some(decl.handle)
-            } else {
-                None
-            }
-        }).unwrap();
+        let service_change_char_handle = resp
+            .data
+            .into_vec()
+            .into_iter()
+            .find_map(|characteristic| {
+                let AttAttributeDataChild::GattCharacteristicDeclarationValue(decl) =
+                    characteristic.value._child_
+                else {
+                    unreachable!();
+                };
+                if decl.uuid == SERVICE_CHANGE_UUID.into() {
+                    Some(decl.handle)
+                } else {
+                    None
+                }
+            })
+            .unwrap();
         // act: find the CCC descriptor for the service changed characteristic
         gatt.get_bearer(TCB_IDX).unwrap().handle_packet(
             build_att_view_or_crash(AttFindInformationRequestBuilder {
@@ -562,10 +565,13 @@ fn test_service_change_indication() {
             })
             .view(),
         );
-        let AttChild::AttFindInformationResponse(resp) = transport_rx.recv().await.unwrap().1._child_ else {
+        let AttChild::AttFindInformationResponse(resp) =
+            transport_rx.recv().await.unwrap().1._child_
+        else {
             unreachable!()
         };
-        let AttFindInformationResponseChild::AttFindInformationShortResponse(resp) = resp._child_ else {
+        let AttFindInformationResponseChild::AttFindInformationShortResponse(resp) = resp._child_
+        else {
             unreachable!()
         };
         let service_change_descriptor_handle = resp
@@ -608,7 +614,9 @@ fn test_service_change_indication() {
         .unwrap();
 
         // assert: we got an indication
-        let AttChild::AttHandleValueIndication(indication) = transport_rx.recv().await.unwrap().1._child_ else {
+        let AttChild::AttHandleValueIndication(indication) =
+            transport_rx.recv().await.unwrap().1._child_
+        else {
             unreachable!()
         };
         assert_eq!(indication.handle, service_change_char_handle);