Edition 2024

Author: cfvescovo

scraper/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scraper"
 version = "0.25.0"
-edition = "2021"
+edition = "2024"
 
 description = "HTML parsing and querying with CSS selectors"
 keywords = ["html", "css", "selector", "scraping"]

scraper/src/element_ref/mod.rs

@@ -97,7 +97,7 @@ impl<'a> ElementRef<'a> {
     /// let children = fragment.root_element().child_elements().map(|element| element.value().name()).collect::<Vec<_>>();
     /// assert_eq!(children, ["span", "a"]);
     /// ```
-    pub fn child_elements(&self) -> impl Iterator<Item = ElementRef<'a>> {
+    pub fn child_elements(&self) -> impl Iterator<Item = ElementRef<'a>> + use<'a> {
         self.children().filter_map(ElementRef::wrap)
     }
 
@@ -112,7 +112,7 @@ impl<'a> ElementRef<'a> {
     /// let descendants = fragment.root_element().descendent_elements().map(|element| element.value().name()).collect::<Vec<_>>();
     /// assert_eq!(descendants, ["html", "span", "b", "a", "i"]);
     /// ```
-    pub fn descendent_elements(&self) -> impl Iterator<Item = ElementRef<'a>> {
+    pub fn descendent_elements(&self) -> impl Iterator<Item = ElementRef<'a>> + use<'a> {
         self.descendants().filter_map(ElementRef::wrap)
     }
 }
@@ -165,17 +165,15 @@ impl<'a> Iterator for Select<'a, '_> {
 
     fn next(&mut self) -> Option<ElementRef<'a>> {
         for edge in &mut self.inner {
-            if let Edge::Open(node) = edge {
-                if let Some(element) = ElementRef::wrap(node) {
-                    if self.selector.matches_with_scope_and_cache(
+            if let Edge::Open(node) = edge
+                && let Some(element) = ElementRef::wrap(node)
+                    && self.selector.matches_with_scope_and_cache(
                         &element,
                         Some(self.scope),
                         &mut self.caches,
                     ) {
                         return Some(element);
                     }
-                }
-            }
         }
         None
     }
@@ -194,11 +192,10 @@ impl<'a> Iterator for Text<'a> {
 
     fn next(&mut self) -> Option<&'a str> {
         for edge in &mut self.inner {
-            if let Edge::Open(node) = edge {
-                if let Node::Text(ref text) = node.value() {
+            if let Edge::Open(node) = edge
+                && let Node::Text(text) = node.value() {
                     return Some(&**text);
                 }
-            }
         }
         None
     }

scraper/src/html/mod.rs

@@ -159,15 +159,14 @@ impl<'a> Iterator for Select<'a, '_> {
 
     fn next(&mut self) -> Option<ElementRef<'a>> {
         for node in self.inner.by_ref() {
-            if let Some(element) = ElementRef::wrap(node) {
-                if element.parent().is_some()
+            if let Some(element) = ElementRef::wrap(node)
+                && element.parent().is_some()
                     && self
                         .selector
                         .matches_with_scope_and_cache(&element, None, &mut self.caches)
                 {
                     return Some(element);
                 }
-            }
         }
         None
     }
@@ -182,15 +181,14 @@ impl<'a> Iterator for Select<'a, '_> {
 impl DoubleEndedIterator for Select<'_, '_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         for node in self.inner.by_ref().rev() {
-            if let Some(element) = ElementRef::wrap(node) {
-                if element.parent().is_some()
+            if let Some(element) = ElementRef::wrap(node)
+                && element.parent().is_some()
                     && self
                         .selector
                         .matches_with_scope_and_cache(&element, None, &mut self.caches)
                 {
                     return Some(element);
                 }
-            }
         }
         None
     }