cargo clippy --fix (#615)

simonwuelker · web-flow · commit f6ca9a9d98c6 · 2025-06-06T21:51:52.000Z
Signed-off-by: Simon Wülker &lt;simon.wuelker@arcor.de&gt;
diff --git a/html5ever/src/serialize/mod.rs b/html5ever/src/serialize/mod.rs
@@ -66,7 +66,7 @@ fn tagname(name: &QualName) -> LocalName {
         ns!(html) | ns!(mathml) | ns!(svg) => (),
         ref ns => {
             // FIXME(#122)
-            warn!("node with weird namespace {:?}", ns);
+            warn!("node with weird namespace {ns:?}");
         },
     }
 
@@ -150,7 +150,7 @@ impl<Wr: Write> Serializer for HtmlSerializer<Wr> {
                 ns!(xlink) => self.writer.write_all(b"xlink:")?,
                 ref ns => {
                     // FIXME(#122)
-                    warn!("attr with weird namespace {:?}", ns);
+                    warn!("attr with weird namespace {ns:?}");
                     self.writer.write_all(b"unknown_namespace:")?;
                 },
             }
diff --git a/html5ever/src/tokenizer/mod.rs b/html5ever/src/tokenizer/mod.rs
@@ -270,7 +270,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
             self.emit_error(Cow::Owned(msg));
         }
 
-        trace!("got character {}", c);
+        trace!("got character {c}");
         self.current_char.set(c);
         Some(c)
     }
@@ -298,7 +298,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
         }
 
         let d = input.pop_except_from(set);
-        trace!("got characters {:?}", d);
+        trace!("got characters {d:?}");
         match d {
             Some(FromSet(c)) => self.get_preprocessed_char(c, input).map(FromSet),
 
@@ -542,7 +542,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
         self.process_token_and_continue(DoctypeToken(doctype));
     }
 
-    fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<Option<StrTendril>> {
+    fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<'_, Option<StrTendril>> {
         let current_doctype = self.current_doctype.borrow_mut();
         match kind {
             Public => RefMut::map(current_doctype, |d| &mut d.public_id),
diff --git a/html5ever/src/tree_builder/mod.rs b/html5ever/src/tree_builder/mod.rs
@@ -672,13 +672,13 @@ where
     }
     //§ END
 
-    fn current_node(&self) -> Ref<Handle> {
+    fn current_node(&self) -> Ref<'_, Handle> {
         Ref::map(self.open_elems.borrow(), |elems| {
             elems.last().expect("no current element")
         })
     }
 
-    fn adjusted_current_node(&self) -> Ref<Handle> {
+    fn adjusted_current_node(&self) -> Ref<'_, Handle> {
         if self.open_elems.borrow().len() == 1 {
             let context_elem = self.context_elem.borrow();
             let ctx = Ref::filter_map(context_elem, |e| e.as_ref());
@@ -1022,12 +1022,12 @@ where
     }
 
     /// Get the first element on the stack, which will be the <html> element.
-    fn html_elem(&self) -> Ref<Handle> {
+    fn html_elem(&self) -> Ref<'_, Handle> {
         Ref::map(self.open_elems.borrow(), |elems| &elems[0])
     }
 
     /// Get the second element on the stack, if it's a HTML body element.
-    fn body_elem(&self) -> Option<Ref<Handle>> {
+    fn body_elem(&self) -> Option<Ref<'_, Handle>> {
         if self.open_elems.borrow().len() <= 1 {
             return None;
         }
diff --git a/markup5ever/interface/mod.rs b/markup5ever/interface/mod.rs
@@ -376,7 +376,7 @@ impl QualName {
     /// ```
     ///
     #[inline]
-    pub fn expanded(&self) -> ExpandedName {
+    pub fn expanded(&self) -> ExpandedName<'_> {
         ExpandedName {
             ns: &self.ns,
             local: &self.local,
diff --git a/markup5ever/interface/tree_builder.rs b/markup5ever/interface/tree_builder.rs
@@ -94,7 +94,7 @@ pub trait ElemName: Debug {
     fn local_name(&self) -> &LocalName;
 
     #[inline(always)]
-    fn expanded(&self) -> ExpandedName {
+    fn expanded(&self) -> ExpandedName<'_> {
         ExpandedName {
             ns: self.ns(),
             local: self.local_name(),
diff --git a/markup5ever/util/buffer_queue.rs b/markup5ever/util/buffer_queue.rs
@@ -252,7 +252,7 @@ impl BufferQueue {
     }
 
     /// Return a mutable reference to the first tendril in the queue.
-    pub fn peek_front_chunk_mut(&self) -> Option<RefMut<StrTendril>> {
+    pub fn peek_front_chunk_mut(&self) -> Option<RefMut<'_, StrTendril>> {
         let buffers = self.buffers.borrow_mut();
         if buffers.is_empty() {
             return None;
diff --git a/xml5ever/src/tokenizer/mod.rs b/xml5ever/src/tokenizer/mod.rs
@@ -261,7 +261,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
             self.emit_error(Cow::Owned(msg));
         }
 
-        debug!("got character {}", c);
+        debug!("got character {c}");
         self.current_char.set(c);
         Some(c)
     }
@@ -286,7 +286,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
         }
 
         let d = input.pop_except_from(set);
-        debug!("got characters {:?}", d);
+        debug!("got characters {d:?}");
         match d {
             Some(FromSet(c)) => self.get_preprocessed_char(c, input).map(FromSet),
 
@@ -493,7 +493,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
         self.process_token(DoctypeToken(doctype));
     }
 
-    fn doctype_id(&self, kind: DoctypeKind) -> RefMut<Option<StrTendril>> {
+    fn doctype_id(&self, kind: DoctypeKind) -> RefMut<'_, Option<StrTendril>> {
         let current_doctype = self.current_doctype.borrow_mut();
         match kind {
             Public => RefMut::map(current_doctype, |d| &mut d.public_id),
@@ -1148,11 +1148,11 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
             "\n{:12}         total in token sink",
             self.time_in_sink.get()
         );
-        debug!("\n{:12}         total in tokenizer", total);
+        debug!("\n{total:12}         total in tokenizer");
 
         for (k, v) in results.into_iter() {
             let pct = 100.0 * (v as f64) / (total as f64);
-            debug!("{:12}  {:4.1}%  {:?}", v, pct, k);
+            debug!("{v:12}  {pct:4.1}%  {k:?}");
         }
     }
 
diff --git a/xml5ever/src/tokenizer/qname.rs b/xml5ever/src/tokenizer/qname.rs
@@ -21,7 +21,7 @@ pub struct QualNameTokenizer<'a> {
 }
 
 impl QualNameTokenizer<'_> {
-    pub fn new(tag: &[u8]) -> QualNameTokenizer {
+    pub fn new(tag: &[u8]) -> QualNameTokenizer<'_> {
         QualNameTokenizer {
             state: QualNameState::BeforeName,
             slice: tag,
diff --git a/xml5ever/src/tree_builder/mod.rs b/xml5ever/src/tree_builder/mod.rs
@@ -102,7 +102,7 @@ impl NamespaceMap {
     }
 
     #[doc(hidden)]
-    pub fn get_scope_iter(&self) -> Iter<Option<Prefix>, Option<Namespace>> {
+    pub fn get_scope_iter(&self) -> Iter<'_, Option<Prefix>, Option<Namespace>> {
         self.scope.iter()
     }
 
@@ -234,7 +234,7 @@ where
     #[cfg(not(for_c))]
     #[allow(dead_code)]
     fn dump_state(&self, label: String) {
-        debug!("dump_state on {}", label);
+        debug!("dump_state on {label}");
         debug!("    open_elems:");
         for node in self.open_elems.borrow().iter() {
             debug!(" {:?}", self.sink.elem_name(node));
@@ -444,7 +444,7 @@ where
     Handle: Clone,
     Sink: TreeSink<Handle = Handle>,
 {
-    fn current_node(&self) -> Ref<Handle> {
+    fn current_node(&self) -> Ref<'_, Handle> {
         Ref::map(self.open_elems.borrow(), |elems| {
             elems.last().expect("no current element")
         })

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {`
`270`	`270`	`self.emit_error(Cow::Owned(msg));`
`271`	`271`	`}`
`272`	`272`
`273`		`- trace!("got character {}", c);`
	`273`	`+ trace!("got character {c}");`
`274`	`274`	`self.current_char.set(c);`
`275`	`275`	`Some(c)`
`276`	`276`	`}`
`@@ -298,7 +298,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`let d = input.pop_except_from(set);`
`301`		`- trace!("got characters {:?}", d);`
	`301`	`+ trace!("got characters {d:?}");`
`302`	`302`	`match d {`
`303`	`303`	`Some(FromSet(c)) => self.get_preprocessed_char(c, input).map(FromSet),`
`304`	`304`
`@@ -542,7 +542,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {`
`542`	`542`	`self.process_token_and_continue(DoctypeToken(doctype));`
`543`	`543`	`}`
`544`	`544`
`545`		`- fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<Option<StrTendril>> {`
	`545`	`+ fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<'_, Option<StrTendril>> {`
`546`	`546`	`let current_doctype = self.current_doctype.borrow_mut();`
`547`	`547`	`match kind {`
`548`	`548`	`Public => RefMut::map(current_doctype, \|d\| &mut d.public_id),`
Original file line number	Diff line number	Diff line change
`@@ -672,13 +672,13 @@ where`
`672`	`672`	`}`
`673`	`673`	`//§ END`
`674`	`674`
`675`		`- fn current_node(&self) -> Ref<Handle> {`
	`675`	`+ fn current_node(&self) -> Ref<'_, Handle> {`
`676`	`676`	`Ref::map(self.open_elems.borrow(), \|elems\| {`
`677`	`677`	`elems.last().expect("no current element")`
`678`	`678`	`})`
`679`	`679`	`}`
`680`	`680`
`681`		`- fn adjusted_current_node(&self) -> Ref<Handle> {`
	`681`	`+ fn adjusted_current_node(&self) -> Ref<'_, Handle> {`
`682`	`682`	`if self.open_elems.borrow().len() == 1 {`
`683`	`683`	`let context_elem = self.context_elem.borrow();`
`684`	`684`	`let ctx = Ref::filter_map(context_elem, \|e\| e.as_ref());`
`@@ -1022,12 +1022,12 @@ where`
`1022`	`1022`	`}`
`1023`	`1023`
`1024`	`1024`	`/// Get the first element on the stack, which will be the <html> element.`
`1025`		`- fn html_elem(&self) -> Ref<Handle> {`
	`1025`	`+ fn html_elem(&self) -> Ref<'_, Handle> {`
`1026`	`1026`	`Ref::map(self.open_elems.borrow(), \|elems\| &elems[0])`
`1027`	`1027`	`}`
`1028`	`1028`
`1029`	`1029`	`/// Get the second element on the stack, if it's a HTML body element.`
`1030`		`- fn body_elem(&self) -> Option<Ref<Handle>> {`
	`1030`	`+ fn body_elem(&self) -> Option<Ref<'_, Handle>> {`
`1031`	`1031`	`if self.open_elems.borrow().len() <= 1 {`
`1032`	`1032`	`return None;`
`1033`	`1033`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ impl BufferQueue {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`/// Return a mutable reference to the first tendril in the queue.`
`255`		`- pub fn peek_front_chunk_mut(&self) -> Option<RefMut<StrTendril>> {`
	`255`	`+ pub fn peek_front_chunk_mut(&self) -> Option<RefMut<'_, StrTendril>> {`
`256`	`256`	`let buffers = self.buffers.borrow_mut();`
`257`	`257`	`if buffers.is_empty() {`
`258`	`258`	`return None;`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {`
`261`	`261`	`self.emit_error(Cow::Owned(msg));`
`262`	`262`	`}`
`263`	`263`
`264`		`- debug!("got character {}", c);`
	`264`	`+ debug!("got character {c}");`
`265`	`265`	`self.current_char.set(c);`
`266`	`266`	`Some(c)`
`267`	`267`	`}`
`@@ -286,7 +286,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`let d = input.pop_except_from(set);`
`289`		`- debug!("got characters {:?}", d);`
	`289`	`+ debug!("got characters {d:?}");`
`290`	`290`	`match d {`
`291`	`291`	`Some(FromSet(c)) => self.get_preprocessed_char(c, input).map(FromSet),`
`292`	`292`
`@@ -493,7 +493,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {`
`493`	`493`	`self.process_token(DoctypeToken(doctype));`
`494`	`494`	`}`
`495`	`495`
`496`		`- fn doctype_id(&self, kind: DoctypeKind) -> RefMut<Option<StrTendril>> {`
	`496`	`+ fn doctype_id(&self, kind: DoctypeKind) -> RefMut<'_, Option<StrTendril>> {`
`497`	`497`	`let current_doctype = self.current_doctype.borrow_mut();`
`498`	`498`	`match kind {`
`499`	`499`	`Public => RefMut::map(current_doctype, \|d\| &mut d.public_id),`
`@@ -1148,11 +1148,11 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {`
`1148`	`1148`	`"\n{:12} total in token sink",`
`1149`	`1149`	`self.time_in_sink.get()`
`1150`	`1150`	`);`
`1151`		`- debug!("\n{:12} total in tokenizer", total);`
	`1151`	`+ debug!("\n{total:12} total in tokenizer");`
`1152`	`1152`
`1153`	`1153`	`for (k, v) in results.into_iter() {`
`1154`	`1154`	`let pct = 100.0 * (v as f64) / (total as f64);`
`1155`		`- debug!("{:12} {:4.1}% {:?}", v, pct, k);`
	`1155`	`+ debug!("{v:12} {pct:4.1}% {k:?}");`
`1156`	`1156`	`}`
`1157`	`1157`	`}`
`1158`	`1158`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ pub struct QualNameTokenizer<'a> {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`impl QualNameTokenizer<'_> {`
`24`		`- pub fn new(tag: &[u8]) -> QualNameTokenizer {`
	`24`	`+ pub fn new(tag: &[u8]) -> QualNameTokenizer<'_> {`
`25`	`25`	`QualNameTokenizer {`
`26`	`26`	`state: QualNameState::BeforeName,`
`27`	`27`	`slice: tag,`