From 4804bab118fbbaf666b23e34862f28a33c88926b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Fri, 15 Sep 2023 20:58:16 -0700 Subject: [PATCH] Update raqote to dedupe arrayvec and lyon_geom (#30376) * Update raqote to dedupe arrayvec and lyon_geom * Mark wpt test canvas/element/manual/transformations/transform_a.html as passing --- Cargo.lock | 47 ++++++------------- servo-tidy.toml | 2 - .../transformations/transform_a.html.ini | 2 - .../transformations/transform_a.html.ini | 2 - 4 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/manual/transformations/transform_a.html.ini delete mode 100644 tests/wpt/meta/html/canvas/element/manual/transformations/transform_a.html.ini diff --git a/Cargo.lock b/Cargo.lock index 9893768899b..4a450a607bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,12 +204,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -645,7 +639,7 @@ dependencies = [ "half", "ipc-channel", "log", - "lyon_geom 1.0.4", + "lyon_geom", "num-traits", "pathfinder_geometry", "pixels", @@ -1214,7 +1208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" dependencies = [ "bitflags 2.4.0", - "libloading 0.8.0", + "libloading 0.7.4", "winapi", ] @@ -1406,7 +1400,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading 0.7.4", ] [[package]] @@ -3388,24 +3382,13 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "lyon_geom" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d89ccbdafd83d259403e22061be27bccc3254bba65cdc5303250c4227c8c8e" -dependencies = [ - "arrayvec 0.5.2", - "euclid", - "num-traits", -] - [[package]] name = "lyon_geom" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "euclid", "num-traits", ] @@ -4613,13 +4596,13 @@ checksum = "a871f1e45a3a3f0c73fb60343c811238bb5143a81642e27c2ac7aac27ff01a63" [[package]] name = "raqote" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b6cb89f8be6a645e5834f3ad44a7960d12343d97b5b7fb07cb0365ae36aa2d" +checksum = "48bbdc1825eea658de94084241b12bffb214f0bd3bac9a442a405a384e2a042b" dependencies = [ "euclid", "font-kit", - "lyon_geom 0.17.7", + "lyon_geom", "pathfinder_geometry", "png", "sw-composite", @@ -4864,7 +4847,7 @@ version = "0.0.1" dependencies = [ "accountable-refcell", "app_units", - "arrayvec 0.7.4", + "arrayvec", "atomic_refcell", "backtrace", "base64 0.21.4", @@ -5810,7 +5793,7 @@ name = "style" version = "0.0.1" dependencies = [ "app_units", - "arrayvec 0.7.4", + "arrayvec", "atomic_refcell", "bindgen 0.62.0", "bitflags 1.3.2", @@ -6138,7 +6121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", "cfg-if 1.0.0", "png", @@ -6400,7 +6383,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "794a32261a1f5eb6a4462c81b59cec87b5c27d5deea7dd1ac8fc781c41d226db" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", ] [[package]] @@ -6803,7 +6786,7 @@ dependencies = [ name = "webgpu" version = "0.0.1" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "euclid", "ipc-channel", "log", @@ -6965,7 +6948,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bit-vec", "bitflags 2.4.0", "codespan-reporting", @@ -6990,7 +6973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec", "ash", "bit-set", "bitflags 2.4.0", @@ -7002,7 +6985,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.0", + "libloading 0.7.4", "log", "metal 0.26.0", "naga", diff --git a/servo-tidy.toml b/servo-tidy.toml index 4eab06b9479..eb858a59400 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -21,7 +21,6 @@ rand = [ # Ignored packages with duplicated versions packages = [ "ahash", - "arrayvec", "base64", "bitflags", "cfg-if", @@ -32,7 +31,6 @@ packages = [ "gl_generator", "itoa", "libloading", - "lyon_geom", "mio", "nix", "num-rational", diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/transformations/transform_a.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/transformations/transform_a.html.ini deleted file mode 100644 index 3196a3239fa..00000000000 --- a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/transformations/transform_a.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[transform_a.html] - expected: FAIL diff --git a/tests/wpt/meta/html/canvas/element/manual/transformations/transform_a.html.ini b/tests/wpt/meta/html/canvas/element/manual/transformations/transform_a.html.ini deleted file mode 100644 index 3196a3239fa..00000000000 --- a/tests/wpt/meta/html/canvas/element/manual/transformations/transform_a.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[transform_a.html] - expected: FAIL