From cdc6706e9902f8f40ad5ecc6778347cf5dc10f57 Mon Sep 17 00:00:00 2001 From: Brandon Schneider Date: Wed, 20 May 2026 23:07:32 -0500 Subject: [PATCH] fix(servo-fetch): align dom query with smoothie --- .../agents/claw/rust/Cargo.lock | 12 +- 4-Infrastructure/servo-fetch/Cargo.lock | 104 +++--------------- 4-Infrastructure/servo-fetch/Cargo.toml | 2 +- 3 files changed, 23 insertions(+), 95 deletions(-) diff --git a/1-Distributed-Systems/agents/claw/rust/Cargo.lock b/1-Distributed-Systems/agents/claw/rust/Cargo.lock index 98426740..795dedd4 100644 --- a/1-Distributed-Systems/agents/claw/rust/Cargo.lock +++ b/1-Distributed-Systems/agents/claw/rust/Cargo.lock @@ -126,6 +126,12 @@ dependencies = [ "tools", ] +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "convert_case" version = "0.10.0" @@ -135,12 +141,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "const-oid" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" - [[package]] name = "cpufeatures" version = "0.3.0" diff --git a/4-Infrastructure/servo-fetch/Cargo.lock b/4-Infrastructure/servo-fetch/Cargo.lock index 57d82de4..4b6f3648 100644 --- a/4-Infrastructure/servo-fetch/Cargo.lock +++ b/4-Infrastructure/servo-fetch/Cargo.lock @@ -1258,7 +1258,7 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2" dependencies = [ - "cssparser-macros 0.6.1", + "cssparser-macros", "dtoa-short", "itoa", "phf", @@ -1266,19 +1266,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "cssparser" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98" -dependencies = [ - "cssparser-macros 0.7.0", - "dtoa-short", - "itoa", - "phf", - "smallvec", -] - [[package]] name = "cssparser-macros" version = "0.6.1" @@ -1289,16 +1276,6 @@ dependencies = [ "syn", ] -[[package]] -name = "cssparser-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a2a99df6e410a8ff4245aa2006499ea662245f967cc7c0a38c83ef8eb44dbf" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "ctr" version = "0.9.2" @@ -1558,21 +1535,6 @@ dependencies = [ "litrs", ] -[[package]] -name = "dom_query" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e4c03f2421dab1870544d171d3db22bdab0da4015995ff0b2f23125bbda9fb" -dependencies = [ - "bit-set", - "cssparser 0.36.0", - "foldhash 0.2.0", - "html5ever 0.38.0", - "precomputed-hash", - "selectors", - "tendril", -] - [[package]] name = "dom_query" version = "0.27.0" @@ -1585,22 +1547,7 @@ dependencies = [ "html5ever 0.38.0", "nom 8.0.0", "precomputed-hash", - "selectors 0.36.1", - "tendril", -] - -[[package]] -name = "dom_query" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc" -dependencies = [ - "bit-set", - "cssparser 0.37.0", - "foldhash 0.2.0", - "html5ever 0.39.0", - "precomputed-hash", - "selectors 0.38.0", + "selectors", "tendril", ] @@ -1610,7 +1557,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f21cad308997c8c518aaee15c8b38bb04dc699bbcf30da4176443c9ef40c1bb5" dependencies = [ - "dom_query 0.27.0", + "dom_query", "flagset", "foldhash 0.2.0", "gjson", @@ -5967,7 +5914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c" dependencies = [ "bitflags 2.11.1", - "cssparser 0.36.0", + "cssparser", "derive_more", "log", "new_debug_unreachable", @@ -5981,25 +5928,6 @@ dependencies = [ "to_shmem_derive", ] -[[package]] -name = "selectors" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d" -dependencies = [ - "bitflags 2.11.1", - "cssparser 0.37.0", - "derive_more", - "log", - "new_debug_unreachable", - "phf", - "phf_codegen", - "precomputed-hash", - "rustc-hash 2.1.2", - "servo_arc", - "smallvec", -] - [[package]] name = "semver" version = "1.0.28" @@ -6495,7 +6423,7 @@ dependencies = [ "axum", "base64 0.22.1", "clap", - "dom_query 0.28.0", + "dom_query", "dom_smoothie", "dpi", "euclid 0.22.14", @@ -6661,7 +6589,7 @@ dependencies = [ "parking_lot", "rayon", "rustc-hash 2.1.2", - "selectors 0.36.1", + "selectors", "servo-base", "servo-config", "servo-embedder-traits", @@ -6708,7 +6636,7 @@ dependencies = [ "malloc_size_of_derive", "parking_lot", "rustc-hash 2.1.2", - "selectors 0.36.1", + "selectors", "serde", "servo-background-hang-monitor-api", "servo-base", @@ -7180,7 +7108,7 @@ dependencies = [ "content-security-policy", "cookie 0.18.1", "crossbeam-channel", - "cssparser 0.36.0", + "cssparser", "ctr", "data-url", "der", @@ -7229,7 +7157,7 @@ dependencies = [ "rsa", "rustc-hash 2.1.2", "sec1", - "selectors 0.36.1", + "selectors", "serde", "serde_json", "servo-background-hang-monitor-api", @@ -7871,7 +7799,7 @@ dependencies = [ "atomic_refcell", "bitflags 2.11.1", "byteorder", - "cssparser 0.36.0", + "cssparser", "derive_more", "encoding_rs", "euclid 0.22.14", @@ -7892,7 +7820,7 @@ dependencies = [ "rayon", "rayon-core", "rustc-hash 2.1.2", - "selectors 0.36.1", + "selectors", "serde", "servo_arc", "smallbitvec", @@ -7957,9 +7885,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8cd4ec615ff7bbc849d1d7d95891c39db20dfd1cb79eb8ba29c54107a4101a3" dependencies = [ "app_units", - "cssparser 0.36.0", + "cssparser", "euclid 0.22.14", - "selectors 0.36.1", + "selectors", "servo_arc", "smallbitvec", "smallvec", @@ -7982,10 +7910,10 @@ checksum = "30cc7f5c9b43201f0d5c81ca190ccbf29382cff3af4cc926c9cd5e53beb6c9e5" dependencies = [ "app_units", "bitflags 2.11.1", - "cssparser 0.36.0", + "cssparser", "euclid 0.22.14", "malloc_size_of_derive", - "selectors 0.36.1", + "selectors", "serde", "servo_arc", "stylo_atoms", @@ -8321,7 +8249,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab187810ca1e6aaa4c97a06492aac9ade2ffae6a301fd2aac103656f5a69edb" dependencies = [ - "cssparser 0.36.0", + "cssparser", "servo_arc", "smallbitvec", "smallvec", diff --git a/4-Infrastructure/servo-fetch/Cargo.toml b/4-Infrastructure/servo-fetch/Cargo.toml index 0323286e..6055a8a9 100644 --- a/4-Infrastructure/servo-fetch/Cargo.toml +++ b/4-Infrastructure/servo-fetch/Cargo.toml @@ -19,7 +19,7 @@ path = "src/main.rs" [dependencies] servo = { version = "0.1.0", default-features = false, features = ["baked-in-resources", "js_jit"] } dom_smoothie = "0.17" -dom_query = "0.28" +dom_query = "0.27" clap = { version = "4", features = ["derive"] } anyhow = "1" dpi = "0.1"