From fee14e18678a37bfb31d5f2bb2ef9709ddf09979 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Sun, 5 Apr 2026 14:08:10 +0800 Subject: [PATCH] Bump deps: html5ever 0.36.1 -> 0.38.0 --- Cargo.lock | 40 ++++++++++++---------------------------- Cargo.toml | 6 +++--- src/ext/rcdom.rs | 8 ++++---- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bce3fda..614e7cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -824,16 +824,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - [[package]] name = "getrandom" version = "0.2.17" @@ -951,9 +941,9 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "html5ever" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6452c4751a24e1b99c3260d505eaeee76a050573e61f30ac2c924ddc7236f01e" +checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" dependencies = [ "log", "markup5ever", @@ -1332,17 +1322,11 @@ dependencies = [ "libc", ] -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - [[package]] name = "markup5ever" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3294c4d74d0742910f8c7b466f44dda9eb2d5742c1e430138df290a1e8451c" +checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" dependencies = [ "log", "tendril", @@ -1351,9 +1335,9 @@ dependencies = [ [[package]] name = "markup5ever_rcdom" -version = "0.36.0+unofficial" +version = "0.38.0+unofficial" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5fc8802e8797c0dfdd2ce5c21aa0aee21abbc7b3b18559100651b3352a7b63" +checksum = "333171ccdf66e915257740d44e38ea5b1b19ce7b45d33cc35cb6f118fbd981ff" dependencies = [ "html5ever", "markup5ever", @@ -2077,6 +2061,7 @@ dependencies = [ "parking_lot", "phf_shared", "precomputed-hash", + "serde", ] [[package]] @@ -2165,12 +2150,11 @@ dependencies = [ [[package]] name = "tendril" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24" dependencies = [ - "futf", - "mac", + "new_debug_unreachable", "utf-8", ] @@ -2672,9 +2656,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "xml5ever" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f57dd51b88a4b9f99f9b55b136abb86210629d61c48117ddb87f567e51e66be7" +checksum = "d3dc9559429edf0cd3f327cc0afd9d6b36fa8cec6d93107b7fbe64f806b5f2d9" dependencies = [ "log", "markup5ever", diff --git a/Cargo.toml b/Cargo.toml index 9527cca..045e9a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,8 +32,8 @@ lazy_static = "1.5.0" libflac-sys = { version = "0.3", optional = true } libtlg-rs = { version = "0.2", optional = true, features = ["encode"] } lz4 = { version = "1.28", optional = true } -markup5ever = { version = "0.36", optional = true } -markup5ever_rcdom = { version = "0.36", optional = true } +markup5ever = { version = "0.38", optional = true } +markup5ever_rcdom = { version = "0.38", optional = true } memchr = { version = "2.7", optional = true } mozjpeg = { version = "0.10", optional = true } msg_tool_macro = { version = "0.3.0" } @@ -54,7 +54,7 @@ unicode-segmentation = "1.12" url = { version = "2.5", optional = true } utf16string = "0.2" webp = { version = "0.3", default-features = false, optional = true } -xml5ever = { version = "0.36", optional = true } +xml5ever = { version = "0.38", optional = true } xp3 = { version = "0.3", optional = true} zopfli = { version = "0.8", optional = true } zstd = { version = "0.13", optional = true } diff --git a/src/ext/rcdom.rs b/src/ext/rcdom.rs index 86d5ee8..89916e2 100644 --- a/src/ext/rcdom.rs +++ b/src/ext/rcdom.rs @@ -60,7 +60,7 @@ pub trait RcNodeExt { /// Extensions for [NodeData] pub trait NodeDataExt { /// clones the node data. - fn clone(&self) -> Result; + fn clone2(&self) -> Result; /// Sets the content of a processing instruction. /// /// Returns `Ok(())` if the node is not a processing instruction. @@ -151,7 +151,7 @@ impl RcNodeExt for Rc { } fn deep_clone(&self, parent: Option>) -> Result> { - let data = self.data.clone()?; + let data = self.data.clone2()?; let node = Node { data, children: RefCell::new(Vec::new()), @@ -170,7 +170,7 @@ impl RcNodeExt for Rc { parent: Option>, modify: F, ) -> Result> { - let mut data = self.data.clone()?; + let mut data = self.data.clone2()?; modify(&mut data)?; let node = Node { data, @@ -203,7 +203,7 @@ impl RcNodeExt for Rc { } impl NodeDataExt for NodeData { - fn clone(&self) -> Result { + fn clone2(&self) -> Result { Ok(match self { NodeData::Document => NodeData::Document, NodeData::Comment { contents } => NodeData::Comment {