From: Philippe Antoine Date: Fri, 27 Jun 2025 07:42:59 +0000 (+0200) Subject: rust/smb: fix manual_unwrap_or_default X-Git-Tag: suricata-7.0.11~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=805ac10fad7325d2cbb325f6212dd1c4b8becdd8;p=thirdparty%2Fsuricata.git rust/smb: fix manual_unwrap_or_default warning: match can be simplified with `.unwrap_or_default()` --> src/smb/smb2.rs:682:41 | 682 | let _guid_vec = match state.ssn2vec_map.remove(&guid_key) { | _________________________________________^ 683 | | Some(p) => p, 684 | | None => { 685 | | SCLogDebug!("SMBv2 response: GUID NOT FOUND"); 686 | | Vec::new() 687 | | }, 688 | | }; | |_________________________^ help: replace it with: `state.ssn2vec_map.remove(&guid_key).unwrap_or_default()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_unwrap_or_default = note: `#[warn(clippy::manual_unwrap_or_default)]` on by default --- diff --git a/rust/src/smb/smb2.rs b/rust/src/smb/smb2.rs index a2fe021b02..98ed30da1c 100644 --- a/rust/src/smb/smb2.rs +++ b/rust/src/smb/smb2.rs @@ -679,13 +679,7 @@ pub fn smb2_response_record(state: &mut SMBState, r: &Smb2Record) /* search key-guid map */ let guid_key = SMBCommonHdr::new(SMBHDR_TYPE_GUID, r.session_id, r.tree_id, r.message_id); - let _guid_vec = match state.ssn2vec_map.remove(&guid_key) { - Some(p) => p, - None => { - SCLogDebug!("SMBv2 response: GUID NOT FOUND"); - Vec::new() - }, - }; + let _guid_vec = state.ssn2vec_map.remove(&guid_key).unwrap_or_default(); SCLogDebug!("SMBv2 write response for GUID {:?}", _guid_vec); } _ => {