From ac29c6a0a5731d1a29d84827e5f2327f45e1d945 Mon Sep 17 00:00:00 2001 From: G2-Games Date: Thu, 15 Aug 2024 01:07:53 -0500 Subject: [PATCH] Cleaned up clippy suggestions --- src/netmd/encryption.rs | 1 + src/netmd/interface.rs | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/netmd/encryption.rs b/src/netmd/encryption.rs index 18c6b07..7dfc551 100644 --- a/src/netmd/encryption.rs +++ b/src/netmd/encryption.rs @@ -10,6 +10,7 @@ type DesEcbEnc = ecb::Decryptor; type DesCbcEnc = cbc::Encryptor; pub struct Encryptor { + #[allow(clippy::type_complexity)] channel: Option, Vec, Vec)>>, state: Option, } diff --git a/src/netmd/interface.rs b/src/netmd/interface.rs index b707ea7..0088b23 100644 --- a/src/netmd/interface.rs +++ b/src/netmd/interface.rs @@ -455,7 +455,7 @@ impl NetMDInterface { /// Send a query to the NetMD player async fn send_query( &mut self, - query: &Vec, + query: &[u8], test: bool, accept_interim: bool, ) -> Result, InterfaceError> { @@ -468,7 +468,7 @@ impl NetMDInterface { async fn send_command( &mut self, - query: &Vec, + query: &[u8], test: bool, ) -> Result<(), InterfaceError> { let status_byte = match test { @@ -479,7 +479,7 @@ impl NetMDInterface { let mut new_query = Vec::new(); new_query.push(status_byte as u8); - new_query.extend_from_slice(&query); + new_query.extend_from_slice(query); self.device.send_command(new_query).await?; @@ -650,10 +650,8 @@ impl NetMDInterface { self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close) .await?; - if operating_status.len() < 2 { - if !operating_status.is_empty() { - return Err(InterfaceError::InvalidStatus(StatusError(operating_status[0] as u16))); - } + if operating_status.len() < 2 && !operating_status.is_empty() { + return Err(InterfaceError::InvalidStatus(StatusError(operating_status[0] as u16))); } let operating_status_number =