From 5d62995e2684ce398a657269e21fdb49d043a52d Mon Sep 17 00:00:00 2001
From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 28 Nov 2022 16:24:58 -0600
Subject: [PATCH] rust/clippy: fix lint: explicit_counter_loop

---
 rust/src/dcerpc/dcerpc.rs    | 6 ++----
 rust/src/lib.rs              | 1 -
 rust/src/smb/dcerpc.rs       | 4 +---
 rust/src/smb/smb2_records.rs | 4 +---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/rust/src/dcerpc/dcerpc.rs b/rust/src/dcerpc/dcerpc.rs
index 90bee6d20a..5038e7b3c8 100644
--- a/rust/src/dcerpc/dcerpc.rs
+++ b/rust/src/dcerpc/dcerpc.rs
@@ -728,10 +728,9 @@ impl DCERPCState {
         match parser::parse_dcerpc_bindack(input) {
             Ok((leftover_bytes, mut back)) => {
                 if let Some(ref mut bind) = self.bind {
-                    let mut uuid_internal_id = 0;
-                    for r in back.ctxitems.iter() {
+                    for (uuid_internal_id, r) in back.ctxitems.iter().enumerate() {
                         for mut uuid in bind.uuid_list.iter_mut() {
-                            if uuid.internal_id == uuid_internal_id {
+                            if uuid.internal_id == uuid_internal_id as u16 {
                                 uuid.result = r.ack_result;
                                 if uuid.result != 0 {
                                     break;
@@ -740,7 +739,6 @@ impl DCERPCState {
                                 SCLogDebug!("DCERPC BINDACK accepted UUID: {:?}", uuid);
                             }
                         }
-                        uuid_internal_id += 1;
                     }
                     self.bindack = Some(back);
                 }
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index b814bf85a9..133bf9fe28 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -31,7 +31,6 @@
 #![allow(clippy::collapsible_else_if)]
 #![allow(clippy::collapsible_if)]
 #![allow(clippy::derive_partial_eq_without_eq)]
-#![allow(clippy::explicit_counter_loop)]
 #![allow(clippy::field_reassign_with_default)]
 #![allow(clippy::manual_find)]
 #![allow(clippy::match_like_matches_macro)]
diff --git a/rust/src/smb/dcerpc.rs b/rust/src/smb/dcerpc.rs
index 9e93232bf4..502b243052 100644
--- a/rust/src/smb/dcerpc.rs
+++ b/rust/src/smb/dcerpc.rs
@@ -347,15 +347,13 @@ fn smb_dcerpc_response_bindack(
             };
             if found {
                 if let Some(ref mut ifaces) = state.dcerpc_ifaces {
-                    let mut i = 0;
-                    for r in bindackr.results {
+                    for (i, r) in bindackr.results.into_iter().enumerate() {
                         if i >= ifaces.len() {
                             // TODO set event: more acks that requests
                             break;
                         }
                         ifaces[i].ack_result = r.ack_result;
                         ifaces[i].acked = true;
-                        i += 1;
                     }
                 }
             }
diff --git a/rust/src/smb/smb2_records.rs b/rust/src/smb/smb2_records.rs
index 3db46aab92..b19379883a 100644
--- a/rust/src/smb/smb2_records.rs
+++ b/rust/src/smb/smb2_records.rs
@@ -599,14 +599,12 @@ pub fn parse_smb2_response_record(i: &[u8]) -> IResult<&[u8], Smb2Record> {
 
 fn smb_basic_search(d: &[u8]) -> usize {
     let needle = b"SMB";
-    let mut r = 0_usize;
     // this could be replaced by aho-corasick
     let iter = d.windows(needle.len());
-    for window in iter {
+    for (r, window) in iter.enumerate() {
         if window == needle {
             return r;
         }
-        r += 1;
     }
     return 0;
 }