From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 13 Jan 2023 20:04:52 +0000 (-0600)
Subject: rust: fix for loop over option
X-Git-Tag: suricata-6.0.10~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8376%2Fhead;p=thirdparty%2Fsuricata.git

rust: fix for loop over option

As of Rust 1.66 with strict mode enabled, a for loop over an option is
now an error. Replace the last occurrence of this pattern with an "if
let" statement.
---

diff --git a/rust/src/log.rs b/rust/src/log.rs
index b61c6cddaf..e939e633fc 100644
--- a/rust/src/log.rs
+++ b/rust/src/log.rs
@@ -59,8 +59,8 @@ pub extern "C" fn rs_log_set_level(level: i32) {
 
 fn basename(filename: &str) -> &str {
     let path = Path::new(filename);
-    for os_str in path.file_name() {
-        for basename in os_str.to_str() {
+    if let Some(os_str) = path.file_name() {
+        if let Some(basename) = os_str.to_str() {
             return basename;
         }
     }