From 70d635b0fbfab17fba915356887a84d2a98c7068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Fri, 18 Apr 2025 17:19:56 +0200 Subject: [PATCH] Bump rxml to 0.13.1 rxml 0.13.0 changed the quoting style to make it consistent, so we have to patch up all affected places where we match exact strings. --- minidom/CHANGELOG.md | 1 + minidom/Cargo.toml | 2 +- minidom/src/tests.rs | 4 ++-- parsers/src/data_forms_validate.rs | 6 +++--- tokio-xmpp/Cargo.toml | 2 +- tokio-xmpp/ChangeLog | 1 + xso/Cargo.toml | 2 +- xso/ChangeLog | 1 + 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/minidom/CHANGELOG.md b/minidom/CHANGELOG.md index d3ce5e7e9a86d95aa641b6d443c21279da33533b..95cc39088b7ac65fa69f9cddaa44658c15a94b16 100644 --- a/minidom/CHANGELOG.md +++ b/minidom/CHANGELOG.md @@ -1,6 +1,7 @@ Version NEXT: * Changes * Almost make the whole crate `no_std`, only `std::io` is still remaining. + * Update rxml dependency to 0.13. Version 0.16, released 2024-07-23: * Breaking diff --git a/minidom/Cargo.toml b/minidom/Cargo.toml index 4fecb4e8e65a8b34c5778834a695146a599c3eae..9191e82633b83365d4a731d5d6f1ec6ec0b3b59c 100644 --- a/minidom/Cargo.toml +++ b/minidom/Cargo.toml @@ -21,7 +21,7 @@ edition = "2021" gitlab = { repository = "xmpp-rs/xmpp-rs" } [dependencies] -rxml = { version = "0.12.0", default-features = false, features = ["compact_str"] } +rxml = { version = "0.13.1", default-features = false, features = ["compact_str"] } [features] default = [ "std" ] diff --git a/minidom/src/tests.rs b/minidom/src/tests.rs index 476291cbfca2cd731dcaee2d061547ac8b08ba66..6f82a2c532be58b17067e3b76218a45698847522 100644 --- a/minidom/src/tests.rs +++ b/minidom/src/tests.rs @@ -16,7 +16,7 @@ use alloc::format; use alloc::string::String; use alloc::vec::Vec; -const TEST_STRING: &'static [u8] = br#"meownya"#; +const TEST_STRING: &'static [u8] = br#"meownya"#; fn build_test_tree() -> Element { let mut root = Element::builder("root", "root_ns") @@ -251,7 +251,7 @@ fn writer_escapes_attributes() { } assert_eq!( String::from_utf8(writer).unwrap(), - r#""# + r#""# ); } diff --git a/parsers/src/data_forms_validate.rs b/parsers/src/data_forms_validate.rs index 57d8ce212e3fe462db76b4b2751ca2f513232ab9..ddfb5782483545f8c2e1f0c2bc38489f5739fa5b 100644 --- a/parsers/src/data_forms_validate.rs +++ b/parsers/src/data_forms_validate.rs @@ -398,7 +398,7 @@ mod tests { }, ), ( - r#""#, + r#""#, Validate { datatype: Some(Datatype::String), method: Some(Method::Basic), @@ -409,7 +409,7 @@ mod tests { }, ), ( - r#"([0-9]{3})-([0-9]{2})-([0-9]{4})"#, + r#"([0-9]{3})-([0-9]{2})-([0-9]{4})"#, Validate { datatype: Some(Datatype::String), method: Some(Method::Regex( @@ -419,7 +419,7 @@ mod tests { }, ), ( - r#""#, + r#""#, Validate { datatype: Some(Datatype::DateTime), method: Some(Method::Range { diff --git a/tokio-xmpp/Cargo.toml b/tokio-xmpp/Cargo.toml index e7971ddddeb20d2ace08ecc26b34479b5fe2f977..e8d79d67a6a60b0a02146f46d493c535a2eeda5b 100644 --- a/tokio-xmpp/Cargo.toml +++ b/tokio-xmpp/Cargo.toml @@ -19,7 +19,7 @@ tokio = { version = "1", features = ["net", "rt", "rt-multi-thread", "macros"] } tokio-stream = { version = "0.1", features = ["sync"] } webpki-roots = { version = "0.26", optional = true } rustls-native-certs = { version = "0.7", optional = true } -rxml = { version = "0.12.0", features = ["compact_str"] } +rxml = { version = "0.13.1", features = ["compact_str"] } rand = "0.8" syntect = { version = "5", optional = true } pin-project-lite = { version = "0.2" } diff --git a/tokio-xmpp/ChangeLog b/tokio-xmpp/ChangeLog index 5087285b3c5b42df60d1951d4e078933d8a214fa..e8664729f55f0ed3b9ebaae8d851ecea21a59a36 100644 --- a/tokio-xmpp/ChangeLog +++ b/tokio-xmpp/ChangeLog @@ -34,6 +34,7 @@ XXXX-YY-ZZ RELEASER delegate it to a hardware implementations if available. This depends on the `tls-rust-ktls` feature. (!458, !490) - Building with insecure-tcp and no other feature got fixed. + - Update rxml dependency to 0.13. Version 4.0.0: 2024-07-26 Maxime “pep” Buquet diff --git a/xso/Cargo.toml b/xso/Cargo.toml index a79b392666141be0d3186619d0f2f041cc7af258..c678e72b744f04635eace918ad70ce7227aa8920 100644 --- a/xso/Cargo.toml +++ b/xso/Cargo.toml @@ -11,7 +11,7 @@ license = "MPL-2.0" [dependencies] bytes = { version = "1" } -rxml = { version = "0.12.0", default-features = false } +rxml = { version = "0.13.1", default-features = false } minidom = { version = "0.16", path = "../minidom" } xso_proc = { version = "0.1", path = "../xso-proc", optional = true } diff --git a/xso/ChangeLog b/xso/ChangeLog index 31cad1454ffc7cf4996f2123c5bd042603351bcf..f00527a662f386444d2c3609f7d0dd369a4aed61 100644 --- a/xso/ChangeLog +++ b/xso/ChangeLog @@ -49,6 +49,7 @@ Version NEXT: - Fixed bug where putting an attribute field below any non-attribute field in a struct definition would cause a compile-time error when deriving `AsXml`. + - Update rxml dependency to 0.13. Version 0.1.2: 2024-07-26 Jonas Schäfer