Skip to content

Commit 60cd9e7

Browse files
authored
Merge pull request #300 from rust-scraper/upgrade-ego-tree-html5ever
Upgrade ego-tree to 0.11.0 and html5ever to 0.37.1
2 parents a2cfbe4 + ba8f3fc commit 60cd9e7

4 files changed

Lines changed: 25 additions & 34 deletions

File tree

Cargo.lock

Lines changed: 11 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scraper/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ readme = "README.md"
1414

1515
[dependencies]
1616
cssparser = "0.36.0"
17-
ego-tree = "0.10.0"
18-
html5ever = "0.36.0"
17+
ego-tree = "0.11.0"
18+
html5ever = "0.37.1"
1919
indexmap = { version = "2.13.0", optional = true }
2020
precomputed-hash = "0.1.1"
2121
selectors = "0.35.0"
2222
serde = { version = "1.0.228", optional = true }
23-
tendril = "0.4.3"
23+
tendril = "0.5.0"
2424

2525
[dependencies.getopts]
2626
version = "0.2.24"

scraper/src/html/tree_sink.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,13 @@ impl TreeSink for HtmlTreeSink {
294294
self.append(prev_element, child)
295295
}
296296
}
297+
298+
fn clone_subtree(&self, target: &Self::Handle) -> Self::Handle {
299+
let mut html = self.0.borrow_mut();
300+
301+
let mut source_node = html.tree.get_mut(*target).unwrap();
302+
let cloned_subtree = source_node.clone_subtree();
303+
304+
cloned_subtree.id()
305+
}
297306
}

scraper/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn main() {
7575
let matches = match opts.parse(&args[1..]) {
7676
Ok(m) => m,
7777
Err(f) => {
78-
eprintln!("{}", f);
78+
eprintln!("{f}");
7979
process::exit(USAGE);
8080
}
8181
};
@@ -131,7 +131,7 @@ fn main() {
131131
let files = &matches.free[1..];
132132

133133
let selector = Selector::parse(selector).unwrap_or_else(|e| {
134-
eprintln!("failed to parse selector: {}", e);
134+
eprintln!("failed to parse selector: {e}");
135135
process::exit(USAGE);
136136
});
137137

0 commit comments

Comments
 (0)