treefile: Fix clippy char_indices_as_byte_indices lint

cgwalters · cgwalters · commit 6ef58efd8c74 · 2025-11-01T11:52:23.000-04:00
The split_whitespace_unless_quoted function was using chars().enumerate()
which returns character indices, but then using those indices to slice
the string which requires byte indices. This triggers the
char_indices_as_byte_indices clippy lint.

Fixed by using char_indices() instead, which provides byte indices
directly. Also refactored the end-of-string handling to occur after
the loop completes, which is clearer and handles the remaining text
properly regardless of multi-byte characters.

Assisted-by: Claude Code (Sonnet 4.5)
Signed-off-by: Colin Walters &lt;walters@verbum.org&gt;
diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs
@@ -2086,7 +2086,7 @@ fn split_whitespace_unless_quoted(element: &str) -> Result<impl Iterator<Item =
     let mut ret = vec![];
     let mut start_index = 0;
     let mut looping_over_quoted_pkg = false;
-    for (i, c) in element.chars().enumerate() {
+    for (i, c) in element.char_indices() {
         if c == '\'' {
             if looping_over_quoted_pkg {
                 ret.push(&element[start_index..i]);
@@ -2095,15 +2095,16 @@ fn split_whitespace_unless_quoted(element: &str) -> Result<impl Iterator<Item =
                 ret.extend(element[start_index..i].split_whitespace());
                 looping_over_quoted_pkg = true;
             }
-            start_index = i + 1;
-        }
-        if i == element.len() - 1 {
-            if looping_over_quoted_pkg {
-                bail!("Missing terminating quote: {}", element);
-            }
-            ret.extend(element[start_index..].split_whitespace());
+            start_index = i + c.len_utf8();
         }
     }
+    // Handle any remaining text after the loop
+    if looping_over_quoted_pkg {
+        bail!("Missing terminating quote: {}", element);
+    }
+    if start_index < element.len() {
+        ret.extend(element[start_index..].split_whitespace());
+    }
 
     Ok(ret.into_iter())
 }
