Placate clippy

WilliamVenner · Nov 24, 2023 · adbb562 · adbb562
1 parent 11579ef
commit adbb562
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/src/libraryfolders.rs b/src/libraryfolders.rs
@@ -58,10 +58,10 @@ pub fn parse_library_folders(path: &Path) -> Result<LibraryIter> {
         .filter(|(key, _)| key.parse::<u32>().is_ok())
         .map(|(_, values)| {
             values
-                .get(0)
+                .first()
                 .and_then(|value| value.get_obj())
                 .and_then(|obj| obj.get("path"))
-                .and_then(|values| values.get(0))
+                .and_then(|values| values.first())
                 .and_then(|value| value.get_str())
                 .ok_or_else(|| {
                     Error::parse(

diff --git a/src/shortcut.rs b/src/shortcut.rs
@@ -111,27 +111,25 @@ impl Iterator for ShortcutIter {
 #[must_use]
 fn after_many_case_insensitive(it: &mut Peekable<Iter<u8>>, needle: &[u8]) -> bool {
     loop {
-        loop {
-            let mut needle_it = needle.iter();
-            let b = match it.next() {
-                Some(b) => b,
-                None => return false,
-            };
-
-            let maybe_needle_b = needle_it.next();
-            if maybe_u8_eq_ignore_ascii_case(maybe_needle_b, Some(b)) {
-                loop {
-                    if needle_it.len() == 0 {
-                        return true;
-                    }
+        let mut needle_it = needle.iter();
+        let b = match it.next() {
+            Some(b) => b,
+            None => return false,
+        };
 
-                    let maybe_b = it.peek();
-                    let maybe_needle_b = needle_it.next();
-                    if maybe_u8_eq_ignore_ascii_case(maybe_needle_b, maybe_b.copied()) {
-                        let _ = it.next();
-                    } else {
-                        break;
-                    }
+        let maybe_needle_b = needle_it.next();
+        if maybe_u8_eq_ignore_ascii_case(maybe_needle_b, Some(b)) {
+            loop {
+                if needle_it.len() == 0 {
+                    return true;
+                }
+
+                let maybe_b = it.peek();
+                let maybe_needle_b = needle_it.next();
+                if maybe_u8_eq_ignore_ascii_case(maybe_needle_b, maybe_b.copied()) {
+                    let _ = it.next();
+                } else {
+                    break;
                 }
             }
         }