rust: fix clippy lints for clippy::collapsible_if

rust/src/dcerpc/dcerpc_udp.rs

@@ -128,14 +128,11 @@ impl DCERPCUDPState {
 
     fn find_incomplete_tx(&mut self, hdr: &DCERPCHdrUdp) -> Option<&mut DCERPCTransaction> {
         for tx in &mut self.transactions {
-            if tx.seqnum == hdr.seqnum && tx.activityuuid == hdr.activityuuid {
-                if (hdr.pkt_type == DCERPC_TYPE_REQUEST && !tx.req_done) ||
-                   (hdr.pkt_type == DCERPC_TYPE_RESPONSE && !tx.resp_done) {
+            if tx.seqnum == hdr.seqnum && tx.activityuuid == hdr.activityuuid && ((hdr.pkt_type == DCERPC_TYPE_REQUEST && !tx.req_done) || (hdr.pkt_type == DCERPC_TYPE_RESPONSE && !tx.resp_done)) {
                 SCLogDebug!("found tx id {}, last tx_id {}, {} {}", tx.id, self.tx_id, tx.seqnum, tx.activityuuid[0]);
                 return Some(tx);
             }
         }
-        }
         None
     }
 

rust/src/http2/detect.rs

@@ -308,12 +308,10 @@ fn http2_detect_sizeupdate_match(
     blocks: &[parser::HTTP2FrameHeaderBlock], ctx: &DetectUintData<u64>,
 ) -> std::os::raw::c_int {
     for block in blocks.iter() {
-        if block.error == parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSizeUpdate {
-            if detect_match_uint(ctx, block.sizeupdate) {
+        if block.error == parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSizeUpdate && detect_match_uint(ctx, block.sizeupdate) {
             return 1;
         }
     }
-    }
     return 0;
 }
 

rust/src/ike/ikev2.rs

@@ -278,15 +278,13 @@ fn add_proposals(
             IkeV2Transform::Auth(IkeTransformAuthType::NONE) => false,
             IkeV2Transform::Auth(_) => true,
             _ => false,
-        }) {
-            if !transforms.iter().any(|x| match *x {
+        }) && !transforms.iter().any(|x| match *x {
                 IkeV2Transform::Encryption(ref enc) => enc.is_aead(),
                 _ => false,
             }) {
             SCLogDebug!("No integrity transform found");
             tx.set_event(IkeEvent::WeakCryptoNoAuth);
         }
-        }
         // Finally
         if direction == Direction::ToClient {
             transforms.iter().for_each(|t| match *t {

rust/src/smb/smb.rs

@@ -2086,11 +2086,9 @@ fn smb_probe_tcp_midstream(direction: Direction, slice: &[u8], rdir: *mut u8, be
 
 fn smb_probe_tcp(flags: u8, slice: &[u8], rdir: *mut u8, begins: bool) -> AppProto
 {
-    if flags & STREAM_MIDSTREAM == STREAM_MIDSTREAM {
-        if smb_probe_tcp_midstream(flags.into(), slice, rdir, begins) == 1 {
+    if flags & STREAM_MIDSTREAM == STREAM_MIDSTREAM && smb_probe_tcp_midstream(flags.into(), slice, rdir, begins) == 1 {
         unsafe { return ALPROTO_SMB; }
     }
-    }
     match parse_nbss_record_partial(slice) {
         Ok((_, ref hdr)) => {
             if hdr.is_smb() {

rust/src/smb/smb1.rs

@@ -570,8 +570,7 @@ fn smb1_request_record_one<'b>(state: &mut SMBState, r: &SmbRecord<'b>, command:
             false
         },
     };
-    if !have_tx {
-        if smb1_create_new_tx(command) {
+    if !have_tx && smb1_create_new_tx(command) {
         let tx_key = SMBCommonHdr::from1(r, SMBHDR_TYPE_GENERICTX);
         let tx = state.new_generic_tx(1, command as u16, tx_key);
         SCLogDebug!("tx {} created for {}/{}", tx.id, command, &smb1_command_string(command));
@@ -580,7 +579,6 @@ fn smb1_request_record_one<'b>(state: &mut SMBState, r: &SmbRecord<'b>, command:
             tx.response_done = true;
         }
     }
-    }
 }
 
 pub fn smb1_request_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>) -> u32 {

rust/src/smb/smb2.rs

@@ -635,15 +635,13 @@ pub fn smb2_request_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
         },
     };
     /* if we don't have a tx, create it here (maybe) */
-    if !have_tx {
-        if smb2_create_new_tx(r.command) {
+    if !have_tx && smb2_create_new_tx(r.command) {
         let tx_key = SMBCommonHdr::from2(r, SMBHDR_TYPE_GENERICTX);
         let tx = state.new_generic_tx(2, r.command, tx_key);
         SCLogDebug!("TS TX {} command {} created with session_id {} tree_id {} message_id {}",
                 tx.id, r.command, r.session_id, r.tree_id, r.message_id);
         tx.set_events(events);
     }
-    }
 }
 
 pub fn smb2_response_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)