Make current nightly version of Clippy happy.

adamreichold · adamreichold · commit 47cc9de95380 · 2024-12-02T08:15:20.000+01:00
diff --git a/scraper/src/element_ref/element.rs b/scraper/src/element_ref/element.rs
@@ -9,7 +9,7 @@ use super::ElementRef;
 use crate::selector::{CssLocalName, CssString, NonTSPseudoClass, PseudoElement, Simple};
 
 /// Note: will never match against non-tree-structure pseudo-classes.
-impl<'a> Element for ElementRef<'a> {
+impl Element for ElementRef<'_> {
     type Impl = Simple;
 
     fn opaque(&self) -> OpaqueElement {
@@ -135,7 +135,7 @@ impl<'a> Element for ElementRef<'a> {
 
     fn is_root(&self) -> bool {
         self.parent()
-            .map_or(false, |parent| parent.value().is_document())
+            .is_some_and(|parent| parent.value().is_document())
     }
 
     fn apply_selector_flags(&self, _flags: matching::ElementSelectorFlags) {}
diff --git a/scraper/src/element_ref/mod.rs b/scraper/src/element_ref/mod.rs
@@ -117,7 +117,7 @@ impl<'a> ElementRef<'a> {
     }
 }
 
-impl<'a> Debug for ElementRef<'a> {
+impl Debug for ElementRef<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         Debug::fmt(self.value(), f)
     }
@@ -160,7 +160,7 @@ impl Clone for Select<'_, '_> {
     }
 }
 
-impl<'a, 'b> Iterator for Select<'a, 'b> {
+impl<'a> Iterator for Select<'a, '_> {
     type Item = ElementRef<'a>;
 
     fn next(&mut self) -> Option<ElementRef<'a>> {
diff --git a/scraper/src/element_ref/serializable.rs b/scraper/src/element_ref/serializable.rs
@@ -4,7 +4,7 @@ use html5ever::serialize::{Serialize, Serializer, TraversalScope};
 
 use crate::ElementRef;
 
-impl<'a> Serialize for ElementRef<'a> {
+impl Serialize for ElementRef<'_> {
     fn serialize<S: Serializer>(
         &self,
         serializer: &mut S,
diff --git a/scraper/src/error.rs b/scraper/src/error.rs
@@ -73,7 +73,7 @@ impl<'a> From<SelectorParseErrorKind<'a>> for SelectorErrorKind<'a> {
     }
 }
 
-impl<'a> Display for SelectorErrorKind<'a> {
+impl Display for SelectorErrorKind<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
@@ -103,7 +103,7 @@ impl<'a> Display for SelectorErrorKind<'a> {
     }
 }
 
-impl<'a> Error for SelectorErrorKind<'a> {
+impl Error for SelectorErrorKind<'_> {
     fn description(&self) -> &str {
         match self {
             Self::UnexpectedToken(_) => "Token was not expected",
diff --git a/scraper/src/html/mod.rs b/scraper/src/html/mod.rs
@@ -153,7 +153,7 @@ impl Clone for Select<'_, '_> {
     }
 }
 
-impl<'a, 'b> Iterator for Select<'a, 'b> {
+impl<'a> Iterator for Select<'a, '_> {
     type Item = ElementRef<'a>;
 
     fn next(&mut self) -> Option<ElementRef<'a>> {
@@ -178,7 +178,7 @@ impl<'a, 'b> Iterator for Select<'a, 'b> {
     }
 }
 
-impl<'a, 'b> DoubleEndedIterator for Select<'a, 'b> {
+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) {
diff --git a/scraper/src/html/tree_sink.rs b/scraper/src/html/tree_sink.rs
@@ -141,7 +141,7 @@ impl TreeSink for HtmlTreeSink {
             NodeOrText::AppendText(text) => {
                 let text = make_tendril(text);
 
-                let did_concat = parent.last_child().map_or(false, |mut n| match n.value() {
+                let did_concat = parent.last_child().is_some_and(|mut n| match n.value() {
                     Node::Text(t) => {
                         t.text.push_tendril(&text);
                         true
@@ -181,16 +181,13 @@ impl TreeSink for HtmlTreeSink {
                 NodeOrText::AppendText(text) => {
                     let text = make_tendril(text);
 
-                    let did_concat =
-                        sibling
-                            .prev_sibling()
-                            .map_or(false, |mut n| match n.value() {
-                                Node::Text(t) => {
-                                    t.text.push_tendril(&text);
-                                    true
-                                }
-                                _ => false,
-                            });
+                    let did_concat = sibling.prev_sibling().is_some_and(|mut n| match n.value() {
+                        Node::Text(t) => {
+                            t.text.push_tendril(&text);
+                            true
+                        }
+                        _ => false,
+                    });
 
                     if !did_concat {
                         sibling.insert_before(Node::Text(Text { text }));
diff --git a/scraper/src/main.rs b/scraper/src/main.rs
@@ -125,8 +125,7 @@ fn main() {
             .iter()
             .map(File::open)
             .map(Result::unwrap)
-            .map(|mut f| query(&input, &output, &selector, &mut f))
-            .any(|m| m)
+            .any(|mut f| query(&input, &output, &selector, &mut f))
     };
 
     process::exit(i32::from(!matched));

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ impl<'a> ElementRef<'a> {`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`-impl<'a> Debug for ElementRef<'a> {`
	`120`	`+impl Debug for ElementRef<'_> {`
`121`	`121`	`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
`122`	`122`	`Debug::fmt(self.value(), f)`
`123`	`123`	`}`
`@@ -160,7 +160,7 @@ impl Clone for Select<'_, '_> {`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`-impl<'a, 'b> Iterator for Select<'a, 'b> {`
	`163`	`+impl<'a> Iterator for Select<'a, '_> {`
`164`	`164`	`type Item = ElementRef<'a>;`
`165`	`165`
`166`	`166`	`fn next(&mut self) -> Option<ElementRef<'a>> {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ impl<'a> From<SelectorParseErrorKind<'a>> for SelectorErrorKind<'a> {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`-impl<'a> Display for SelectorErrorKind<'a> {`
	`76`	`+impl Display for SelectorErrorKind<'_> {`
`77`	`77`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`78`	`78`	`write!(`
`79`	`79`	`f,`
`@@ -103,7 +103,7 @@ impl<'a> Display for SelectorErrorKind<'a> {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`-impl<'a> Error for SelectorErrorKind<'a> {`
	`106`	`+impl Error for SelectorErrorKind<'_> {`
`107`	`107`	`fn description(&self) -> &str {`
`108`	`108`	`match self {`
`109`	`109`	`Self::UnexpectedToken(_) => "Token was not expected",`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ impl Clone for Select<'_, '_> {`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`-impl<'a, 'b> Iterator for Select<'a, 'b> {`
	`156`	`+impl<'a> Iterator for Select<'a, '_> {`
`157`	`157`	`type Item = ElementRef<'a>;`
`158`	`158`
`159`	`159`	`fn next(&mut self) -> Option<ElementRef<'a>> {`
`@@ -178,7 +178,7 @@ impl<'a, 'b> Iterator for Select<'a, 'b> {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`-impl<'a, 'b> DoubleEndedIterator for Select<'a, 'b> {`
	`181`	`+impl DoubleEndedIterator for Select<'_, '_> {`
`182`	`182`	`fn next_back(&mut self) -> Option<Self::Item> {`
`183`	`183`	`for node in self.inner.by_ref().rev() {`
`184`	`184`	`if let Some(element) = ElementRef::wrap(node) {`