Update quick-xml to 0.38

Author: andy128k

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Enables the parsing of elements defined in another namespace in Person constructs [`#91`](https://github.com/rust-syndication/atom/pull/91)
+- Update `quick-xml` to `0.38` [`#92`](https://github.com/rust-syndication/atom/pull/92)
 
 ## 0.12.7 - 2025-02-16
 

Cargo.toml

@@ -13,7 +13,7 @@ categories = ["parser-implementations"]
 
 [dependencies]
 diligent-date-parser = "0.1.3"
-quick-xml = { version = "0.37", features = ["encoding"] }
+quick-xml = { version = "0.38", features = ["encoding"] }
 chrono = { version = "0.4", default-features = false, features = ["alloc"] }
 derive_builder = { version = "0.20", optional = true }
 never = { version = "0.1", optional = true }

src/extension/util.rs

@@ -1,9 +1,11 @@
 use std::collections::BTreeMap;
 use std::io::BufRead;
 
-use quick_xml::events::attributes::Attributes;
-use quick_xml::events::Event;
-use quick_xml::Reader;
+use quick_xml::{
+    escape::resolve_predefined_entity,
+    events::{attributes::Attributes, Event},
+    Reader,
+};
 
 use crate::error::{Error, XmlError};
 use crate::extension::{Extension, ExtensionMap};
@@ -87,7 +89,19 @@ fn parse_extension_element<R: BufRead>(
                 text.push_str(decode(&element, reader)?.as_ref());
             }
             Event::Text(element) => {
-                text.push_str(element.unescape().map_err(XmlError::new)?.as_ref());
+                text.push_str(element.decode().map_err(XmlError::new)?.as_ref());
+            }
+            Event::GeneralRef(gref) => {
+                let entity = gref.decode().map_err(XmlError::new)?;
+                if let Some(resolved_entity) = resolve_predefined_entity(&entity) {
+                    text.push_str(resolved_entity);
+                } else if let Some(ch) = gref.resolve_char_ref().map_err(XmlError::new)? {
+                    text.push(ch);
+                } else {
+                    text.push('&');
+                    text.push_str(&entity);
+                    text.push(';');
+                }
             }
             Event::End(element) => {
                 extension.name = decode(element.name().as_ref(), reader)?.into();

src/util.rs

@@ -1,5 +1,5 @@
 use quick_xml::{
-    escape::escape,
+    escape::{escape, resolve_predefined_entity},
     events::{attributes::Attribute, Event},
     name::QName,
     Reader,
@@ -86,11 +86,23 @@ pub fn atom_text<B: BufRead>(reader: &mut Reader<B>) -> Result<Option<String>, E
                 result.push_str(decode(&text, reader)?.as_ref());
             }
             Event::Text(text) => {
-                let decoded = text.unescape().map_err(XmlError::new)?;
+                let decoded = text.decode().map_err(XmlError::new)?;
                 result.push_str(&decoded);
             }
+            Event::GeneralRef(gref) => {
+                let entity = gref.decode().map_err(XmlError::new)?;
+                if let Some(resolved_entity) = resolve_predefined_entity(&entity) {
+                    result.push_str(resolved_entity);
+                } else if let Some(ch) = gref.resolve_char_ref().map_err(XmlError::new)? {
+                    result.push(ch);
+                } else {
+                    result.push('&');
+                    result.push_str(&entity);
+                    result.push(';');
+                }
+            }
             Event::Comment(text) => {
-                let decoded = text.unescape().map_err(XmlError::new)?;
+                let decoded = text.decode().map_err(XmlError::new)?;
                 result.push_str("<!--");
                 result.push_str(&decoded);
                 result.push_str("-->");
@@ -145,11 +157,17 @@ pub fn atom_xhtml<B: BufRead>(reader: &mut Reader<B>) -> Result<Option<String>,
                 result.push_str(escape(decode(&text, reader)?.as_ref()).as_ref());
             }
             Event::Text(text) => {
-                let decoded = text.unescape().map_err(XmlError::new)?;
+                let decoded = text.decode().map_err(XmlError::new)?;
                 result.push_str(escape(decoded.as_ref()).as_ref());
             }
+            Event::GeneralRef(gref) => {
+                let entity = gref.decode().map_err(XmlError::new)?;
+                result.push('&');
+                result.push_str(&entity);
+                result.push(';');
+            }
             Event::Comment(text) => {
-                let decoded = text.unescape().map_err(XmlError::new)?;
+                let decoded = text.decode().map_err(XmlError::new)?;
                 result.push_str("<!--");
                 result.push_str(&decoded);
                 result.push_str("-->");