Use quick-xml 0.26.0

ebarnard · Nov 20, 2022 · 06ac5b2 · 06ac5b2 · gsmstudy · Nov 21, 2022
1 parent fd1fc26
commit 06ac5b2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ base64 = "0.13.0"
 time = { version = "0.3.3", features = ["parsing", "formatting"] }
 indexmap = "1.0.2"
 line-wrap = "0.1.1"
-quick_xml = { package = "quick-xml", version = "0.22.0" }
+quick_xml = { package = "quick-xml", version = "0.26.0" }
 serde = { version = "1.0.2", optional = true }
 
 [dev-dependencies]

diff --git a/src/stream/xml_reader.rs b/src/stream/xml_reader.rs
@@ -53,7 +53,7 @@ impl From<XmlReaderError> for ErrorKind {
             }
             XmlReaderError::Io(err) => ErrorKind::Io(err),
             XmlReaderError::UnexpectedEof(_) => ErrorKind::UnexpectedEof,
-            XmlReaderError::Utf8(_) => ErrorKind::InvalidXmlUtf8,
+            XmlReaderError::NonDecodable(_) => ErrorKind::InvalidXmlUtf8,
             _ => ErrorKind::InvalidXmlSyntax,
         }
     }
@@ -91,7 +91,7 @@ impl<R: Read> ReaderState<R> {
     }
 
     fn read_xml_event<'buf>(&mut self, buffer: &'buf mut Vec<u8>) -> Result<XmlEvent<'buf>, Error> {
-        let event = self.0.read_event(buffer);
+        let event = self.0.read_event_into(buffer);
         let pos = self.xml_reader_pos();
         event.map_err(|err| ErrorKind::from(err).with_position(pos))
     }
@@ -100,10 +100,10 @@ impl<R: Read> ReaderState<R> {
         loop {
             match self.read_xml_event(buffer)? {
                 XmlEvent::Text(text) => {
-                    let unespcaped = text
-                        .unescaped()
+                    let unescaped = text
+                        .unescape()
                         .map_err(|err| self.with_pos(ErrorKind::from(err)))?;
-                    return String::from_utf8(unespcaped.to_vec())
+                    return String::from_utf8(unescaped.as_ref().into())
                         .map_err(|_| self.with_pos(ErrorKind::InvalidUtf8String));
                 }
                 XmlEvent::End(_) => {
@@ -127,7 +127,7 @@ impl<R: Read> ReaderState<R> {
         loop {
             match self.read_xml_event(buffer)? {
                 XmlEvent::Start(name) => {
-                    match name.local_name() {
+                    match name.local_name().as_ref() {
                         b"plist" => {}
                         b"array" => return Ok(Some(Event::StartArray(None))),
                         b"dict" => return Ok(Some(Event::StartDictionary(None))),
@@ -172,7 +172,7 @@ impl<R: Read> ReaderState<R> {
                         _ => return Err(self.with_pos(ErrorKind::UnknownXmlElement)),
                     }
                 }
-                XmlEvent::End(name) => match name.local_name() {
+                XmlEvent::End(name) => match name.local_name().as_ref() {
                     b"array" | b"dict" => return Ok(Some(Event::EndCollection)),
                     _ => (),
                 },

diff --git a/src/stream/xml_writer.rs b/src/stream/xml_writer.rs
@@ -73,19 +73,19 @@ impl<W: Write> XmlWriter<W> {
 
     fn start_element(&mut self, name: &str) -> Result<(), Error> {
         self.xml_writer
-            .write_event(XmlEvent::Start(BytesStart::borrowed_name(name.as_bytes())))?;
+            .write_event(XmlEvent::Start(BytesStart::new(name)))?;
         Ok(())
     }
 
     fn end_element(&mut self, name: &str) -> Result<(), Error> {
         self.xml_writer
-            .write_event(XmlEvent::End(BytesEnd::borrowed(name.as_bytes())))?;
+            .write_event(XmlEvent::End(BytesEnd::new(name)))?;
         Ok(())
     }
 
     fn write_value(&mut self, value: &str) -> Result<(), Error> {
         self.xml_writer
-            .write_event(XmlEvent::Text(BytesText::from_plain_str(value)))?;
+            .write_event(XmlEvent::Text(BytesText::new(value)))?;
         Ok(())
     }
 
@@ -188,13 +188,13 @@ impl<W: Write> Writer for XmlWriter<W> {
             match this.pending_collection.take() {
                 Some(PendingCollection::Array) => {
                     this.xml_writer
-                        .write_event(XmlEvent::Empty(BytesStart::borrowed_name(b"array")))?;
+                        .write_event(XmlEvent::Empty(BytesStart::new("array")))?;
                     this.expecting_key = this.stack.last() == Some(&Element::Dictionary);
                     return Ok(());
                 }
                 Some(PendingCollection::Dictionary) => {
                     this.xml_writer
-                        .write_event(XmlEvent::Empty(BytesStart::borrowed_name(b"dict")))?;
+                        .write_event(XmlEvent::Empty(BytesStart::new("dict")))?;
                     this.expecting_key = this.stack.last() == Some(&Element::Dictionary);
                     return Ok(());
                 }
@@ -222,10 +222,10 @@ impl<W: Write> Writer for XmlWriter<W> {
 
     fn write_boolean(&mut self, value: bool) -> Result<(), Error> {
         self.write_value_event(EventKind::Boolean, |this| {
-            let value = if value { "true" } else { "false" }.as_bytes();
+            let value = if value { "true" } else { "false" };
             Ok(this
                 .xml_writer
-                .write_event(XmlEvent::Empty(BytesStart::borrowed_name(value)))?)
+                .write_event(XmlEvent::Empty(BytesStart::new(value)))?)
         })
     }