From d88eb343af1097f09c226a290edc520109107b4d Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Thu, 20 Jun 2024 10:17:27 -0600 Subject: [PATCH] rust: simply matches with unwrap_or_default New default clippy warning: https://rust-lang.github.io/rust-clippy/master/index.html#manual_unwrap_or_default --- rust/src/smb/dcerpc.rs | 5 +---- rust/src/smb/smb1.rs | 7 ++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/rust/src/smb/dcerpc.rs b/rust/src/smb/dcerpc.rs index b4c5749eac..de6b8def73 100644 --- a/rust/src/smb/dcerpc.rs +++ b/rust/src/smb/dcerpc.rs @@ -455,10 +455,7 @@ pub fn smb_read_dcerpc_record(state: &mut SMBState, // msg_id 0 as this data crosses cmd/reply pairs let ehdr = SMBHashKeyHdrGuid::new(SMBCommonHdr::new(SMBHDR_TYPE_TRANS_FRAG, hdr.ssn_id, hdr.tree_id, 0_u64), guid.to_vec()); - let mut prevdata = match state.ssnguid2vec_map.remove(&ehdr) { - Some(s) => s, - None => Vec::new(), - }; + let mut prevdata = state.ssnguid2vec_map.remove(&ehdr).unwrap_or_default(); SCLogDebug!("indata {} prevdata {}", indata.len(), prevdata.len()); prevdata.extend_from_slice(indata); let data = prevdata; diff --git a/rust/src/smb/smb1.rs b/rust/src/smb/smb1.rs index 3a04c72bd4..eb27123911 100644 --- a/rust/src/smb/smb1.rs +++ b/rust/src/smb/smb1.rs @@ -894,11 +894,8 @@ pub fn smb1_trans_response_record(state: &mut SMBState, r: &SmbRecord) SCLogDebug!("TRANS response {:?}", rd); // see if we have a stored fid - let fid = match state.ssn2vec_map.remove( - &SMBCommonHdr::from1(r, SMBHDR_TYPE_GUID)) { - Some(f) => f, - None => Vec::new(), - }; + let fid = state.ssn2vec_map.remove( + &SMBCommonHdr::from1(r, SMBHDR_TYPE_GUID)).unwrap_or_default(); SCLogDebug!("FID {:?}", fid); let mut frankenfid = fid.to_vec(); -- 2.47.2