From 105d9a5f0200d37b2eed2f53acc5df0c7633e21c Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Mon, 3 Oct 2022 16:01:09 -0600 Subject: [PATCH] rust: fix clippy lint for unnecessary_unwrap Avoid check if not none followed by unwrap. --- rust/src/smb/smb1_records.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/src/smb/smb1_records.rs b/rust/src/smb/smb1_records.rs index 32e73fe511..1472014e4d 100644 --- a/rust/src/smb/smb1_records.rs +++ b/rust/src/smb/smb1_records.rs @@ -114,7 +114,7 @@ pub fn parse_smb1_write_andx_request_record(i : &[u8], andx_offset: usize) -> IR let (i, _padding_evasion) = cond(data_offset > ax+4+2*(wct as u16), |b| take(data_offset - (ax+4+2*(wct as u16)))(b))(i)?; let (i, file_data) = rest(i)?; let record = Smb1WriteRequestRecord { - offset: if high_offset.is_some() { ((high_offset.unwrap() as u64) << 32)|(offset as u64) } else { 0 }, + offset: high_offset.map(|ho| (ho as u64) << 32 | offset as u64).unwrap_or(0), len: (((data_len_high as u32) << 16) as u32)|(data_len_low as u32), fid, data: file_data, @@ -514,7 +514,7 @@ pub fn parse_smb_read_andx_request_record(i: &[u8]) -> IResult<&[u8], SmbRequest let record = SmbRequestReadAndXRecord { fid, size: (((max_count_high as u64) << 16)|max_count_low as u64), - offset: if high_offset.is_some() { ((high_offset.unwrap() as u64) << 32)|(offset as u64) } else { 0 }, + offset: high_offset.map(|ho| (ho as u64) << 32 | offset as u64).unwrap_or(0), }; Ok((i, record)) }