From 31749ff9cce6568850201f2da08ce9be3273d2a6 Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj Date: Thu, 13 Jul 2023 21:39:47 +0530 Subject: [PATCH] rust: fix clippy warnings --- rust/src/dcerpc/dcerpc.rs | 2 +- rust/src/http2/http2.rs | 2 +- rust/src/ike/ikev2.rs | 2 +- rust/src/krb/detect.rs | 5 +---- rust/src/smb/smb.rs | 4 ++-- rust/src/ssh/ssh.rs | 4 ++-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/rust/src/dcerpc/dcerpc.rs b/rust/src/dcerpc/dcerpc.rs index bd6488ad3fa9..57f3d41f0f91 100644 --- a/rust/src/dcerpc/dcerpc.rs +++ b/rust/src/dcerpc/dcerpc.rs @@ -723,7 +723,7 @@ impl DCERPCState { Ok((leftover_bytes, mut back)) => { if let Some(ref mut bind) = self.bind { for (uuid_internal_id, r) in back.ctxitems.iter().enumerate() { - for mut uuid in bind.uuid_list.iter_mut() { + for uuid in bind.uuid_list.iter_mut() { if uuid.internal_id == uuid_internal_id as u16 { uuid.result = r.ack_result; if uuid.result != 0 { diff --git a/rust/src/http2/http2.rs b/rust/src/http2/http2.rs index 011000b5432b..5939c97210fa 100644 --- a/rust/src/http2/http2.rs +++ b/rust/src/http2/http2.rs @@ -969,7 +969,7 @@ impl HTTP2State { //borrow checker forbids to reuse directly tx let index = self.find_tx_index(sid); if index > 0 { - let mut tx_same = &mut self.transactions[index - 1]; + let tx_same = &mut self.transactions[index - 1]; if dir == Direction::ToServer { tx_same.ft_tc.tx_id = tx_same.tx_id - 1; } else { diff --git a/rust/src/ike/ikev2.rs b/rust/src/ike/ikev2.rs index ecb54613da06..a1be25ffb4a2 100644 --- a/rust/src/ike/ikev2.rs +++ b/rust/src/ike/ikev2.rs @@ -96,7 +96,7 @@ impl Default for Ikev2Container { } pub fn handle_ikev2( - mut state: &mut IKEState, current: &[u8], isakmp_header: IsakmpHeader, direction: Direction, + state: &mut IKEState, current: &[u8], isakmp_header: IsakmpHeader, direction: Direction, ) -> AppLayerResult { let hdr = IkeV2Header { init_spi: isakmp_header.init_spi, diff --git a/rust/src/krb/detect.rs b/rust/src/krb/detect.rs index ab003629b58c..25cce9bcf826 100644 --- a/rust/src/krb/detect.rs +++ b/rust/src/krb/detect.rs @@ -116,10 +116,7 @@ pub enum DetectKrb5TicketEncryptionData { pub fn detect_parse_encryption_weak(i: &str) -> IResult<&str, DetectKrb5TicketEncryptionData> { let (i, neg) = opt(char('!'))(i)?; let (i, _) = tag("weak")(i)?; - let value = match neg { - Some(_) => false, - _ => true, - }; + let value = neg.is_none(); return Ok((i, DetectKrb5TicketEncryptionData::WEAK(value))); } diff --git a/rust/src/smb/smb.rs b/rust/src/smb/smb.rs index 909925972902..d6b0a565c060 100644 --- a/rust/src/smb/smb.rs +++ b/rust/src/smb/smb.rs @@ -1951,7 +1951,7 @@ pub unsafe extern "C" fn rs_smb_parse_request_tcp(flow: *const Flow, ) -> AppLayerResult { - let mut state = cast_pointer!(state, SMBState); + let state = cast_pointer!(state, SMBState); let flow = cast_pointer!(flow, Flow); if stream_slice.is_gap() { @@ -1988,7 +1988,7 @@ pub unsafe extern "C" fn rs_smb_parse_response_tcp(flow: *const Flow, ) -> AppLayerResult { - let mut state = cast_pointer!(state, SMBState); + let state = cast_pointer!(state, SMBState); let flow = cast_pointer!(flow, Flow); if stream_slice.is_gap() { diff --git a/rust/src/ssh/ssh.rs b/rust/src/ssh/ssh.rs index 3e2a15b9f1b7..6280e0b6ace9 100644 --- a/rust/src/ssh/ssh.rs +++ b/rust/src/ssh/ssh.rs @@ -110,7 +110,7 @@ impl SSHState { fn parse_record( &mut self, mut input: &[u8], resp: bool, pstate: *mut std::os::raw::c_void, ) -> AppLayerResult { - let (mut hdr, ohdr) = if !resp { + let (hdr, ohdr) = if !resp { (&mut self.transaction.cli_hdr, &self.transaction.srv_hdr) } else { (&mut self.transaction.srv_hdr, &self.transaction.cli_hdr) @@ -240,7 +240,7 @@ impl SSHState { fn parse_banner( &mut self, input: &[u8], resp: bool, pstate: *mut std::os::raw::c_void, ) -> AppLayerResult { - let mut hdr = if !resp { + let hdr = if !resp { &mut self.transaction.cli_hdr } else { &mut self.transaction.srv_hdr