diff --git a/html5ever/src/serialize/mod.rs b/html5ever/src/serialize/mod.rs
index 92feee3a..4a7aede1 100644
--- 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 Serializer for HtmlSerializer {
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
index 7a3da9a8..471e2e7c 100644
--- a/html5ever/src/tokenizer/mod.rs
+++ b/html5ever/src/tokenizer/mod.rs
@@ -270,7 +270,7 @@ impl Tokenizer {
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 Tokenizer {
}
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 Tokenizer {
self.process_token_and_continue(DoctypeToken(doctype));
}
- fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut> {
+ fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<'_, Option> {
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
index 52a265a4..c432e58d 100644
--- 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 {
+ 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 {
+ 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 element.
- fn html_elem(&self) -> Ref {
+ 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> {
+ fn body_elem(&self) -> Option> {
if self.open_elems.borrow().len() <= 1 {
return None;
}
diff --git a/markup5ever/interface/mod.rs b/markup5ever/interface/mod.rs
index dbcb0663..366df1f6 100644
--- 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
index 4a40d227..fe7aee72 100644
--- 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
index dca37f43..5ff0486f 100644
--- 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> {
+ pub fn peek_front_chunk_mut(&self) -> Option> {
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
index 4f7d1a48..6e94bc62 100644
--- a/xml5ever/src/tokenizer/mod.rs
+++ b/xml5ever/src/tokenizer/mod.rs
@@ -261,7 +261,7 @@ impl XmlTokenizer {
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 XmlTokenizer {
}
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 XmlTokenizer {
self.process_token(DoctypeToken(doctype));
}
- fn doctype_id(&self, kind: DoctypeKind) -> RefMut> {
+ fn doctype_id(&self, kind: DoctypeKind) -> RefMut<'_, Option> {
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 XmlTokenizer {
"\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
index 863c1daf..886dafc2 100644
--- 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
index ea3d88fe..469511dc 100644
--- 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> {
+ pub fn get_scope_iter(&self) -> Iter<'_, Option, Option> {
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,
{
- fn current_node(&self) -> Ref {
+ fn current_node(&self) -> Ref<'_, Handle> {
Ref::map(self.open_elems.borrow(), |elems| {
elems.last().expect("no current element")
})