Bump rxml to 0.13.1

Jonas Schäfer created 9 months ago

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.

Change summary

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(-)

Detailed changes

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

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" ]

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#"<root xmlns='root_ns' a="b" xml:lang="en">meow<child c="d"/><child xmlns='child_ns' d="e" xml:lang="fr"/>nya</root>"#;
+const TEST_STRING: &'static [u8] = br#"<root xmlns='root_ns' a='b' xml:lang='en'>meow<child c='d'/><child xmlns='child_ns' d='e' xml:lang='fr'/>nya</root>"#;
 
 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#"<root xmlns='ns1' a="&#34;Air&#34; quotes"/>"#
+        r#"<root xmlns='ns1' a='&#34;Air&#34; quotes'/>"#
     );
 }
 

parsers/src/data_forms_validate.rs

@@ -398,7 +398,7 @@ mod tests {
                 },
             ),
             (
-                r#"<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype="xs:string"><basic/><list-range max="3" min="1"/></validate>"#,
+                r#"<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:string'><basic/><list-range max='3' min='1'/></validate>"#,
                 Validate {
                     datatype: Some(Datatype::String),
                     method: Some(Method::Basic),
@@ -409,7 +409,7 @@ mod tests {
                 },
             ),
             (
-                r#"<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype="xs:string"><regex>([0-9]{3})-([0-9]{2})-([0-9]{4})</regex></validate>"#,
+                r#"<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:string'><regex>([0-9]{3})-([0-9]{2})-([0-9]{4})</regex></validate>"#,
                 Validate {
                     datatype: Some(Datatype::String),
                     method: Some(Method::Regex(
@@ -419,7 +419,7 @@ mod tests {
                 },
             ),
             (
-                r#"<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype="xs:dateTime"><range max="2003-10-24T23:59:59-07:00" min="2003-10-05T00:00:00-07:00"/></validate>"#,
+                r#"<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:dateTime'><range max='2003-10-24T23:59:59-07:00' min='2003-10-05T00:00:00-07:00'/></validate>"#,
                 Validate {
                     datatype: Some(Datatype::DateTime),
                     method: Some(Method::Range {

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" }

tokio-xmpp/ChangeLog

@@ -34,6 +34,7 @@ XXXX-YY-ZZ RELEASER <[e-mail]>
         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 <[e-mail]>

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 }
 

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 <[e-mail]>