Skip to content

Commit f6ca9a9

Browse files
simonwuelkersimonwuelker
authored
cargo clippy --fix (#615)
Signed-off-by: Simon Wülker <[email protected]>
1 parent d6f9a9a commit f6ca9a9

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎html5ever/src/serialize/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn tagname(name: &QualName) -> LocalName {
6666
ns!(html) | ns!(mathml) | ns!(svg) => (),
6767
ref ns => {
6868
// FIXME(#122)
69-
warn!("node with weird namespace {:?}", ns);
69+
warn!("node with weird namespace {ns:?}");
7070
},
7171
}
7272

@@ -150,7 +150,7 @@ impl<Wr: Write> Serializer for HtmlSerializer<Wr> {
150150
ns!(xlink) => self.writer.write_all(b"xlink:")?,
151151
ref ns => {
152152
// FIXME(#122)
153-
warn!("attr with weird namespace {:?}", ns);
153+
warn!("attr with weird namespace {ns:?}");
154154
self.writer.write_all(b"unknown_namespace:")?;
155155
},
156156
}

‎html5ever/src/tokenizer/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
270270
self.emit_error(Cow::Owned(msg));
271271
}
272272

273-
trace!("got character {}", c);
273+
trace!("got character {c}");
274274
self.current_char.set(c);
275275
Some(c)
276276
}
@@ -298,7 +298,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
298298
}
299299

300300
let d = input.pop_except_from(set);
301-
trace!("got characters {:?}", d);
301+
trace!("got characters {d:?}");
302302
match d {
303303
Some(FromSet(c)) => self.get_preprocessed_char(c, input).map(FromSet),
304304

@@ -542,7 +542,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
542542
self.process_token_and_continue(DoctypeToken(doctype));
543543
}
544544

545-
fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<Option<StrTendril>> {
545+
fn doctype_id(&self, kind: DoctypeIdKind) -> RefMut<'_, Option<StrTendril>> {
546546
let current_doctype = self.current_doctype.borrow_mut();
547547
match kind {
548548
Public => RefMut::map(current_doctype, |d| &mut d.public_id),

‎html5ever/src/tree_builder/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,13 +672,13 @@ where
672672
}
673673
//§ END
674674

675-
fn current_node(&self) -> Ref<Handle> {
675+
fn current_node(&self) -> Ref<'_, Handle> {
676676
Ref::map(self.open_elems.borrow(), |elems| {
677677
elems.last().expect("no current element")
678678
})
679679
}
680680

681-
fn adjusted_current_node(&self) -> Ref<Handle> {
681+
fn adjusted_current_node(&self) -> Ref<'_, Handle> {
682682
if self.open_elems.borrow().len() == 1 {
683683
let context_elem = self.context_elem.borrow();
684684
let ctx = Ref::filter_map(context_elem, |e| e.as_ref());
@@ -1022,12 +1022,12 @@ where
10221022
}
10231023

10241024
/// 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> {
10261026
Ref::map(self.open_elems.borrow(), |elems| &elems[0])
10271027
}
10281028

10291029
/// 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>> {
10311031
if self.open_elems.borrow().len() <= 1 {
10321032
return None;
10331033
}

‎markup5ever/interface/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ impl QualName {
376376
/// ```
377377
///
378378
#[inline]
379-
pub fn expanded(&self) -> ExpandedName {
379+
pub fn expanded(&self) -> ExpandedName<'_> {
380380
ExpandedName {
381381
ns: &self.ns,
382382
local: &self.local,

‎markup5ever/interface/tree_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub trait ElemName: Debug {
9494
fn local_name(&self) -> &LocalName;
9595

9696
#[inline(always)]
97-
fn expanded(&self) -> ExpandedName {
97+
fn expanded(&self) -> ExpandedName<'_> {
9898
ExpandedName {
9999
ns: self.ns(),
100100
local: self.local_name(),

‎markup5ever/util/buffer_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ impl BufferQueue {
252252
}
253253

254254
/// 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>> {
256256
let buffers = self.buffers.borrow_mut();
257257
if buffers.is_empty() {
258258
return None;

‎xml5ever/src/tokenizer/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
261261
self.emit_error(Cow::Owned(msg));
262262
}
263263

264-
debug!("got character {}", c);
264+
debug!("got character {c}");
265265
self.current_char.set(c);
266266
Some(c)
267267
}
@@ -286,7 +286,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
286286
}
287287

288288
let d = input.pop_except_from(set);
289-
debug!("got characters {:?}", d);
289+
debug!("got characters {d:?}");
290290
match d {
291291
Some(FromSet(c)) => self.get_preprocessed_char(c, input).map(FromSet),
292292

@@ -493,7 +493,7 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
493493
self.process_token(DoctypeToken(doctype));
494494
}
495495

496-
fn doctype_id(&self, kind: DoctypeKind) -> RefMut<Option<StrTendril>> {
496+
fn doctype_id(&self, kind: DoctypeKind) -> RefMut<'_, Option<StrTendril>> {
497497
let current_doctype = self.current_doctype.borrow_mut();
498498
match kind {
499499
Public => RefMut::map(current_doctype, |d| &mut d.public_id),
@@ -1148,11 +1148,11 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
11481148
"\n{:12} total in token sink",
11491149
self.time_in_sink.get()
11501150
);
1151-
debug!("\n{:12} total in tokenizer", total);
1151+
debug!("\n{total:12} total in tokenizer");
11521152

11531153
for (k, v) in results.into_iter() {
11541154
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:?}");
11561156
}
11571157
}
11581158

‎xml5ever/src/tokenizer/qname.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub struct QualNameTokenizer<'a> {
2121
}
2222

2323
impl QualNameTokenizer<'_> {
24-
pub fn new(tag: &[u8]) -> QualNameTokenizer {
24+
pub fn new(tag: &[u8]) -> QualNameTokenizer<'_> {
2525
QualNameTokenizer {
2626
state: QualNameState::BeforeName,
2727
slice: tag,

‎xml5ever/src/tree_builder/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl NamespaceMap {
102102
}
103103

104104
#[doc(hidden)]
105-
pub fn get_scope_iter(&self) -> Iter<Option<Prefix>, Option<Namespace>> {
105+
pub fn get_scope_iter(&self) -> Iter<'_, Option<Prefix>, Option<Namespace>> {
106106
self.scope.iter()
107107
}
108108

@@ -234,7 +234,7 @@ where
234234
#[cfg(not(for_c))]
235235
#[allow(dead_code)]
236236
fn dump_state(&self, label: String) {
237-
debug!("dump_state on {}", label);
237+
debug!("dump_state on {label}");
238238
debug!(" open_elems:");
239239
for node in self.open_elems.borrow().iter() {
240240
debug!(" {:?}", self.sink.elem_name(node));
@@ -444,7 +444,7 @@ where
444444
Handle: Clone,
445445
Sink: TreeSink<Handle = Handle>,
446446
{
447-
fn current_node(&self) -> Ref<Handle> {
447+
fn current_node(&self) -> Ref<'_, Handle> {
448448
Ref::map(self.open_elems.borrow(), |elems| {
449449
elems.last().expect("no current element")
450450
})

0 commit comments

Comments
 (0)