From da0a976e23385b5a575daa285627ee0521736405 Mon Sep 17 00:00:00 2001 From: Sam Muhammed Date: Sun, 24 Oct 2021 05:36:11 +0200 Subject: [PATCH] rust(lint): use let for binding single value `match` is better used with binding to multiple variables, for binding to a single value, `let` statement is recommended. Bug: #4616 --- rust/src/lib.rs | 1 - rust/src/smb/smb1.rs | 10 ++++------ rust/src/smb/smb2.rs | 8 ++------ rust/src/smb/smb2_ioctl.rs | 12 ++++++++---- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/rust/src/lib.rs b/rust/src/lib.rs index f1b38edd5..9fc781732 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -51,7 +51,6 @@ #![allow(clippy::needless_range_loop)] #![allow(clippy::enum_variant_names)] #![allow(clippy::if_same_then_else)] -#![allow(clippy::match_single_binding)] #![allow(clippy::match_like_matches_macro)] #![allow(clippy::extra_unused_lifetimes)] #![allow(clippy::mixed_case_hex_literals)] diff --git a/rust/src/smb/smb1.rs b/rust/src/smb/smb1.rs index 45136f694..5d9de58f5 100644 --- a/rust/src/smb/smb1.rs +++ b/rust/src/smb/smb1.rs @@ -883,9 +883,8 @@ pub fn smb1_trans_request_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>) let mut frankenfid = pipe.fid.to_vec(); frankenfid.extend_from_slice(&u32_as_bytes(r.ssn_id)); - let (_filename, is_dcerpc) = match state.get_service_for_guid(&frankenfid) { - (n, x) => (n, x), - }; + let (_filename, is_dcerpc) = state.get_service_for_guid(&frankenfid); + SCLogDebug!("smb1_trans_request_record: name {} is_dcerpc {}", _filename, is_dcerpc); pipe_dcerpc = is_dcerpc; @@ -924,9 +923,8 @@ pub fn smb1_trans_response_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>) let mut frankenfid = fid.to_vec(); frankenfid.extend_from_slice(&u32_as_bytes(r.ssn_id)); - let (_filename, is_dcerpc) = match state.get_service_for_guid(&frankenfid) { - (n, x) => (n, x), - }; + let (_filename, is_dcerpc) = state.get_service_for_guid(&frankenfid); + SCLogDebug!("smb1_trans_response_record: name {} is_dcerpc {}", _filename, is_dcerpc); diff --git a/rust/src/smb/smb2.rs b/rust/src/smb/smb2.rs index 115facdf4..756c69081 100644 --- a/rust/src/smb/smb2.rs +++ b/rust/src/smb/smb2.rs @@ -168,9 +168,7 @@ pub fn smb2_read_response_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>) _ => { (Vec::new(), false) }, }; let mut is_dcerpc = if is_pipe || (share_name.len() == 0 && !is_pipe) { - match state.get_service_for_guid(&file_guid) { - (_, x) => x, - } + state.get_service_for_guid(&file_guid).1 } else { false }; @@ -280,9 +278,7 @@ pub fn smb2_write_request_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>) _ => { (Vec::new(), false) }, }; let mut is_dcerpc = if is_pipe || (share_name.len() == 0 && !is_pipe) { - match state.get_service_for_guid(wr.guid) { - (_, x) => x, - } + state.get_service_for_guid(wr.guid).1 } else { false }; diff --git a/rust/src/smb/smb2_ioctl.rs b/rust/src/smb/smb2_ioctl.rs index cb6bb5a9b..4034ed183 100644 --- a/rust/src/smb/smb2_ioctl.rs +++ b/rust/src/smb/smb2_ioctl.rs @@ -62,8 +62,10 @@ pub fn smb2_ioctl_request_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>) match parse_smb2_request_ioctl(r.data) { Ok((_, rd)) => { SCLogDebug!("IOCTL request data: {:?}", rd); - let is_dcerpc = rd.is_pipe && match state.get_service_for_guid(rd.guid) { - (_, x) => x, + let is_dcerpc = if rd.is_pipe { + state.get_service_for_guid(rd.guid).1 + } else { + false }; if is_dcerpc { SCLogDebug!("IOCTL request data is_pipe. Calling smb_write_dcerpc_record"); @@ -90,8 +92,10 @@ pub fn smb2_ioctl_response_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>) Ok((_, rd)) => { SCLogDebug!("IOCTL response data: {:?}", rd); - let is_dcerpc = rd.is_pipe && match state.get_service_for_guid(rd.guid) { - (_, x) => x, + let is_dcerpc = if rd.is_pipe { + state.get_service_for_guid(rd.guid).1 + } else { + false }; if is_dcerpc { SCLogDebug!("IOCTL response data is_pipe. Calling smb_read_dcerpc_record"); -- 2.39.2