From 0efad5645a0559dd23d3127df8b7c81cd8d1f7e3 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 31 Mar 2022 23:42:11 -0400 Subject: [PATCH 01/25] Update gif dependency. --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bef8fa7b6c8..5271b2ac876 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2189,9 +2189,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a668f699973d0f573d15749b7002a9ac9e1f9c6b220e7b165601334c173d8de" +checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" dependencies = [ "color_quant", "weezl", @@ -7229,9 +7229,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a32b378380f4e9869b22f0b5177c68a5519f03b3454fde0b291455ddbae266c" +checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" [[package]] name = "wgpu-core" From 4086afb3e6023308d860c2c707eb2ff8999b1c9b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 31 Mar 2022 23:44:44 -0400 Subject: [PATCH 02/25] Update rand. --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5271b2ac876..9275939335d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4825,9 +4825,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ "getrandom", "libc", From ffb6b5d5d8ae0aae8fd4d4ec99ab185f62ea47c0 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 31 Mar 2022 23:45:29 -0400 Subject: [PATCH 03/25] Update uuid. --- Cargo.lock | 35 ++++++++++++++++++++++++++--------- servo-tidy.toml | 2 ++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9275939335d..b0c72c754e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1986,7 +1986,18 @@ checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -3315,9 +3326,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.112" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libdbus-sys" @@ -4829,7 +4840,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.16", "libc", "rand_chacha", "rand_core", @@ -4853,7 +4864,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.16", ] [[package]] @@ -4978,7 +4989,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom", + "getrandom 0.1.16", "redox_syscall", "rust-argon2", ] @@ -6809,11 +6820,11 @@ checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" [[package]] name = "uuid" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "rand", + "getrandom 0.2.6", "serde", ] @@ -6894,6 +6905,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + [[package]] name = "wasm-bindgen" version = "0.2.62" diff --git a/servo-tidy.toml b/servo-tidy.toml index d793aa4a906..975e9fa9a2e 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -39,6 +39,7 @@ packages = [ "crossbeam-utils", "env_logger", "fixedbitset", + "getrandom", "gleam", "h2", "libloading", @@ -50,6 +51,7 @@ packages = [ "parking_lot_core", "petgraph", "ron", + "wasi", "wayland-sys", # https://github.com/servo/servo/issues/26933 From 471650ba90613be6e94e197f80feca9171c3a19c Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 00:35:22 -0400 Subject: [PATCH 04/25] Update keyboard-types. --- Cargo.lock | 4 ++-- components/compositing/Cargo.toml | 2 +- components/constellation/Cargo.toml | 2 +- components/embedder_traits/Cargo.toml | 2 +- components/malloc_size_of/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- components/script_traits/Cargo.toml | 2 +- components/servo/Cargo.toml | 2 +- components/webdriver_server/Cargo.toml | 2 +- ports/libsimpleservo/capi/Cargo.toml | 2 +- ports/winit/Cargo.toml | 2 +- tests/unit/script/Cargo.toml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0c72c754e6..f46551ac529 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3096,9 +3096,9 @@ dependencies = [ [[package]] name = "keyboard-types" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a989afac88279b0482f402d234b5fbd405bf1ad051308595b58de4e6de22346b" +checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" dependencies = [ "bitflags", "serde", diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 4353f7b9472..7b76f036cb5 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -24,7 +24,7 @@ gfx_traits = { path = "../gfx_traits" } gleam = { version = "0.12", optional = true } image = "0.23" ipc-channel = "0.14" -keyboard-types = "0.5" +keyboard-types = "0.6" libc = "0.2" log = "0.4" msg = { path = "../msg" } diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 6ef5c41f00a..79f7a927f9d 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -25,7 +25,7 @@ gfx_traits = { path = "../gfx_traits" } http = "0.2" headers = "0.3" ipc-channel = "0.14" -keyboard-types = "0.5" +keyboard-types = "0.6" layout_traits = { path = "../layout_traits" } log = "0.4" media = { path = "../media" } diff --git a/components/embedder_traits/Cargo.toml b/components/embedder_traits/Cargo.toml index 0e85686e729..fc9f20d66b3 100644 --- a/components/embedder_traits/Cargo.toml +++ b/components/embedder_traits/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] crossbeam-channel = "0.4" ipc-channel = "0.14" -keyboard-types = "0.5" +keyboard-types = "0.6" lazy_static = "1" log = "0.4" msg = { path = "../msg" } diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 60c7fee9c7d..a4497cd3c82 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -36,7 +36,7 @@ euclid = "0.20" hashglobe = { path = "../hashglobe" } http = { version = "0.2", optional = true } hyper_serde = { version = "0.12", optional = true } -keyboard-types = { version = "0.5", optional = true } +keyboard-types = { version = "0.6", optional = true } selectors = { path = "../selectors" } serde = { version = "1.0.27", optional = true } serde_bytes = { version = "0.11", optional = true } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 539dffc906e..cfe9530e072 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -64,7 +64,7 @@ ipc-channel = "0.14" itertools = "0.8" js = { package = "mozjs", git = "https://github.com/servo/rust-mozjs" } jstraceable_derive = { path = "../jstraceable_derive" } -keyboard-types = "0.5" +keyboard-types = "0.6" lazy_static = "1" libc = "0.2" log = "0.4" diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 266d80d3317..cd943871fc0 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -24,7 +24,7 @@ headers = "0.3" http = "0.2" hyper_serde = "0.12" ipc-channel = "0.14" -keyboard-types = "0.5" +keyboard-types = "0.6" libc = "0.2" log = "0.4" malloc_size_of = { path = "../malloc_size_of" } diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index a5f17aa70c5..d7155325919 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -56,7 +56,7 @@ gfx_traits = { path = "../gfx_traits" } gleam = "0.12" gstreamer = { version = "0.15", features = ["v1_16"], optional = true } ipc-channel = "0.14" -keyboard-types = "0.5" +keyboard-types = "0.6" layout_thread_2013 = { path = "../layout_thread", optional = true } layout_thread_2020 = { path = "../layout_thread_2020", optional = true } log = "0.4" diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index d5b7957afe5..a4738265a9c 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -20,7 +20,7 @@ headers = "0.3" http = "0.2" image = "0.23" ipc-channel = "0.14" -keyboard-types = "0.5" +keyboard-types = "0.6" log = "0.4" msg = { path = "../msg" } net_traits = { path = "../net_traits" } diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml index 26a6ff47af4..a856d5f5b4e 100644 --- a/ports/libsimpleservo/capi/Cargo.toml +++ b/ports/libsimpleservo/capi/Cargo.toml @@ -19,7 +19,7 @@ lazy_static = "1" log = "0.4" simpleservo = { path = "../api" } surfman = "0.4" -keyboard-types = "0.5" +keyboard-types = "0.6" [target.'cfg(target_os = "windows")'.dependencies] libc = "0.2" diff --git a/ports/winit/Cargo.toml b/ports/winit/Cargo.toml index 0353f05ca3b..59f0175a845 100644 --- a/ports/winit/Cargo.toml +++ b/ports/winit/Cargo.toml @@ -50,7 +50,7 @@ backtrace = "0.3" clipboard = "0.5" euclid = "0.20" getopts = "0.2.11" -keyboard-types = "0.5" +keyboard-types = "0.6" lazy_static = "1" libc = "0.2" libservo = { path = "../../components/servo" } diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml index e898e9b803c..dcc5d9a6ffa 100644 --- a/tests/unit/script/Cargo.toml +++ b/tests/unit/script/Cargo.toml @@ -11,6 +11,6 @@ path = "lib.rs" [dependencies] euclid = "0.20" -keyboard-types = "0.5" +keyboard-types = "0.6" script = {path = "../../../components/script"} servo_url = {path = "../../../components/url"} From e0248005ef2f2ed493a8898215e5245fe7a37560 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 00:36:08 -0400 Subject: [PATCH 05/25] fixup! Update uuid. --- servo-tidy.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/servo-tidy.toml b/servo-tidy.toml index 975e9fa9a2e..dbf6509079c 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -21,7 +21,6 @@ rand = [ "quickcheck", # Only used in tests "servo_rand", "tempfile", - "uuid", "tungstenite", "ws", ] From e57b9a3446eefa5d2ecbd1532e4c2cc21e4d76d1 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 00:36:48 -0400 Subject: [PATCH 06/25] Fix warnings. --- components/script/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/script/lib.rs b/components/script/lib.rs index 2fcae084fb6..8f458557a7c 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -2,8 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#![feature(const_fn_fn_ptr_basics)] -#![feature(const_fn_trait_bound)] #![feature(core_intrinsics)] #![feature(drain_filter)] #![feature(plugin)] From 72fd95f613e208edea13bb5e1fce663d793a9eb1 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:00:18 -0400 Subject: [PATCH 07/25] Update font-kit. --- Cargo.lock | 163 ++++++++++++++--------------------- components/canvas/Cargo.toml | 4 +- components/config/Cargo.toml | 2 +- components/config/basedir.rs | 6 +- components/gfx/Cargo.toml | 2 +- servo-tidy.toml | 1 + 6 files changed, 74 insertions(+), 104 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f46551ac529..2d1b8b5c640 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,12 +124,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30bbe2f5e3d117f55bd8c7a1f9191e4a5deba9f15f595bbea4f670c59c765db" -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - [[package]] name = "arrayvec" version = "0.4.12" @@ -346,17 +340,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec 0.5.1", - "constant_time_eq", -] - [[package]] name = "block" version = "0.1.6" @@ -903,18 +886,18 @@ dependencies = [ "webxr", ] +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + [[package]] name = "const_fn" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constellation" version = "0.0.1" @@ -1095,9 +1078,9 @@ dependencies = [ [[package]] name = "core-text" -version = "19.0.0" +version = "19.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" dependencies = [ "core-foundation 0.9.0", "core-graphics 0.22.0", @@ -1439,22 +1422,21 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "2.0.2" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "cfg-if 1.0.0", + "dirs-sys-next", ] [[package]] -name = "dirs-sys" -version = "0.3.4" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ - "cfg-if 0.1.10", "libc", "redox_users", "winapi", @@ -1652,16 +1634,6 @@ dependencies = [ "serde", ] -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1714,16 +1686,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-kit" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20" +checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" dependencies = [ "bitflags", "byteorder", "core-foundation 0.9.0", "core-graphics 0.22.0", "core-text", - "dirs", + "dirs-next", "dwrote", "float-ord", "freetype", @@ -1732,9 +1704,18 @@ dependencies = [ "log", "pathfinder_geometry", "pathfinder_simd", - "servo-fontconfig", "walkdir", "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fontconfig" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25320ad784a9578ada0b395dd7dcd2321109404bbb341ec27e64b01a1e49b47" +dependencies = [ + "yeslogic-fontconfig-sys", ] [[package]] @@ -2013,6 +1994,7 @@ dependencies = [ "dwrote", "euclid", "fnv", + "fontconfig", "fontsan", "freetype", "gfx_traits", @@ -2025,7 +2007,6 @@ dependencies = [ "net_traits", "range", "serde", - "servo-fontconfig", "servo_allocator", "servo_arc", "servo_atoms", @@ -4329,9 +4310,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "opaque-debug" @@ -4452,7 +4433,7 @@ dependencies = [ "cfg-if 0.1.10", "cloudabi 0.0.3", "libc", - "redox_syscall", + "redox_syscall 0.1.56", "smallvec 1.6.1", "winapi", ] @@ -4467,7 +4448,7 @@ dependencies = [ "cloudabi 0.1.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.56", "smallvec 1.6.1", "winapi", ] @@ -4913,7 +4894,7 @@ checksum = "a871f1e45a3a3f0c73fb60343c811238bb5143a81642e27c2ac7aac27ff01a63" [[package]] name = "raqote" version = "0.8.1-alpha.0" -source = "git+https://github.com/jdm/raqote?branch=fkup#ff5d2d1aa7813dbcacb0d028cf7d17c82a35d9d4" +source = "git+https://github.com/jdm/raqote?branch=fkup#5a650714ea20f44ebe14de9fce60eeef100144c1" dependencies = [ "euclid", "font-kit", @@ -4974,24 +4955,33 @@ version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" dependencies = [ - "redox_syscall", + "redox_syscall 0.1.56", ] [[package]] name = "redox_users" -version = "0.3.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.1.16", - "redox_syscall", - "rust-argon2", + "getrandom 0.2.6", + "redox_syscall 0.2.13", + "thiserror", ] [[package]] @@ -5054,18 +5044,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rust-argon2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" -dependencies = [ - "base64 0.12.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.7.2", -] - [[package]] name = "rustc-demangle" version = "0.1.18" @@ -5482,27 +5460,6 @@ dependencies = [ "libc", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47fef69c52fb55838c756949c60595f0b855daa4e82fc52ad99ff3e03e2c70" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "servo-gst-plugin" version = "0.0.1" @@ -5716,7 +5673,7 @@ dependencies = [ name = "servo_config" version = "0.0.1" dependencies = [ - "dirs", + "dirs-next", "embedder_traits", "euclid", "getopts", @@ -6316,7 +6273,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "rand", - "redox_syscall", + "redox_syscall 0.1.56", "remove_dir_all", "winapi", ] @@ -6349,7 +6306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" dependencies = [ "libc", - "redox_syscall", + "redox_syscall 0.1.56", "redox_termios", ] @@ -6412,7 +6369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" dependencies = [ "libc", - "redox_syscall", + "redox_syscall 0.1.56", "winapi", ] @@ -7482,6 +7439,18 @@ dependencies = [ "time", ] +[[package]] +name = "yeslogic-fontconfig-sys" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3f5a91c31bef6650d3a1b69192b4217fd88e4cfedc8101813e4dc3394ecbb8" +dependencies = [ + "const-cstr", + "dlib 0.5.0", + "once_cell", + "pkg-config", +] + [[package]] name = "zip" version = "0.3.3" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 04b5e1162ee..1d51ab6e7ea 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -22,7 +22,7 @@ canvas_traits = { path = "../canvas_traits" } crossbeam-channel = "0.4" cssparser = "0.29" euclid = "0.20" -font-kit = "0.10" +font-kit = "0.11" fnv = "1.0" gfx = { path = "../gfx" } gleam = "0.12" @@ -33,7 +33,7 @@ lyon_geom = "0.14" num-traits = "0.2" pathfinder_geometry = "0.5" pixels = { path = "../pixels" } -raqote = { git = "https://github.com/jrmuizel/raqote", features = ["text"] } +raqote = { git = "https://github.com/jrmuizel/raqote" } servo_arc = { path = "../servo_arc" } servo_config = { path = "../config" } sparkle = "0.1.25" diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index 86ba7c00fde..831de6646f6 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -31,4 +31,4 @@ url = "2.0" std_test_override = { path = "../std_test_override" } [target.'cfg(not(target_os = "android"))'.dependencies] -dirs = "2.0.2" +dirs-next = "2.0" diff --git a/components/config/basedir.rs b/components/config/basedir.rs index af993e3852f..c587d82f769 100644 --- a/components/config/basedir.rs +++ b/components/config/basedir.rs @@ -15,7 +15,7 @@ use std::path::PathBuf; not(target_os = "android") ))] pub fn default_config_dir() -> Option { - let mut config_dir = ::dirs::config_dir().unwrap(); + let mut config_dir = ::dirs_next::config_dir().unwrap(); config_dir.push("servo"); config_dir.push("default"); Some(config_dir) @@ -30,14 +30,14 @@ pub fn default_config_dir() -> Option { pub fn default_config_dir() -> Option { // FIXME: use `config_dir()` ($HOME/Library/Preferences) // instead of `data_dir()` ($HOME/Library/Application Support) ? - let mut config_dir = ::dirs::data_dir().unwrap(); + let mut config_dir = ::dirs_next::data_dir().unwrap(); config_dir.push("Servo"); Some(config_dir) } #[cfg(all(target_os = "windows", not(feature = "uwp")))] pub fn default_config_dir() -> Option { - let mut config_dir = ::dirs::config_dir().unwrap(); + let mut config_dir = ::dirs_next::config_dir().unwrap(); config_dir.push("Servo"); Some(config_dir) } diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index df819aab86d..d6242a6dd85 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -52,7 +52,7 @@ freetype = "0.7" servo_allocator = { path = "../allocator" } [target.'cfg(target_os = "linux")'.dependencies] -servo-fontconfig = "0.5" +fontconfig = "0.5" [target.'cfg(target_os = "android")'.dependencies] xml-rs = "0.8" diff --git a/servo-tidy.toml b/servo-tidy.toml index dbf6509079c..4fc16ede4d8 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -49,6 +49,7 @@ packages = [ "parking_lot", "parking_lot_core", "petgraph", + "redox_syscall", "ron", "wasi", "wayland-sys", From a7c87af9cae9d421aae8a1c406d2116582b123ce Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:06:02 -0400 Subject: [PATCH 08/25] Update arrayvec. --- Cargo.lock | 9 ++++++--- components/script/Cargo.toml | 2 +- components/script/dom/gpucanvascontext.rs | 2 +- components/style/Cargo.toml | 2 +- components/style/parallel.rs | 2 +- components/style/properties/properties.mako.rs | 10 ++++------ components/webgpu/Cargo.toml | 2 +- components/webgpu/lib.rs | 12 ++++++------ 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d1b8b5c640..6fca090dc22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,6 +147,9 @@ name = "arrayvec" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" +dependencies = [ + "serde", +] [[package]] name = "ash" @@ -5130,7 +5133,7 @@ version = "0.0.1" dependencies = [ "accountable-refcell", "app_units", - "arrayvec 0.5.1", + "arrayvec 0.7.1", "backtrace", "base64 0.10.1", "bitflags", @@ -6052,7 +6055,7 @@ name = "style" version = "0.0.1" dependencies = [ "app_units", - "arrayvec 0.5.1", + "arrayvec 0.7.1", "atomic_refcell", "bindgen", "bitflags", @@ -7060,7 +7063,7 @@ dependencies = [ name = "webgpu" version = "0.0.1" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.7.1", "euclid", "ipc-channel", "log", diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index cfe9530e072..138627ae2cf 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -32,7 +32,7 @@ serde_json = "1.0" [dependencies] accountable-refcell = { version = "0.2.0", optional = true } app_units = "0.7" -arrayvec = "0.5.1" +arrayvec = "0.7" backtrace = "0.3" base64 = "0.10.1" bitflags = "1.0" diff --git a/components/script/dom/gpucanvascontext.rs b/components/script/dom/gpucanvascontext.rs index c0391d7ca61..6cb5592a9fc 100644 --- a/components/script/dom/gpucanvascontext.rs +++ b/components/script/dom/gpucanvascontext.rs @@ -135,7 +135,7 @@ impl GPUCanvasContextMethods for GPUCanvasContext { } *self.swap_chain.borrow_mut() = None; - let mut buffer_ids = ArrayVec::<[id::BufferId; PRESENTATION_BUFFER_COUNT]>::new(); + let mut buffer_ids = ArrayVec::::new(); for _ in 0..PRESENTATION_BUFFER_COUNT { buffer_ids.push( self.global() diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 218229774b6..6fa7a503cdf 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -31,7 +31,7 @@ gecko_profiler = [] [dependencies] app_units = "0.7" -arrayvec = "0.5" +arrayvec = "0.7" atomic_refcell = "0.1" bitflags = "1.0" byteorder = "1.0" diff --git a/components/style/parallel.rs b/components/style/parallel.rs index 9e578e9e9e6..44618ef2fc1 100644 --- a/components/style/parallel.rs +++ b/components/style/parallel.rs @@ -69,7 +69,7 @@ pub const WORK_UNIT_MAX: usize = 16; /// A set of nodes, sized to the work unit. This gets copied when sent to other /// threads, so we keep it compact. -type WorkUnit = ArrayVec<[SendNode; WORK_UNIT_MAX]>; +type WorkUnit = ArrayVec, WORK_UNIT_MAX>; /// A callback to create our thread local context. This needs to be /// out of line so we don't allocate stack space for the entire struct diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index d2e503df3fb..f24d9b91f39 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2534,11 +2534,8 @@ impl PropertyDeclaration { } } -type SubpropertiesArray = - [T; ${max(len(s.sub_properties) for s in data.shorthands_except_all()) \ - if data.shorthands_except_all() else 0}]; - -type SubpropertiesVec = ArrayVec>; +type SubpropertiesVec = ArrayVec; /// A stack-allocated vector of `PropertyDeclaration` /// large enough to parse one CSS `key: value` declaration. @@ -2594,7 +2591,8 @@ impl SourcePropertyDeclaration { /// Return type of SourcePropertyDeclaration::drain pub struct SourcePropertyDeclarationDrain<'a> { - declarations: ArrayVecDrain<'a, SubpropertiesArray>, + declarations: ArrayVecDrain<'a, PropertyDeclaration, ${max(len(s.sub_properties) for s in data.shorthands_except_all()) \ + if data.shorthands_except_all() else 0}>, all_shorthand: AllShorthand, } diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml index 83ad50e2287..996c1df2b11 100644 --- a/components/webgpu/Cargo.toml +++ b/components/webgpu/Cargo.toml @@ -11,7 +11,7 @@ name = "webgpu" path = "lib.rs" [dependencies] -arrayvec = { version = "0.5.1", features = ["serde"] } +arrayvec = { version = "0.7", features = ["serde"] } euclid = "0.20" ipc-channel = "0.14" log = "0.4" diff --git a/components/webgpu/lib.rs b/components/webgpu/lib.rs index 24919041c8c..1103920cb8f 100644 --- a/components/webgpu/lib.rs +++ b/components/webgpu/lib.rs @@ -164,7 +164,7 @@ pub enum WebGPURequest { }, CreateSwapChain { device_id: id::DeviceId, - buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>, + buffer_ids: ArrayVec, external_id: u64, sender: IpcSender, image_desc: webrender_api::ImageDescriptor, @@ -755,10 +755,10 @@ impl<'a> WGPU<'a> { size: Size2D::new(width, height), unassigned_buffer_ids: buffer_ids, available_buffer_ids: ArrayVec::< - [id::BufferId; PRESENTATION_BUFFER_COUNT], + id::BufferId, PRESENTATION_BUFFER_COUNT, >::new(), queued_buffer_ids: ArrayVec::< - [id::BufferId; PRESENTATION_BUFFER_COUNT], + id::BufferId, PRESENTATION_BUFFER_COUNT, >::new(), buffer_stride, image_key, @@ -1366,9 +1366,9 @@ pub struct PresentationData { queue_id: id::QueueId, pub data: Vec, pub size: Size2D, - unassigned_buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>, - available_buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>, - queued_buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>, + unassigned_buffer_ids: ArrayVec, + available_buffer_ids: ArrayVec, + queued_buffer_ids: ArrayVec, buffer_stride: u32, image_key: webrender_api::ImageKey, image_desc: webrender_api::ImageDescriptor, From 7500cf58778aa177510e2499a9d1f3d981c07da6 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:14:33 -0400 Subject: [PATCH 09/25] Update flate2. --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6fca090dc22..39640d5163d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1665,11 +1665,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.17" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crc32fast", "libc", "miniz_oxide 0.4.0", From 66250bdbd352b2becfe45dfad9d0354ec44a9886 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:15:52 -0400 Subject: [PATCH 10/25] Update log. --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39640d5163d..fc54f58f0e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3482,11 +3482,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] From d9a1a9ddc17bdbb16541ebaa891bb0e2171e4649 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:17:45 -0400 Subject: [PATCH 11/25] Update bytes. --- Cargo.lock | 59 ++++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc54f58f0e6..5ce1143e523 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -518,12 +518,9 @@ dependencies = [ [[package]] name = "bytes" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b" -dependencies = [ - "loom", -] +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" @@ -851,7 +848,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9417a0c314565e2abffaece67e95a8cb51f9238cd39f3764d9dfdf09e72b20c" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "memchr", "pin-project-lite 0.1.11", ] @@ -1924,19 +1921,6 @@ dependencies = [ "log", ] -[[package]] -name = "generator" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061d3be1afec479d56fa3bd182bf966c7999ec175fcfdb87ac14d417241366c6" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "winapi", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -2602,7 +2586,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -2744,7 +2728,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "fnv", "itoa", ] @@ -2755,7 +2739,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "http", ] @@ -2800,7 +2784,7 @@ version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -2944,7 +2928,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", ] [[package]] @@ -3489,17 +3473,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "loom" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e1106f2fa156410c0feb373657bd8afc9e801ab1c3e71cca22ec8faf8d5ded" -dependencies = [ - "cfg-if 0.1.10", - "generator", - "scoped-tls", -] - [[package]] name = "lyon_geom" version = "0.14.1" @@ -5078,12 +5051,6 @@ dependencies = [ "owned_ttf_parser", ] -[[package]] -name = "rustversion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" - [[package]] name = "ryu" version = "1.0.5" @@ -6437,7 +6404,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -6540,7 +6507,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "futures-core", "futures-sink", "log", @@ -6646,7 +6613,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.0", "byteorder", - "bytes 0.5.5", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -6839,7 +6806,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" dependencies = [ - "bytes 0.5.5", + "bytes 0.5.6", "futures 0.3.5", "headers", "http", @@ -7015,7 +6982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3484940751923901dc09b362740cad90bcfb62ec93d8abf38add2c3ac728c596" dependencies = [ "base64 0.12.0", - "bytes 0.5.5", + "bytes 0.5.6", "cookie 0.12.0", "http", "log", From a24a4f0608649ca9a5820020f5353bdb5c610316 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:33:17 -0400 Subject: [PATCH 12/25] Update parking_lot. --- Cargo.lock | 14 +++++++------- components/layout/Cargo.toml | 2 +- components/layout_2020/Cargo.toml | 2 +- components/layout_thread/Cargo.toml | 2 +- components/msg/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- components/script_layout_interface/Cargo.toml | 2 +- components/style/Cargo.toml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ce1143e523..f0b7eabcd94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3101,7 +3101,7 @@ dependencies = [ "msg", "net_traits", "num-traits", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "profile_traits", "range", "rayon", @@ -3146,7 +3146,7 @@ dependencies = [ "mitochondria", "msg", "net_traits", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "quickcheck", "range", "rayon", @@ -3188,7 +3188,7 @@ dependencies = [ "metrics", "msg", "net_traits", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "profile_traits", "range", "rayon", @@ -3864,7 +3864,7 @@ dependencies = [ "lazy_static", "malloc_size_of", "malloc_size_of_derive", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "serde", "size_of_test", "webrender_api", @@ -5147,7 +5147,7 @@ dependencies = [ "msg", "net_traits", "num-traits", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "percent-encoding", "phf", "phf_codegen", @@ -5210,7 +5210,7 @@ dependencies = [ "metrics", "msg", "net_traits", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "profile_traits", "range", "script_traits", @@ -6048,7 +6048,7 @@ dependencies = [ "num-traits", "num_cpus", "owning_ref", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "precomputed-hash", "rayon", "regex", diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index a6bc544f9b3..44357da95a5 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" } msg = { path = "../msg" } net_traits = { path = "../net_traits" } num-traits = "0.2" -parking_lot = "0.10" +parking_lot = "0.11" profile_traits = { path = "../profile_traits" } range = { path = "../range" } rayon = "1" diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml index d32cdc90e39..897f3ea6a06 100644 --- a/components/layout_2020/Cargo.toml +++ b/components/layout_2020/Cargo.toml @@ -30,7 +30,7 @@ log = "0.4" mitochondria = "1.1.2" msg = { path = "../msg" } net_traits = { path = "../net_traits" } -parking_lot = "0.10" +parking_lot = "0.11" range = { path = "../range" } rayon = "1" rayon_croissant = "0.2.0" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index f0f4734d90e..70598995188 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -32,7 +32,7 @@ malloc_size_of = { path = "../malloc_size_of" } metrics = { path = "../metrics" } msg = { path = "../msg" } net_traits = { path = "../net_traits" } -parking_lot = { version = "0.10" } +parking_lot = { version = "0.11" } profile_traits = { path = "../profile_traits" } range = { path = "../range" } rayon = "1" diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index fca04434289..a470bb00c2b 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -17,7 +17,7 @@ ipc-channel = "0.14" lazy_static = "1" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" -parking_lot = "0.10" +parking_lot = "0.11" serde = "1.0.60" webrender_api = { git = "https://github.com/servo/webrender" } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 138627ae2cf..e18354c5bea 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -78,7 +78,7 @@ mitochondria = "1.1.2" msg = { path = "../msg" } net_traits = { path = "../net_traits" } num-traits = "0.2" -parking_lot = "0.10" +parking_lot = "0.11" percent-encoding = "2.0" phf = "0.8" pixels = { path = "../pixels" } diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index cff99b143bb..bdb71b1428f 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -26,7 +26,7 @@ malloc_size_of_derive = "0.1" metrics = { path = "../metrics" } msg = { path = "../msg" } net_traits = { path = "../net_traits" } -parking_lot = "0.10" +parking_lot = "0.11" profile_traits = { path = "../profile_traits" } range = { path = "../range" } script_traits = { path = "../script_traits" } diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 6fa7a503cdf..def4a9f6dcf 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -56,7 +56,7 @@ num-integer = "0.1" num-traits = "0.2" num_cpus = { version = "1.1.0", optional = true } owning_ref = "0.4" -parking_lot = "0.10" +parking_lot = "0.11" precomputed-hash = "0.1.1" rayon = "1" selectors = { path = "../selectors" } From 9eaa27c946519820d4f3b5b153c14316a9ed558c Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:42:18 -0400 Subject: [PATCH 13/25] Update html5ever/xml5ever. --- Cargo.lock | 147 +++++++++++++----- components/layout/Cargo.toml | 2 +- components/layout_2020/Cargo.toml | 2 +- components/layout_thread/Cargo.toml | 2 +- components/layout_thread_2020/Cargo.toml | 2 +- components/malloc_size_of/Cargo.toml | 2 +- components/script/Cargo.toml | 4 +- components/script_layout_interface/Cargo.toml | 2 +- components/style/Cargo.toml | 2 +- tests/unit/style/Cargo.toml | 2 +- 10 files changed, 117 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0b7eabcd94..58716ab3c54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1193,7 +1193,7 @@ dependencies = [ "dtoa-short", "itoa", "matches", - "phf", + "phf 0.8.0", "proc-macro2", "quote", "serde", @@ -2650,7 +2650,7 @@ name = "hashglobe" version = "0.1.0" dependencies = [ "libc", - "rand", + "rand 0.7.3", ] [[package]] @@ -2710,9 +2710,9 @@ checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" [[package]] name = "html5ever" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", @@ -2974,7 +2974,7 @@ dependencies = [ "lazy_static", "libc", "mio 0.6.22", - "rand", + "rand 0.7.3", "serde", "tempfile", "uuid", @@ -3577,13 +3577,13 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", - "phf", - "phf_codegen", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -4539,18 +4539,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ "phf_macros", - "phf_shared", + "phf_shared 0.8.0", "proc-macro-hack", ] +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + [[package]] name = "phf_codegen" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", ] [[package]] @@ -4559,8 +4578,18 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", - "rand", + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", ] [[package]] @@ -4569,8 +4598,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", "proc-macro-hack", "proc-macro2", "quote", @@ -4586,6 +4615,15 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "0.4.29" @@ -4778,8 +4816,8 @@ checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" dependencies = [ "env_logger 0.7.1", "log", - "rand", - "rand_core", + "rand 0.7.3", + "rand_core 0.5.1", ] [[package]] @@ -4799,12 +4837,23 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ "getrandom 0.1.16", "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.2.2", + "rand_core 0.5.1", "rand_hc", "rand_pcg", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.3", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -4812,7 +4861,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.3", ] [[package]] @@ -4824,13 +4883,22 @@ dependencies = [ "getrandom 0.1.16", ] +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom 0.2.6", +] + [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core", + "rand_core 0.5.1", ] [[package]] @@ -4839,7 +4907,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df6b0b3dc9991a10b2d91a86d1129314502169a1bf6afa67328945e02498b76" dependencies = [ - "rand_core", + "rand_core 0.5.1", ] [[package]] @@ -4848,7 +4916,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "rand_core", + "rand_core 0.5.1", ] [[package]] @@ -5149,9 +5217,9 @@ dependencies = [ "num-traits", "parking_lot 0.11.0", "percent-encoding", - "phf", - "phf_codegen", - "phf_shared", + "phf 0.8.0", + "phf_codegen 0.8.0", + "phf_shared 0.8.0", "pixels", "profile_traits", "ref_filter_map", @@ -5316,8 +5384,8 @@ dependencies = [ "derive_more", "fxhash", "log", - "phf", - "phf_codegen", + "phf 0.8.0", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec 1.6.1", @@ -5696,8 +5764,8 @@ version = "0.0.1" dependencies = [ "lazy_static", "log", - "rand", - "rand_core", + "rand 0.7.3", + "rand_core 0.5.1", "rand_isaac", "uuid", ] @@ -5988,7 +6056,7 @@ checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared", + "phf_shared 0.8.0", "precomputed-hash", "serde", ] @@ -5999,8 +6067,8 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", "proc-macro2", "quote", ] @@ -6242,7 +6310,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ "cfg-if 0.1.10", "libc", - "rand", + "rand 0.7.3", "redox_syscall 0.1.56", "remove_dir_all", "winapi", @@ -6619,7 +6687,7 @@ dependencies = [ "input_buffer", "log", "native-tls", - "rand", + "rand 0.7.3", "sha-1 0.9.1", "url", "utf-8", @@ -7323,7 +7391,7 @@ dependencies = [ "log", "mio 0.6.22", "mio-extras", - "rand", + "rand 0.7.3", "sha-1 0.8.2", "slab", "url", @@ -7399,14 +7467,13 @@ checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" [[package]] name = "xml5ever" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59" +checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" dependencies = [ "log", "mac", "markup5ever", - "time", ] [[package]] diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 44357da95a5..7b636af2a8c 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -22,7 +22,7 @@ euclid = "0.20" fnv = "1.0" gfx = { path = "../gfx" } gfx_traits = { path = "../gfx_traits" } -html5ever = "0.25" +html5ever = "0.26" ipc-channel = "0.14" lazy_static = "1" libc = "0.2" diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml index 897f3ea6a06..0a186fe47a2 100644 --- a/components/layout_2020/Cargo.toml +++ b/components/layout_2020/Cargo.toml @@ -23,7 +23,7 @@ fnv = "1.0" fxhash = "0.2" gfx = { path = "../gfx" } gfx_traits = { path = "../gfx_traits" } -html5ever = "0.25" +html5ever = "0.26" ipc-channel = "0.14" libc = "0.2" log = "0.4" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 70598995188..d43884d4d9f 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -21,7 +21,7 @@ fxhash = "0.2" gfx = { path = "../gfx" } gfx_traits = { path = "../gfx_traits" } histogram = "0.6.8" -html5ever = "0.25" +html5ever = "0.26" ipc-channel = "0.14" layout = { path = "../layout", package = "layout_2013" } layout_traits = { path = "../layout_traits" } diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml index 2f60702ab58..7449bcfd1bf 100644 --- a/components/layout_thread_2020/Cargo.toml +++ b/components/layout_thread_2020/Cargo.toml @@ -20,7 +20,7 @@ fnv = "1.0" fxhash = "0.2" gfx = { path = "../gfx" } gfx_traits = { path = "../gfx_traits" } -html5ever = "0.25" +html5ever = "0.26" ipc-channel = "0.14" layout = { path = "../layout_2020", package = "layout_2020" } layout_traits = { path = "../layout_traits" } diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index a4497cd3c82..7ecea5d2d3b 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -51,4 +51,4 @@ url = { version = "2.0", optional = true } uuid = { version = "0.8", features = ["v4"], optional = true } void = "1.0.2" webrender_api = { git = "https://github.com/servo/webrender", optional = true } -xml5ever = { version = "0.16", optional = true } +xml5ever = { version = "0.17", optional = true } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index e18354c5bea..cd363da30a4 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -55,7 +55,7 @@ euclid = "0.20" fnv = "1.0" fxhash = "0.2" headers = "0.3" -html5ever = "0.25" +html5ever = "0.26" http = "0.2" hyper_serde = "0.12" image = "0.23" @@ -116,7 +116,7 @@ webdriver = "0.44" webgpu = { path = "../webgpu" } webrender_api = { git = "https://github.com/servo/webrender" } webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] } -xml5ever = "0.16" +xml5ever = "0.17" [target.'cfg(not(target_os = "ios"))'.dependencies] mozangle = "0.2" diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index bdb71b1428f..be547d5619f 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -18,7 +18,7 @@ crossbeam-channel = "0.4" euclid = "0.20" fxhash = "0.2" gfx_traits = { path = "../gfx_traits" } -html5ever = "0.25" +html5ever = "0.26" ipc-channel = "0.14" libc = "0.2" malloc_size_of = { path = "../malloc_size_of" } diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index def4a9f6dcf..02c8047c2c9 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -42,7 +42,7 @@ euclid = "0.20" fallible = { path = "../fallible" } fxhash = "0.2" hashglobe = { path = "../hashglobe" } -html5ever = { version = "0.25", optional = true } +html5ever = { version = "0.26", 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 51660774900..af60238dc20 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -13,7 +13,7 @@ doctest = false app_units = "0.7" cssparser = "0.29" euclid = "0.20" -html5ever = "0.25" +html5ever = "0.26" rayon = "1" serde_json = "1.0" selectors = {path = "../../../components/selectors"} From b3742b779c6a6b742868c1eb477f187f3a388a90 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:44:27 -0400 Subject: [PATCH 14/25] fixup! Update arrayvec. --- components/style/properties/properties.mako.rs | 3 ++- components/webgpu/lib.rs | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index f24d9b91f39..f4d303f9eb8 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2534,7 +2534,8 @@ impl PropertyDeclaration { } } -type SubpropertiesVec = ArrayVec = ArrayVec; /// A stack-allocated vector of `PropertyDeclaration` diff --git a/components/webgpu/lib.rs b/components/webgpu/lib.rs index 1103920cb8f..2e510a6c6ec 100644 --- a/components/webgpu/lib.rs +++ b/components/webgpu/lib.rs @@ -755,10 +755,12 @@ impl<'a> WGPU<'a> { size: Size2D::new(width, height), unassigned_buffer_ids: buffer_ids, available_buffer_ids: ArrayVec::< - id::BufferId, PRESENTATION_BUFFER_COUNT, + id::BufferId, + PRESENTATION_BUFFER_COUNT, >::new(), queued_buffer_ids: ArrayVec::< - id::BufferId, PRESENTATION_BUFFER_COUNT, + id::BufferId, + PRESENTATION_BUFFER_COUNT, >::new(), buffer_stride, image_key, From c52f0e8a85d597d47378f53a913aa73d9e7cfb8d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:45:14 -0400 Subject: [PATCH 15/25] Update string_cache. --- Cargo.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58716ab3c54..bc01d493f9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6050,13 +6050,14 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" +checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared 0.8.0", + "parking_lot 0.11.0", + "phf_shared 0.10.0", "precomputed-hash", "serde", ] From d1c1d248802a02b99c9499e01d382d21972fb415 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:47:49 -0400 Subject: [PATCH 16/25] fixup! Update parking_lot. --- components/layout_thread_2020/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml index 7449bcfd1bf..387ac63786c 100644 --- a/components/layout_thread_2020/Cargo.toml +++ b/components/layout_thread_2020/Cargo.toml @@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" } metrics = { path = "../metrics" } msg = { path = "../msg" } net_traits = { path = "../net_traits" } -parking_lot = { version = "0.10" } +parking_lot = { version = "0.11" } profile_traits = { path = "../profile_traits" } range = { path = "../range" } script = { path = "../script" } From 2059f117b444991c3abb3a796468e917cac08683 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:48:22 -0400 Subject: [PATCH 17/25] fixup! Update html5ever/xml5ever. --- servo-tidy.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/servo-tidy.toml b/servo-tidy.toml index 4fc16ede4d8..531e6f716d3 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -49,6 +49,13 @@ packages = [ "parking_lot", "parking_lot_core", "petgraph", + "phf", + "phf_codegen", + "phf_generator", + "phf_shared", + "rand", + "rand_chacha", + "rand_core", "redox_syscall", "ron", "wasi", From 369a5c03703479980f053be065b06710f5f1a0d2 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 02:07:17 -0400 Subject: [PATCH 18/25] Update image/png. --- Cargo.lock | 244 ++++++++++++++++----- components/compositing/Cargo.toml | 2 +- components/net_traits/Cargo.toml | 2 +- components/net_traits/image/base.rs | 7 +- components/script/Cargo.toml | 2 +- components/script/dom/htmlcanvaselement.rs | 2 +- components/webdriver_server/Cargo.toml | 2 +- components/webdriver_server/lib.rs | 5 +- ports/winit/Cargo.toml | 2 +- servo-tidy.toml | 5 + 10 files changed, 209 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc01d493f9c..72ef6daf3bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,10 +33,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] -name = "adler32" -version = "1.0.4" +name = "adler" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" @@ -337,6 +343,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit_field" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + [[package]] name = "bitflags" version = "1.2.1" @@ -496,9 +508,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.5.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed57e2090563b83ba8f83366628ce535a7584c9afa4c9fc0612a03925c6df58" +checksum = "ee1e0e2125faccb856bf10b0a9dfa89c4c718d05ef85580dfefbdf1c422ef801" [[package]] name = "byteorder" @@ -838,9 +850,9 @@ dependencies = [ [[package]] name = "color_quant" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" @@ -863,7 +875,7 @@ dependencies = [ "euclid", "gfx_traits", "gleam 0.12.1", - "image", + "image 0.24.1", "ipc-channel", "keyboard-types", "libc", @@ -1197,7 +1209,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "smallvec 1.6.1", + "smallvec 1.8.0", "syn", ] @@ -1306,6 +1318,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "deflate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +dependencies = [ + "adler32", +] + [[package]] name = "deny_public_fields" version = "0.0.1" @@ -1634,6 +1655,22 @@ dependencies = [ "serde", ] +[[package]] +name = "exr" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4badb9489a465cb2c555af1f00f0bfd8cecd6fc12ac11da9d5b40c5dd5f0200" +dependencies = [ + "bit_field", + "deflate 1.0.0", + "flume", + "half", + "inflate", + "lebe", + "smallvec 1.8.0", + "threadpool", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -1645,7 +1682,7 @@ name = "fallible" version = "0.0.1" dependencies = [ "hashglobe", - "smallvec 1.6.1", + "smallvec 1.8.0", ] [[package]] @@ -1678,6 +1715,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" +[[package]] +name = "flume" +version = "0.10.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project 1.0.2", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1964,8 +2014,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.10.2+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2036,7 +2088,7 @@ dependencies = [ "parking_lot 0.11.0", "range-alloc", "raw-window-handle", - "smallvec 1.6.1", + "smallvec 1.8.0", "spirv_cross", "thunderdome", "winapi", @@ -2058,7 +2110,7 @@ dependencies = [ "log", "range-alloc", "raw-window-handle", - "smallvec 1.6.1", + "smallvec 1.8.0", "spirv_cross", "winapi", ] @@ -2095,7 +2147,7 @@ dependencies = [ "parking_lot 0.11.0", "range-alloc", "raw-window-handle", - "smallvec 1.6.1", + "smallvec 1.8.0", "spirv_cross", "storage-map", ] @@ -2116,7 +2168,7 @@ dependencies = [ "log", "objc", "raw-window-handle", - "smallvec 1.6.1", + "smallvec 1.8.0", "winapi", ] @@ -2885,12 +2937,28 @@ checksum = "985fc06b1304d19c28d5c562ed78ef5316183f2b0053b46763a0b94862373c34" dependencies = [ "bytemuck", "byteorder", - "gif", - "jpeg-decoder", "num-iter", "num-rational 0.3.0", "num-traits", - "png", + "png 0.16.6", +] + +[[package]] +name = "image" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db207d030ae38f1eb6f240d5a1c1c88ff422aa005d10f8c6c6fc5e75286ab30e" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder 0.2.3", + "num-iter", + "num-rational 0.4.0", + "num-traits", + "png 0.17.5", "scoped_threadpool", "tiff", ] @@ -2916,6 +2984,15 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + [[package]] name = "inplace_it" version = "0.3.2" @@ -3040,6 +3117,12 @@ name = "jpeg-decoder" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" + +[[package]] +name = "jpeg-decoder" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55ad40a2d27923f63b6fbde5934926176c69ac5e23da6ac05ebfaca984e163f" dependencies = [ "rayon", ] @@ -3232,7 +3315,7 @@ dependencies = [ "metrics", "msg", "net_traits", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "profile_traits", "range", "script", @@ -3292,6 +3375,12 @@ dependencies = [ "leak", ] +[[package]] +name = "lebe" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" + [[package]] name = "libc" version = "0.2.121" @@ -3357,7 +3446,7 @@ dependencies = [ "log", "servo-egl", "simpleservo", - "smallvec 1.6.1", + "smallvec 1.8.0", "webxr", "webxr-api", ] @@ -3495,12 +3584,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "lzw" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" - [[package]] name = "mac" version = "0.1.1" @@ -3544,7 +3627,7 @@ dependencies = [ "serde_bytes", "servo_arc", "smallbitvec", - "smallvec 1.6.1", + "smallvec 1.8.0", "string_cache", "thin-slice", "time", @@ -3741,7 +3824,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" dependencies = [ - "adler", + "adler 0.2.3", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +dependencies = [ + "adler 1.0.2", ] [[package]] @@ -3890,6 +3982,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom 0.2.6", +] + [[package]] name = "native-tls" version = "0.2.7" @@ -4034,7 +4135,7 @@ dependencies = [ "http", "hyper 0.14.5", "hyper_serde", - "image", + "image 0.24.1", "ipc-channel", "lazy_static", "log", @@ -4198,6 +4299,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.14" @@ -4410,7 +4522,7 @@ dependencies = [ "cloudabi 0.0.3", "libc", "redox_syscall 0.1.56", - "smallvec 1.6.1", + "smallvec 1.8.0", "winapi", ] @@ -4425,7 +4537,7 @@ dependencies = [ "instant", "libc", "redox_syscall 0.1.56", - "smallvec 1.6.1", + "smallvec 1.8.0", "winapi", ] @@ -4718,10 +4830,22 @@ checksum = "c150bf7479fafe3dd8740dbe48cc33b2a3efb7b0fe3483aced8bbc39f6d0238d" dependencies = [ "bitflags", "crc32fast", - "deflate", + "deflate 0.8.6", "miniz_oxide 0.3.7", ] +[[package]] +name = "png" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" +dependencies = [ + "bitflags", + "crc32fast", + "deflate 1.0.0", + "miniz_oxide 0.5.1", +] + [[package]] name = "podio" version = "0.1.7" @@ -4944,7 +5068,7 @@ dependencies = [ "font-kit", "lyon_geom 0.15.0", "pathfinder_geometry", - "png", + "png 0.16.6", "sw-composite", "typed-arena", ] @@ -4960,9 +5084,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg", "crossbeam-deque", @@ -5194,7 +5318,7 @@ dependencies = [ "html5ever", "http", "hyper_serde", - "image", + "image 0.24.1", "indexmap", "ipc-channel", "itertools", @@ -5388,7 +5512,7 @@ dependencies = [ "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", - "smallvec 1.6.1", + "smallvec 1.8.0", "to_shmem", "to_shmem_derive", ] @@ -5472,7 +5596,7 @@ dependencies = [ "clipboard", "euclid", "getopts", - "image", + "image 0.24.1", "keyboard-types", "lazy_static", "libc", @@ -5943,9 +6067,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" dependencies = [ "serde", ] @@ -6005,6 +6129,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b72d540d5c565dbe1f891d7e21ceb21d2649508306782f1066989fccb0b363d3" +[[package]] +name = "spin" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +dependencies = [ + "lock_api 0.4.1", +] + [[package]] name = "spirv_cross" version = "0.22.1" @@ -6128,7 +6261,7 @@ dependencies = [ "servo_config", "servo_url", "smallbitvec", - "smallvec 1.6.1", + "smallvec 1.8.0", "string_cache", "style_derive", "style_traits", @@ -6384,6 +6517,15 @@ dependencies = [ "syn", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "thunderdome" version = "0.3.0" @@ -6392,13 +6534,13 @@ checksum = "7572415bd688d401c52f6e36f4c8e805b9ae1622619303b9fa835d531db0acae" [[package]] name = "tiff" -version = "0.5.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b8a87c4da944c3f27e5943289171ac71a6150a79ff6bacfff06d159dfff2f" +checksum = "0247608e998cb6ce39dfc8f4a16c50361ce71e5b52e6d24ea1227ea8ea8ee0b2" dependencies = [ - "byteorder", - "lzw", - "miniz_oxide 0.3.7", + "flate2", + "jpeg-decoder 0.1.22", + "weezl", ] [[package]] @@ -6450,7 +6592,7 @@ dependencies = [ "cssparser", "servo_arc", "smallbitvec", - "smallvec 1.6.1", + "smallvec 1.8.0", "string_cache", "thin-slice", ] @@ -6985,7 +7127,7 @@ checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" dependencies = [ "nix 0.20.0", "once_cell", - "smallvec 1.6.1", + "smallvec 1.8.0", "wayland-sys 0.28.5", ] @@ -7078,7 +7220,7 @@ dependencies = [ "euclid", "headers", "http", - "image", + "image 0.24.1", "ipc-channel", "keyboard-types", "log", @@ -7136,7 +7278,7 @@ dependencies = [ "fxhash", "gleam 0.12.1", "glslopt", - "image", + "image 0.23.10", "lazy_static", "libc", "log", @@ -7148,7 +7290,7 @@ dependencies = [ "serde", "serde_json", "sig", - "smallvec 1.6.1", + "smallvec 1.8.0", "svg_fmt", "time", "tracy-rs", @@ -7268,7 +7410,7 @@ dependencies = [ "parking_lot 0.11.0", "ron 0.6.0", "serde", - "smallvec 1.6.1", + "smallvec 1.8.0", "thiserror", "tracing", "wgpu-types", diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 7b76f036cb5..972b3bdeffc 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -22,7 +22,7 @@ embedder_traits = { path = "../embedder_traits" } euclid = "0.20" gfx_traits = { path = "../gfx_traits" } gleam = { version = "0.12", optional = true } -image = "0.23" +image = "0.24" ipc-channel = "0.14" keyboard-types = "0.6" libc = "0.2" diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 76fb2113fb7..db398c9b7ca 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -29,7 +29,7 @@ mime = "0.3" msg = { path = "../msg" } num-traits = "0.2" percent-encoding = "2.0" -piston_image = { package = "image", version = "0.23" } +piston_image = { package = "image", version = "0.24" } pixels = { path = "../pixels" } serde = "1.0" servo_arc = { path = "../servo_arc" } diff --git a/components/net_traits/image/base.rs b/components/net_traits/image/base.rs index 6f090f12fe1..d77855aee27 100644 --- a/components/net_traits/image/base.rs +++ b/components/net_traits/image/base.rs @@ -4,7 +4,7 @@ use crate::image_cache::CorsStatus; use ipc_channel::ipc::IpcSharedMemory; -use piston_image::{DynamicImage, ImageFormat}; +use piston_image::ImageFormat; use pixels::PixelFormat; use std::fmt; @@ -52,10 +52,7 @@ pub fn load_from_memory(buffer: &[u8], cors_status: CorsStatus) -> Option }, Ok(_) => match piston_image::load_from_memory(buffer) { Ok(image) => { - let mut rgba = match image { - DynamicImage::ImageRgba8(rgba) => rgba, - image => image.to_rgba(), - }; + let mut rgba = image.into_rgba8(); pixels::rgba8_byte_swap_colors_inplace(&mut *rgba); Some(Image { width: rgba.width(), diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index cd363da30a4..1f17fa15c43 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -58,7 +58,7 @@ headers = "0.3" html5ever = "0.26" http = "0.2" hyper_serde = "0.12" -image = "0.23" +image = "0.24" indexmap = { version = "1.0.2", features = ["std"] } ipc-channel = "0.14" itertools = "0.8" diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 67531761ce7..3094b126eb5 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -37,7 +37,7 @@ use canvas_traits::webgl::{GLContextAttributes, WebGLVersion}; use dom_struct::dom_struct; use euclid::default::{Rect, Size2D}; use html5ever::{LocalName, Prefix}; -use image::png::PngEncoder; +use image::codecs::png::PngEncoder; use image::ColorType; use ipc_channel::ipc::{self as ipcchan, IpcSharedMemory}; use js::error::throw_type_error; diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index a4738265a9c..7b128986c17 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -18,7 +18,7 @@ crossbeam-channel = "0.4" euclid = "0.20" headers = "0.3" http = "0.2" -image = "0.23" +image = "0.24" ipc-channel = "0.14" keyboard-types = "0.6" log = "0.4" diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index e4be9215a84..8712fd9c903 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -43,6 +43,7 @@ use servo_url::ServoUrl; use std::borrow::ToOwned; use std::collections::{BTreeMap, HashMap}; use std::fmt; +use std::io::Cursor; use std::mem; use std::net::{SocketAddr, SocketAddrV4}; use std::thread; @@ -1589,12 +1590,12 @@ impl Handler { ); let rgb = RgbImage::from_raw(img.width, img.height, img.bytes.to_vec()).unwrap(); - let mut png_data = Vec::new(); + let mut png_data = Cursor::new(Vec::new()); DynamicImage::ImageRgb8(rgb) .write_to(&mut png_data, ImageFormat::Png) .unwrap(); - Ok(base64::encode(&png_data)) + Ok(base64::encode(png_data.get_ref())) } fn handle_take_screenshot(&self) -> WebDriverResult { diff --git a/ports/winit/Cargo.toml b/ports/winit/Cargo.toml index 59f0175a845..226f1327dc4 100644 --- a/ports/winit/Cargo.toml +++ b/ports/winit/Cargo.toml @@ -63,7 +63,7 @@ webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", winit = "0.24" [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies] -image = "0.23" +image = "0.24" [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies] sig = "1.0" diff --git a/servo-tidy.toml b/servo-tidy.toml index 531e6f716d3..d06824963be 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -28,6 +28,7 @@ rand = [ [ignore] # Ignored packages with duplicated versions packages = [ + "adler", "arrayvec", "base64", "cfg-if", @@ -36,11 +37,14 @@ packages = [ "cookie", "crossbeam-channel", "crossbeam-utils", + "deflate", "env_logger", "fixedbitset", "getrandom", "gleam", "h2", + "image", + "jpeg-decoder", "libloading", "lock_api", "metal", @@ -53,6 +57,7 @@ packages = [ "phf_codegen", "phf_generator", "phf_shared", + "png", "rand", "rand_chacha", "rand_core", From 0625ab92b85da87afd533da28b1727dada2dd6b2 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 02:11:47 -0400 Subject: [PATCH 19/25] Update cookie/hyper_serde. --- Cargo.lock | 27 +++++++++----------------- components/malloc_size_of/Cargo.toml | 2 +- components/net/Cargo.toml | 4 ++-- components/net_traits/Cargo.toml | 4 ++-- components/script/Cargo.toml | 4 ++-- components/script_traits/Cargo.toml | 4 ++-- components/webdriver_server/Cargo.toml | 2 +- servo-tidy.toml | 1 - 8 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72ef6daf3bd..c2951810cbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -967,15 +967,6 @@ dependencies = [ "url", ] -[[package]] -name = "cookie" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fac5e7bdefb6160fb181ee0eaa6f96704b625c70e6d61c465cb35750a4ea12" -dependencies = [ - "time", -] - [[package]] name = "cookie" version = "0.12.0" @@ -2898,11 +2889,11 @@ dependencies = [ [[package]] name = "hyper_serde" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843b2c3c0cee11aa3042250e849a333124a6a873f8f66e5fdaab7980df1ac8ee" +checksum = "4193ebe2b9ecb7d04dd1a777c25f3294e10310fe5583e1006a3f47779d6c6a01" dependencies = [ - "cookie 0.11.2", + "cookie", "headers", "http", "hyper 0.14.5", @@ -4064,7 +4055,7 @@ dependencies = [ "brotli", "bytes 1.1.0", "content-security-policy", - "cookie 0.11.2", + "cookie", "crossbeam-channel 0.4.4", "data-url", "devtools_traits", @@ -4129,7 +4120,7 @@ name = "net_traits" version = "0.0.1" dependencies = [ "content-security-policy", - "cookie 0.11.2", + "cookie", "embedder_traits", "headers", "http", @@ -5300,7 +5291,7 @@ dependencies = [ "canvas_traits", "chrono", "content-security-policy", - "cookie 0.11.2", + "cookie", "crossbeam-channel 0.4.4", "cssparser", "data-url", @@ -5443,7 +5434,7 @@ dependencies = [ "bitflags", "bluetooth_traits", "canvas_traits", - "cookie 0.11.2", + "cookie", "crossbeam-channel 0.4.4", "devtools_traits", "embedder_traits", @@ -7194,7 +7185,7 @@ checksum = "3484940751923901dc09b362740cad90bcfb62ec93d8abf38add2c3ac728c596" dependencies = [ "base64 0.12.0", "bytes 0.5.6", - "cookie 0.12.0", + "cookie", "http", "log", "once_cell", @@ -7215,7 +7206,7 @@ version = "0.0.1" dependencies = [ "base64 0.10.1", "compositing", - "cookie 0.11.2", + "cookie", "crossbeam-channel 0.4.4", "euclid", "headers", diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 7ecea5d2d3b..ea19a6f2cfc 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -35,7 +35,7 @@ cssparser = "0.29" euclid = "0.20" hashglobe = { path = "../hashglobe" } http = { version = "0.2", optional = true } -hyper_serde = { version = "0.12", optional = true } +hyper_serde = { version = "0.13", optional = true } keyboard-types = { version = "0.6", optional = true } selectors = { path = "../selectors" } serde = { version = "1.0.27", optional = true } diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 9be41935f62..08e38428ba7 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -21,7 +21,7 @@ base64 = "0.10.1" brotli = "3" bytes = "1" content-security-policy = { version = "0.4.0", features = ["serde"] } -cookie_rs = { package = "cookie", version = "0.11" } +cookie_rs = { package = "cookie", version = "0.12" } crossbeam-channel = "0.4" data-url = "0.1.0" devtools_traits = { path = "../devtools_traits" } @@ -33,7 +33,7 @@ headers = "0.3" http = "0.2" hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp", "stream"] } hyper-openssl = "0.9.1" -hyper_serde = "0.12" +hyper_serde = "0.13" immeta = "0.4" ipc-channel = "0.14" lazy_static = "1" diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index db398c9b7ca..f35cbff8b69 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -14,12 +14,12 @@ doctest = false [dependencies] content-security-policy = { version = "0.4.0", features = ["serde"] } -cookie = "0.11" +cookie = "0.12" embedder_traits = { path = "../embedder_traits" } headers = "0.3" http = "0.2" hyper = "0.14" -hyper_serde = "0.12" +hyper_serde = "0.13" ipc-channel = "0.14" lazy_static = "1" log = "0.4" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 1f17fa15c43..9ceb7b85cf2 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -40,7 +40,7 @@ bluetooth_traits = { path = "../bluetooth_traits" } canvas_traits = { path = "../canvas_traits" } chrono = "0.4" content-security-policy = { version = "0.4.0", features = ["serde"] } -cookie = "0.11" +cookie = "0.12" crossbeam-channel = "0.4" cssparser = "0.29" data-url = "0.1.0" @@ -57,7 +57,7 @@ fxhash = "0.2" headers = "0.3" html5ever = "0.26" http = "0.2" -hyper_serde = "0.12" +hyper_serde = "0.13" image = "0.24" indexmap = { version = "1.0.2", features = ["std"] } ipc-channel = "0.14" diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index cd943871fc0..78c95010f42 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -14,7 +14,7 @@ path = "lib.rs" bitflags = "1.0" bluetooth_traits = { path = "../bluetooth_traits" } canvas_traits = { path = "../canvas_traits" } -cookie = "0.11" +cookie = "0.12" crossbeam-channel = "0.4" devtools_traits = { path = "../devtools_traits" } embedder_traits = { path = "../embedder_traits" } @@ -22,7 +22,7 @@ euclid = "0.20" gfx_traits = { path = "../gfx_traits" } headers = "0.3" http = "0.2" -hyper_serde = "0.12" +hyper_serde = "0.13" ipc-channel = "0.14" keyboard-types = "0.6" libc = "0.2" diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 7b128986c17..d7641f944a2 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] base64 = "0.10" compositing = { path = "../compositing" } -cookie = "0.11" +cookie = "0.12" crossbeam-channel = "0.4" euclid = "0.20" headers = "0.3" diff --git a/servo-tidy.toml b/servo-tidy.toml index d06824963be..7f57e2fde1d 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -34,7 +34,6 @@ packages = [ "cfg-if", "cloudabi", "cocoa", - "cookie", "crossbeam-channel", "crossbeam-utils", "deflate", From 1f272b7e881d15ab6c3cb99ff0a22d3fba5e22e4 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 02:16:21 -0400 Subject: [PATCH 20/25] fixup! Update arrayvec. --- components/style/properties/properties.mako.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index f4d303f9eb8..95d59df064d 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2592,8 +2592,11 @@ impl SourcePropertyDeclaration { /// Return type of SourcePropertyDeclaration::drain pub struct SourcePropertyDeclarationDrain<'a> { - declarations: ArrayVecDrain<'a, PropertyDeclaration, ${max(len(s.sub_properties) for s in data.shorthands_except_all()) \ - if data.shorthands_except_all() else 0}>, + declarations: ArrayVecDrain< + 'a, PropertyDeclaration, + ${max(len(s.sub_properties) for s in data.shorthands_except_all()) \ + if data.shorthands_except_all() else 0} + >, all_shorthand: AllShorthand, } From 5118ee7351d26bbc20b9198770ace4a5e1a554d7 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 02:20:43 -0400 Subject: [PATCH 21/25] Update clap. --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2951810cbe..a79cdd7cb09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] @@ -725,9 +725,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", From f8a44d0ad45703fb6e21fc5234fca9e6917a2a5f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 02:26:19 -0400 Subject: [PATCH 22/25] Remove env_logger duplicate. --- Cargo.lock | 35 +++++++++----------------- components/layout_2020/Cargo.toml | 2 +- ports/libsimpleservo/jniapi/Cargo.toml | 2 +- servo-tidy.toml | 1 - 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a79cdd7cb09..a2b2b6e8287 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,18 +89,18 @@ checksum = "80b9e34fcbf29c0563547cb2ecce9b49504597cad6166769b1e4efb45c6c2951" [[package]] name = "android_log-sys" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" [[package]] name = "android_logger" -version = "0.8.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd542dd180566fad88fd2729a53a62a734843c626638006a9d63ec0688484e" +checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66" dependencies = [ "android_log-sys", - "env_logger 0.7.1", + "env_logger", "lazy_static", "log", ] @@ -315,7 +315,7 @@ dependencies = [ "cexpr", "clang-sys", "clap", - "env_logger 0.8.2", + "env_logger", "lazy_static", "lazycell", "log", @@ -1613,16 +1613,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "log", - "regex", -] - [[package]] name = "env_logger" version = "0.8.2" @@ -3457,7 +3447,7 @@ dependencies = [ "devtools", "devtools_traits", "embedder_traits", - "env_logger 0.8.2", + "env_logger", "euclid", "gaol", "gfx", @@ -4925,14 +4915,13 @@ dependencies = [ [[package]] name = "quickcheck" -version = "0.9.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", - "rand 0.7.3", - "rand_core 0.5.1", + "rand 0.8.5", ] [[package]] @@ -5999,7 +5988,7 @@ version = "0.0.1" dependencies = [ "backtrace", "cbindgen", - "env_logger 0.8.2", + "env_logger", "keyboard-types", "lazy_static", "libc", diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml index 0a186fe47a2..dad13222760 100644 --- a/components/layout_2020/Cargo.toml +++ b/components/layout_2020/Cargo.toml @@ -47,4 +47,4 @@ webrender_api = { git = "https://github.com/servo/webrender" } [dev-dependencies] lazy_static = "1" -quickcheck = "0.9" +quickcheck = "1" diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml index 5019219baf0..c4be5a2334c 100644 --- a/ports/libsimpleservo/jniapi/Cargo.toml +++ b/ports/libsimpleservo/jniapi/Cargo.toml @@ -15,7 +15,7 @@ bench = false [dependencies] android_injected_glue = "0.2" -android_logger = "0.8" +android_logger = "0.10" gstreamer = "0.15" jni = "0.18.0" libc = "0.2" diff --git a/servo-tidy.toml b/servo-tidy.toml index 7f57e2fde1d..10ced931923 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -37,7 +37,6 @@ packages = [ "crossbeam-channel", "crossbeam-utils", "deflate", - "env_logger", "fixedbitset", "getrandom", "gleam", From f4271e9f3f0fd4c40131d90fa9c4fadc0bad0e1e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 23:51:57 -0400 Subject: [PATCH 23/25] Migrate to yeslogic's fontconfig bindings. --- Cargo.lock | 11 +---------- components/gfx/Cargo.toml | 2 +- components/gfx/platform/freetype/font_list.rs | 12 ++++++------ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a2b2b6e8287..be0c3edf385 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1740,15 +1740,6 @@ dependencies = [ "yeslogic-fontconfig-sys", ] -[[package]] -name = "fontconfig" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25320ad784a9578ada0b395dd7dcd2321109404bbb341ec27e64b01a1e49b47" -dependencies = [ - "yeslogic-fontconfig-sys", -] - [[package]] name = "fontsan" version = "0.4.0" @@ -2014,7 +2005,6 @@ dependencies = [ "dwrote", "euclid", "fnv", - "fontconfig", "fontsan", "freetype", "gfx_traits", @@ -2041,6 +2031,7 @@ dependencies = [ "webrender_api", "xi-unicode", "xml-rs", + "yeslogic-fontconfig-sys", ] [[package]] diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index d6242a6dd85..bf91edb8f45 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -52,7 +52,7 @@ freetype = "0.7" servo_allocator = { path = "../allocator" } [target.'cfg(target_os = "linux")'.dependencies] -fontconfig = "0.5" +fontconfig_sys = { package = "yeslogic-fontconfig-sys", version = "3" } [target.'cfg(target_os = "android")'.dependencies] xml-rs = "0.8" diff --git a/components/gfx/platform/freetype/font_list.rs b/components/gfx/platform/freetype/font_list.rs index 5491ca8f8fc..07a3888f203 100644 --- a/components/gfx/platform/freetype/font_list.rs +++ b/components/gfx/platform/freetype/font_list.rs @@ -4,14 +4,14 @@ use super::c_str_to_string; use crate::text::util::is_cjk; -use fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem}; -use fontconfig::fontconfig::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute}; -use fontconfig::fontconfig::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString}; -use fontconfig::fontconfig::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy}; -use fontconfig::fontconfig::{ +use fontconfig_sys::{FcChar8, FcResultMatch, FcSetSystem}; +use fontconfig_sys::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute}; +use fontconfig_sys::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString}; +use fontconfig_sys::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy}; +use fontconfig_sys::{ FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString, }; -use fontconfig::fontconfig::{FcObjectSetAdd, FcPatternGetInteger}; +use fontconfig_sys::{FcObjectSetAdd, FcPatternGetInteger}; use libc::{c_char, c_int}; use std::ffi::CString; use std::ptr; From f165e17ce2fb8795c99dbb998336b7fa54b68f5f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 2 Apr 2022 00:03:12 -0400 Subject: [PATCH 24/25] Limit CI jobs to particular branches. --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f453d10042..abf0aecb19f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,9 @@ jobs: name: Build (Windows) runs-on: windows-2019 steps: + - name: Branch check + if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-windows', github.ref) }} + run: exit 0 - uses: actions/checkout@v2 with: fetch-depth: 2 @@ -41,6 +44,9 @@ jobs: name: Build (Windows UWP x64) runs-on: windows-2019 steps: + - name: Branch check + if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-windows', github.ref) }} + run: exit 0 - uses: actions/checkout@v2 with: fetch-depth: 2 @@ -66,6 +72,9 @@ jobs: name: Build (Windows UWP arm64) runs-on: windows-2019 steps: + - name: Branch check + if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-windows', github.ref) }} + run: exit 0 - uses: actions/checkout@v2 with: fetch-depth: 2 @@ -89,6 +98,9 @@ jobs: name: Build (macOS) runs-on: macos-10.15 steps: + - name: Branch check + if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-mac', github.ref) }} + run: exit 0 - uses: actions/checkout@v2 with: fetch-depth: 2 @@ -181,6 +193,9 @@ jobs: name: Build (Linux) runs-on: ubuntu-20.04 steps: + - name: Branch check + if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-linux refs/heads/try-wpt', github.ref) }} + run: exit 0 - uses: actions/checkout@v2 with: fetch-depth: 2 @@ -214,6 +229,9 @@ jobs: matrix: chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20] steps: + - name: Branch check + if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-wpt', github.ref) }} + run: exit 0 - uses: actions/checkout@v2 with: fetch-depth: 2 From 4b0e2ce4859e6e91a5d163518d1db7331833c7b3 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 2 Apr 2022 15:10:47 -0400 Subject: [PATCH 25/25] Format. --- components/gfx/platform/freetype/font_list.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/gfx/platform/freetype/font_list.rs b/components/gfx/platform/freetype/font_list.rs index 07a3888f203..fded1d160d5 100644 --- a/components/gfx/platform/freetype/font_list.rs +++ b/components/gfx/platform/freetype/font_list.rs @@ -8,9 +8,7 @@ use fontconfig_sys::{FcChar8, FcResultMatch, FcSetSystem}; use fontconfig_sys::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute}; use fontconfig_sys::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString}; use fontconfig_sys::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy}; -use fontconfig_sys::{ - FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString, -}; +use fontconfig_sys::{FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString}; use fontconfig_sys::{FcObjectSetAdd, FcPatternGetInteger}; use libc::{c_char, c_int}; use std::ffi::CString;