aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-02-09 11:08:27 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-02-09 11:08:27 +0530
commit93cad4afd33ee59df1a0328ac41b8cebd657ec7b (patch)
tree5383e25724bafa8fbd2c6a5a2840b391fc6330fa /components
parent0124d90a6d1fb17a986b06825f8b3d2af0055144 (diff)
parentfc7f05a751299d2bc8c8f6ebba29cdf90abf68fa (diff)
downloadservo-93cad4afd33ee59df1a0328ac41b8cebd657ec7b.tar.gz
servo-93cad4afd33ee59df1a0328ac41b8cebd657ec7b.zip
Auto merge of #9577 - michaelwu:h5e-update, r=Manishearth
Update html5ever to 0.5.0 r? @Manishearth <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9577) <!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/servohtmlparser.rs2
-rw-r--r--components/servo/Cargo.lock4
3 files changed, 4 insertions, 4 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index b06ae8e8e48..e3c4f3a1988 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -72,7 +72,7 @@ euclid = {version = "0.6.1", features = ["plugins"]}
fnv = "1.0"
heapsize = "0.2.5"
heapsize_plugin = "0.1.2"
-html5ever = {version = "0.4.2", features = ["heap_size", "unstable"]}
+html5ever = {version = "0.5.0", features = ["heap_size", "unstable"]}
hyper = { version = "0.7", features = [ "serde-serialization" ] }
image = "0.5.0"
libc = "0.2"
diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs
index 0a541fbea44..dea7c2a44bd 100644
--- a/components/script/dom/servohtmlparser.rs
+++ b/components/script/dom/servohtmlparser.rs
@@ -522,7 +522,7 @@ struct Tracer {
impl tree_builder::Tracer for Tracer {
type Handle = JS<Node>;
#[allow(unrooted_must_root)]
- fn trace_handle(&self, node: JS<Node>) {
+ fn trace_handle(&self, node: &JS<Node>) {
node.trace(self.trc);
}
}
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 15d0f27e56f..9e06a30a581 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -828,7 +828,7 @@ dependencies = [
[[package]]
name = "html5ever"
-version = "0.4.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heapsize 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1575,7 +1575,7 @@ dependencies = [
"gfx_traits 0.0.1",
"heapsize 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "html5ever 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)",