Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions html5ever/src/tokenizer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use log::{debug, trace};
use markup5ever::{ns, small_char_set, TokenizerResult};
use std::borrow::Cow::{self, Borrowed};
use std::cell::{Cell, RefCell, RefMut};
use std::cmp::Reverse;
use std::collections::BTreeMap;
use std::mem;

Expand Down Expand Up @@ -1774,12 +1775,9 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
.iter()
.map(|(s, t)| (*s, *t))
.collect();
results.sort_by(|&(_, x), &(_, y)| y.cmp(&x));
results.sort_by_key(|&(_, x)| Reverse(x));

let total: u64 = results
.iter()
.map(|&(_, t)| t)
.fold(0, ::std::ops::Add::add);
let total: u64 = results.iter().map(|&(_, t)| t).sum();
println!("\nTokenizer profile, in nanoseconds");
println!(
"\n{:12} total in token sink",
Expand Down
6 changes: 2 additions & 4 deletions html5ever/src/tree_builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1279,10 +1279,8 @@ where
_ => continue,
};
match *name {
local_name!("td") | local_name!("th") => {
if !last {
return InsertionMode::InCell;
}
local_name!("td") | local_name!("th") if !last => {
return InsertionMode::InCell;
},
local_name!("tr") => return InsertionMode::InRow,
local_name!("tbody") | local_name!("thead") | local_name!("tfoot") => {
Expand Down
2 changes: 1 addition & 1 deletion rcdom/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ impl Drop for Node {
let mut nodes = mem::take(&mut *self.children.borrow_mut());
while let Some(node) = nodes.pop() {
let children = mem::take(&mut *node.children.borrow_mut());
nodes.extend(children.into_iter());
nodes.extend(children);
if let NodeData::Element {
ref template_contents,
..
Expand Down
8 changes: 3 additions & 5 deletions xml5ever/src/tokenizer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use log::debug;
use markup5ever::{local_name, namespace_prefix, ns, small_char_set, TokenizerResult};
use std::borrow::Cow::{self, Borrowed};
use std::cell::{Cell, RefCell, RefMut};
use std::cmp::Reverse;
use std::collections::BTreeMap;
use std::mem::replace;

Expand Down Expand Up @@ -1137,12 +1138,9 @@ impl<Sink: TokenSink> XmlTokenizer<Sink> {
.iter()
.map(|(s, t)| (*s, *t))
.collect();
results.sort_by(|&(_, x), &(_, y)| y.cmp(&x));
results.sort_by_key(|&(_, x)| Reverse(x));

let total: u64 = results
.iter()
.map(|&(_, t)| t)
.fold(0, ::std::ops::Add::add);
let total: u64 = results.iter().map(|&(_, t)| t).sum();
debug!("\nTokenizer profile, in nanoseconds");
debug!(
"\n{:12} total in token sink",
Expand Down
Loading