diff options
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | components/script/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/script/dom/servoparser/xml.rs | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 8317631b3d7..c8186923756 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2308,7 +2308,7 @@ dependencies = [ "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.11.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", - "xml5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xml5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3309,7 +3309,7 @@ dependencies = [ [[package]] name = "xml5ever" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "html5ever-atoms 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3581,4 +3581,4 @@ dependencies = [ "checksum xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77b831a5ba77110f438f0ac5583aafeb087f70432998ba6b7dcb1d32185db453" "checksum xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "315c4e158d7fa277e3ea35b32e50bc07e9a0c8de9130a7cc4bdeab42ddc7b442" "checksum xml-rs 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b15eed12692bd59d15e98ee7f8dc8408465b992d8ddb4d1672c24865132ec7" -"checksum xml5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3aa816561c8d68419dec4c43df33974940cd6a03e376dfc497ec3e46fb7755" +"checksum xml5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d3c01f8de37eb0e091996e9ecd23a4d6eefb821cd0e4d36c0e890343ddb1dd1e" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index cd5750be9d4..10ea03bc548 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -81,7 +81,7 @@ time = "0.1.12" url = {version = "1.2", features = ["heap_size", "query_encoding"]} uuid = {version = "0.3.1", features = ["v4"]} websocket = "0.17" -xml5ever = {version = "0.2", features = ["unstable"]} +xml5ever = {version = "0.3.1", features = ["unstable"]} [dependencies.webrender_traits] git = "https://github.com/servo/webrender" diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs index 616263651c3..74b49fedd1c 100644 --- a/components/script/dom/servoparser/xml.rs +++ b/components/script/dom/servoparser/xml.rs @@ -42,7 +42,7 @@ impl Tokenizer { script: Default::default(), }; - let tb = XmlTreeBuilder::new(sink); + let tb = XmlTreeBuilder::new(sink, Default::default()); let tok = XmlTokenizer::new(tb, Default::default()); Tokenizer { @@ -100,9 +100,14 @@ struct Sink { script: MutNullableJS<HTMLScriptElement>, } -impl<'a> TreeSink for Sink { +impl TreeSink for Sink { + type Output = Self; type Handle = JS<Node>; + fn finish(self) -> Self { + self + } + fn parse_error(&mut self, msg: Cow<'static, str>) { debug!("Parse error: {}", msg); } |