Skip to content

Commit 6165801

Browse files
jdmjdm
committed
Formatting.
1 parent 6a60698 commit 6165801

File tree

12 files changed

+111
-70
lines changed

12 files changed

+111
-70
lines changed

‎html5ever/examples/tokenize.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ impl TokenSink for TokenPrinter {
8585
/// In this example we implement the TokenSink trait in such a way that each token is printed.
8686
/// If a there's an error while processing a token it is printed as well.
8787
fn main() {
88-
let sink = TokenPrinter { in_char_run: Cell::new(false) };
88+
let sink = TokenPrinter {
89+
in_char_run: Cell::new(false),
90+
};
8991

9092
// Read HTML from standard input
9193
let mut chunk = ByteTendril::new();

‎html5ever/src/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl<Sink: TreeSink> TendrilSink<tendril::fmt::UTF8> for Parser<Sink> {
116116

117117
type Output = Sink::Output;
118118

119-
fn finish(mut self) -> Self::Output {
119+
fn finish(self) -> Self::Output {
120120
// FIXME: Properly support </script> somehow.
121121
while let TokenizerResult::Script(_) = self.tokenizer.feed(&self.input_buffer) {}
122122
assert!(self.input_buffer.is_empty());

‎html5ever/src/macros.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
// except according to those terms.
99

1010
macro_rules! unwrap_or_else {
11-
($opt:expr, $else_block:block) => {
12-
{
13-
let Some(x) = $opt else { $else_block };
14-
x
15-
}
16-
};
11+
($opt:expr, $else_block:block) => {{
12+
let Some(x) = $opt else { $else_block };
13+
x
14+
}};
1715
}
1816

1917
macro_rules! unwrap_or_return {

‎html5ever/src/tokenizer/mod.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
288288
if self.reconsume.get() {
289289
self.reconsume.set(false);
290290
Some(self.current_char.get())
291-
292291
} else {
293292
input
294293
.next()
@@ -321,12 +320,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
321320
// BufferQueue::eat.
322321
//
323322
// NB: this doesn't set the current input character.
324-
fn eat(
325-
&self,
326-
input: &BufferQueue,
327-
pat: &str,
328-
eq: fn(&u8, &u8) -> bool,
329-
) -> Option<bool> {
323+
fn eat(&self, input: &BufferQueue, pat: &str, eq: fn(&u8, &u8) -> bool) -> Option<bool> {
330324
if self.ignore_lf.get() {
331325
self.ignore_lf.set(false);
332326
if self.peek(input) == Some('\n') {
@@ -491,7 +485,10 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
491485

492486
fn have_appropriate_end_tag(&self) -> bool {
493487
match self.last_start_tag_name.borrow().as_ref() {
494-
Some(last) => (self.current_tag_kind.get() == EndTag) && (**self.current_tag_name.borrow() == **last),
488+
Some(last) => {
489+
(self.current_tag_kind.get() == EndTag)
490+
&& (**self.current_tag_name.borrow() == **last)
491+
},
495492
None => false,
496493
}
497494
}
@@ -1469,16 +1466,23 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
14691466
}
14701467

14711468
fn dump_profile(&self) {
1472-
let mut results: Vec<(states::State, u64)> =
1473-
self.state_profile.borrow().iter().map(|(s, t)| (*s, *t)).collect();
1469+
let mut results: Vec<(states::State, u64)> = self
1470+
.state_profile
1471+
.borrow()
1472+
.iter()
1473+
.map(|(s, t)| (*s, *t))
1474+
.collect();
14741475
results.sort_by(|&(_, x), &(_, y)| y.cmp(&x));
14751476

14761477
let total: u64 = results
14771478
.iter()
14781479
.map(|&(_, t)| t)
14791480
.fold(0, ::std::ops::Add::add);
14801481
println!("\nTokenizer profile, in nanoseconds");
1481-
println!("\n{:12} total in token sink", self.time_in_sink.get());
1482+
println!(
1483+
"\n{:12} total in token sink",
1484+
self.time_in_sink.get()
1485+
);
14821486
println!("\n{:12} total in tokenizer", total);
14831487

14841488
for (k, v) in results.into_iter() {
@@ -1629,11 +1633,7 @@ mod test {
16291633
impl TokenSink for LinesMatch {
16301634
type Handle = ();
16311635

1632-
fn process_token(
1633-
&self,
1634-
token: Token,
1635-
line_number: u64,
1636-
) -> TokenSinkResult<Self::Handle> {
1636+
fn process_token(&self, token: Token, line_number: u64) -> TokenSinkResult<Self::Handle> {
16371637
match token {
16381638
CharacterTokens(b) => {
16391639
self.current_str.borrow_mut().push_slice(&b);

‎html5ever/src/tree_builder/mod.rs

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use crate::tokenizer::states as tok_state;
2525
use crate::tokenizer::{Doctype, EndTag, StartTag, Tag, TokenSink, TokenSinkResult};
2626

2727
use std::borrow::Cow::Borrowed;
28-
use std::cell::{Cell, RefCell, Ref, RefMut};
28+
use std::cell::{Cell, Ref, RefCell, RefMut};
2929
use std::collections::VecDeque;
3030
use std::iter::{Enumerate, Rev};
3131
use std::mem;
@@ -274,9 +274,18 @@ where
274274
_ => (),
275275
}
276276
}
277-
self.head_elem.borrow().as_ref().map(|h| tracer.trace_handle(h));
278-
self.form_elem.borrow().as_ref().map(|h| tracer.trace_handle(h));
279-
self.context_elem.borrow().as_ref().map(|h| tracer.trace_handle(h));
277+
self.head_elem
278+
.borrow()
279+
.as_ref()
280+
.map(|h| tracer.trace_handle(h));
281+
self.form_elem
282+
.borrow()
283+
.as_ref()
284+
.map(|h| tracer.trace_handle(h));
285+
self.context_elem
286+
.borrow()
287+
.as_ref()
288+
.map(|h| tracer.trace_handle(h));
280289
}
281290

282291
#[allow(dead_code)]
@@ -451,11 +460,7 @@ where
451460
{
452461
type Handle = Handle;
453462

454-
fn process_token(
455-
&self,
456-
token: tokenizer::Token,
457-
line_number: u64,
458-
) -> TokenSinkResult<Handle> {
463+
fn process_token(&self, token: tokenizer::Token, line_number: u64) -> TokenSinkResult<Handle> {
459464
if line_number != self.current_line.get() {
460465
self.sink.set_current_line(line_number);
461466
}
@@ -546,10 +551,10 @@ struct ActiveFormattingView<'a, Handle: 'a> {
546551
data: Ref<'a, Vec<FormatEntry<Handle>>>,
547552
}
548553

549-
impl <'a, Handle: 'a> ActiveFormattingView<'a, Handle> {
554+
impl<'a, Handle: 'a> ActiveFormattingView<'a, Handle> {
550555
fn iter(&'a self) -> impl Iterator<Item = (usize, &'a Handle, &'a Tag)> + 'a {
551556
ActiveFormattingIter {
552-
iter: self.data.iter().enumerate().rev()
557+
iter: self.data.iter().enumerate().rev(),
553558
}
554559
}
555560
}
@@ -625,10 +630,13 @@ where
625630
}
626631

627632
fn position_in_active_formatting(&self, element: &Handle) -> Option<usize> {
628-
self.active_formatting.borrow().iter().position(|n| match n {
629-
&Marker => false,
630-
&Element(ref handle, _) => self.sink.same_node(handle, element),
631-
})
633+
self.active_formatting
634+
.borrow()
635+
.iter()
636+
.position(|n| match n {
637+
&Marker => false,
638+
&Element(ref handle, _) => self.sink.same_node(handle, element),
639+
})
632640
}
633641

634642
fn set_quirks_mode(&self, mode: QuirksMode) {
@@ -659,7 +667,9 @@ where
659667
//§ END
660668

661669
fn current_node(&self) -> Ref<Handle> {
662-
Ref::map(self.open_elems.borrow(), |elems| elems.last().expect("no current element"))
670+
Ref::map(self.open_elems.borrow(), |elems| {
671+
elems.last().expect("no current element")
672+
})
663673
}
664674

665675
fn adjusted_current_node(&self) -> Ref<Handle> {
@@ -819,7 +829,8 @@ where
819829
tag.attrs.clone(),
820830
);
821831
self.open_elems.borrow_mut()[node_index] = new_element.clone();
822-
self.active_formatting.borrow_mut()[node_formatting_index] = Element(new_element.clone(), tag);
832+
self.active_formatting.borrow_mut()[node_formatting_index] =
833+
Element(new_element.clone(), tag);
823834
node = new_element;
824835

825836
// 13.8.
@@ -902,7 +913,11 @@ where
902913
}
903914

904915
fn pop(&self) -> Handle {
905-
let elem = self.open_elems.borrow_mut().pop().expect("no current element");
916+
let elem = self
917+
.open_elems
918+
.borrow_mut()
919+
.pop()
920+
.expect("no current element");
906921
self.sink.pop(&elem);
907922
elem
908923
}
@@ -1386,7 +1401,9 @@ where
13861401
}
13871402

13881403
let elem = self.insert_element(Push, ns!(html), tag.name.clone(), tag.attrs.clone());
1389-
self.active_formatting.borrow_mut().push(Element(elem.clone(), tag));
1404+
self.active_formatting
1405+
.borrow_mut()
1406+
.push(Element(elem.clone(), tag));
13901407
elem
13911408
}
13921409

@@ -1671,7 +1688,11 @@ where
16711688
}
16721689

16731690
fn foreign_start_tag(&self, mut tag: Tag) -> ProcessResult<Handle> {
1674-
let current_ns = self.sink.elem_name(&self.adjusted_current_node()).ns.clone();
1691+
let current_ns = self
1692+
.sink
1693+
.elem_name(&self.adjusted_current_node())
1694+
.ns
1695+
.clone();
16751696
match current_ns {
16761697
ns!(mathml) => self.adjust_mathml_attributes(&mut tag),
16771698
ns!(svg) => {

‎markup5ever/util/buffer_queue.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,10 @@ impl BufferQueue {
241241
}
242242

243243
pub fn swap_with(&self, other: &BufferQueue) {
244-
mem::swap(&mut *self.buffers.borrow_mut(), &mut *other.buffers.borrow_mut());
244+
mem::swap(
245+
&mut *self.buffers.borrow_mut(),
246+
&mut *other.buffers.borrow_mut(),
247+
);
245248
}
246249
}
247250

‎rcdom/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,7 @@ impl TreeSink for RcDom {
264264
};
265265
}
266266

267-
fn create_element(
268-
&self,
269-
name: QualName,
270-
attrs: Vec<Attribute>,
271-
flags: ElementFlags,
272-
) -> Handle {
267+
fn create_element(&self, name: QualName, attrs: Vec<Attribute>, flags: ElementFlags) -> Handle {
273268
Node::new(NodeData::Element {
274269
name,
275270
attrs: RefCell::new(attrs),

‎rcdom/tests/html-tree-sink.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,10 @@ impl TreeSink for LineCountingDOM {
4848
self.rcdom.elem_name(target)
4949
}
5050

51-
fn create_element(
52-
&self,
53-
name: QualName,
54-
attrs: Vec<Attribute>,
55-
flags: ElementFlags,
56-
) -> Handle {
57-
self.line_vec.borrow_mut().push((name.clone(), self.current_line.get()));
51+
fn create_element(&self, name: QualName, attrs: Vec<Attribute>, flags: ElementFlags) -> Handle {
52+
self.line_vec
53+
.borrow_mut()
54+
.push((name.clone(), self.current_line.get()));
5855
self.rcdom.create_element(name, attrs, flags)
5956
}
6057

‎rcdom/tests/xml-tokenizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
use serde_json::{Map, Value};
1111
use std::borrow::Cow::Borrowed;
1212
use std::cell::RefCell;
13+
use std::env;
1314
use std::ffi::OsStr;
1415
use std::io::Read;
1516
use std::path::Path;
16-
use std::env;
1717

1818
use util::find_tests::foreach_xml5lib_test;
1919
use util::runner::Test;

‎xml5ever/examples/xml_tokenizer.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ impl TokenSink for TokenPrinter {
8989
}
9090

9191
fn main() {
92-
let sink = TokenPrinter { in_char_run: Cell::new(false) };
92+
let sink = TokenPrinter {
93+
in_char_run: Cell::new(false),
94+
};
9395
let mut input = ByteTendril::new();
9496
io::stdin().read_to_tendril(&mut input).unwrap();
9597
let input_buffer = BufferQueue::default();

‎xml5ever/src/tokenizer/mod.rs

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,10 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
417417
fn emit_current_tag(&self) {
418418
self.finish_attribute();
419419

420-
let qname = process_qname(replace(&mut *self.current_tag_name.borrow_mut(), StrTendril::new()));
420+
let qname = process_qname(replace(
421+
&mut *self.current_tag_name.borrow_mut(),
422+
StrTendril::new(),
423+
));
421424

422425
match self.current_tag_kind.get() {
423426
StartTag | EmptyTag => {},
@@ -463,7 +466,8 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
463466
fn consume_char_ref(&self, addnl_allowed: Option<char>) {
464467
// NB: The char ref tokenizer assumes we have an additional allowed
465468
// character iff we're tokenizing in an attribute value.
466-
*self.char_ref_tokenizer.borrow_mut() = Some(Box::new(CharRefTokenizer::new(addnl_allowed)));
469+
*self.char_ref_tokenizer.borrow_mut() =
470+
Some(Box::new(CharRefTokenizer::new(addnl_allowed)));
467471
}
468472

469473
fn emit_eof(&self) {
@@ -1116,16 +1120,23 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
11161120

11171121
#[cfg(not(for_c))]
11181122
fn dump_profile(&self) {
1119-
let mut results: Vec<(states::XmlState, u64)> =
1120-
self.state_profile.borrow().iter().map(|(s, t)| (*s, *t)).collect();
1123+
let mut results: Vec<(states::XmlState, u64)> = self
1124+
.state_profile
1125+
.borrow()
1126+
.iter()
1127+
.map(|(s, t)| (*s, *t))
1128+
.collect();
11211129
results.sort_by(|&(_, x), &(_, y)| y.cmp(&x));
11221130

11231131
let total: u64 = results
11241132
.iter()
11251133
.map(|&(_, t)| t)
11261134
.fold(0, ::std::ops::Add::add);
11271135
debug!("\nTokenizer profile, in nanoseconds");
1128-
debug!("\n{:12} total in token sink", self.time_in_sink.get());
1136+
debug!(
1137+
"\n{:12} total in token sink",
1138+
self.time_in_sink.get()
1139+
);
11291140
debug!("\n{:12} total in tokenizer", total);
11301141

11311142
for (k, v) in results.into_iter() {
@@ -1249,7 +1260,10 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
12491260
self.current_attr_name.borrow_mut().clear();
12501261
self.current_attr_value.borrow_mut().clear();
12511262
} else {
1252-
let qname = process_qname(replace(&mut self.current_attr_name.borrow_mut(), StrTendril::new()));
1263+
let qname = process_qname(replace(
1264+
&mut self.current_attr_name.borrow_mut(),
1265+
StrTendril::new(),
1266+
));
12531267
let attr = Attribute {
12541268
name: qname.clone(),
12551269
value: replace(&mut self.current_attr_value.borrow_mut(), StrTendril::new()),

0 commit comments

Comments
 (0)