From 00ac887862b4612c4d0c071523450f20c1484b6b Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Sun, 19 May 2019 21:29:26 +0200 Subject: [PATCH] Update xml5ever and html5ever --- Cargo.lock | 35 ++++++++++--------- components/gfx/Cargo.toml | 2 +- components/layout/Cargo.toml | 2 +- components/layout_thread/Cargo.toml | 2 +- components/malloc_size_of/Cargo.toml | 2 +- components/script/Cargo.toml | 4 +-- components/script/dom/servoparser/xml.rs | 15 ++------ components/script_layout_interface/Cargo.toml | 2 +- components/style/Cargo.toml | 2 +- tests/unit/style/Cargo.toml | 2 +- 10 files changed, 30 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c33b7821577..5557ea90180 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1470,7 +1470,7 @@ dependencies = [ "unicode-script 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_api 0.60.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "xml5ever 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1961,12 +1961,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "html5ever" -version = "0.22.5" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2287,7 +2287,7 @@ dependencies = [ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2334,7 +2334,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "histogram 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", @@ -2596,7 +2596,7 @@ dependencies = [ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_api 0.60.0 (git+https://github.com/servo/webrender)", - "xml5ever 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2619,9 +2619,10 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3573,7 +3574,7 @@ dependencies = [ "gleam 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "headers-core 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "headers-ext 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3634,7 +3635,7 @@ dependencies = [ "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_api 0.60.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", - "xml5ever 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3648,7 +3649,7 @@ dependencies = [ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.7 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", @@ -4335,7 +4336,7 @@ dependencies = [ "fallible 0.0.1", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "hashglobe 0.1.0", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4398,7 +4399,7 @@ dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.7 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.21.0", @@ -5332,12 +5333,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml5ever" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5530,7 +5531,7 @@ dependencies = [ "checksum heartbeats-simple-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e1a408c0011427cc0e0049f7861c70377819aedfc006e8c901b1c70fd98fb1a4" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum histogram 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1bdcec4094c1ca961b685384ea7af76af5718230b3f34657d1a71fd2dcf4cc9d" -"checksum html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c213fa6a618dc1da552f54f85cba74b05d8e883c92ec4e89067736938084c26e" +"checksum html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7" "checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab" "checksum httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b6288d7db100340ca12873fd4d08ad1b8f206a9457798dfb17c018a33fee540" "checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" @@ -5577,7 +5578,7 @@ dependencies = [ "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" "checksum malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35adee9ed962cf7d07d62cb58bc45029f3227f5b5b86246caa8632f06c187bc3" -"checksum markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "897636f9850c3eef4905a5540683ed53dc9393860f0846cab2c2ddf9939862ff" +"checksum markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21" "checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" @@ -5790,5 +5791,5 @@ dependencies = [ "checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61" "checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" "checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" -"checksum xml5ever 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "32cd7ebf0203c620906230ce22caa5df0b603c32b6fef72a275a48f6a2ae64b9" +"checksum xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "223da27bde8f2c691b02610c12b18f3bbfa60eac238a3ba55afb3d4175ce0ada" "checksum zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77ce0ceee93c995954a31f77903925a6a8bb094709445238e344f2107910e29e" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index b57c70ac0c9..085349f3f23 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -60,7 +60,7 @@ servo_allocator = {path = "../allocator"} servo-fontconfig = "0.2.1" [target.'cfg(target_os = "android")'.dependencies] -xml5ever = {version = "0.12"} +xml5ever = {version = "0.14"} [target.'cfg(target_os = "windows")'.dependencies] dwrote = "0.8" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 247a4623a43..abbd43b3e64 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -24,7 +24,7 @@ fnv = "1.0" fxhash = "0.2" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} -html5ever = "0.22" +html5ever = "0.23" ipc-channel = "0.11" libc = "0.2" log = "0.4" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 4c1f53ec48c..b042ed7b62c 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -24,7 +24,7 @@ fxhash = "0.2" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} histogram = "0.6.8" -html5ever = "0.22" +html5ever = "0.23" ipc-channel = "0.11" layout = {path = "../layout"} layout_traits = {path = "../layout_traits"} diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 609a977b1dd..bd351649b5b 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -43,5 +43,5 @@ thin-slice = "0.1.0" time = { version = "0.1.17", optional = true } url = { version = "1.2", optional = true } webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true } -xml5ever = { version = "0.12", optional = true } +xml5ever = { version = "0.14", optional = true } void = "1.0.2" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index a9ef147da99..8dcf5bf0e14 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -56,7 +56,7 @@ fnv = "1.0" gleam = "0.6" headers-core = "0.0.1" headers-ext = "0.0.3" -html5ever = "0.22" +html5ever = "0.23" http = "0.1" hyper = "0.12" hyper_serde = "0.9" @@ -110,7 +110,7 @@ unicode-segmentation = "1.1.0" url = "1.6" utf-8 = "0.7" uuid = {version = "0.7", features = ["v4"]} -xml5ever = {version = "0.12"} +xml5ever = {version = "0.14"} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} webvr_traits = {path = "../webvr_traits"} diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs index 2d9c8ac51ec..8f30e54174d 100644 --- a/components/script/dom/servoparser/xml.rs +++ b/components/script/dom/servoparser/xml.rs @@ -40,18 +40,9 @@ impl Tokenizer { } pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), DomRoot> { - if !input.is_empty() { - while let Some(chunk) = input.pop_front() { - self.inner.feed(chunk); - if let Some(script) = self.inner.sink.sink.script.take() { - return Err(script); - } - } - } else { - self.inner.run(); - if let Some(script) = self.inner.sink.sink.script.take() { - return Err(script); - } + self.inner.run(input); + if let Some(script) = self.inner.sink.sink.script.take() { + return Err(script); } Ok(()) } diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 1edde2cb613..91ef929ec28 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -18,7 +18,7 @@ cssparser = "0.25" crossbeam-channel = "0.3" euclid = "0.19" gfx_traits = {path = "../gfx_traits"} -html5ever = "0.22" +html5ever = "0.23" ipc-channel = "0.11" libc = "0.2" time = "0.1.17" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index e675bb89f31..3947a5d3aa3 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -38,7 +38,7 @@ euclid = "0.19" fallible = { path = "../fallible" } fxhash = "0.2" hashglobe = { path = "../hashglobe" } -html5ever = {version = "0.22", optional = true} +html5ever = {version = "0.23", optional = true} indexmap = "1.0" itertools = "0.8" itoa = "0.4" diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index 8243129365b..567af440dd7 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -14,7 +14,7 @@ byteorder = "1.0" app_units = "0.7" cssparser = "0.25" euclid = "0.19" -html5ever = "0.22" +html5ever = "0.23" parking_lot = "0.6" rayon = "1" serde_json = "1.0"