Convert namespace-related structs to str

Author: dralley

benches/microbenches.rs

@@ -224,7 +224,7 @@ fn attributes(c: &mut Criterion) {
             let mut count = criterion::black_box(0);
             loop {
                 match r.read_event() {
-                    Ok(Event::Empty(e)) if e.name() == QName(b"player") => {
+                    Ok(Event::Empty(e)) if e.name() == QName("player") => {
                         for name in ["num", "status", "avg"] {
                             if let Some(_attr) = e.try_get_attribute(name).unwrap() {
                                 count += 1

examples/custom_entities.rs

@@ -41,7 +41,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 }
             }
             Ok(Event::Start(ref e)) => match e.name().as_ref() {
-                b"test" => {
+                "test" => {
                     let attributes = e
                         .attributes()
                         .map(|a| {

examples/nested_readers.rs

@@ -22,7 +22,7 @@ fn main() -> Result<(), quick_xml::Error> {
     loop {
         match reader.read_event_into(&mut buf)? {
             Event::Start(element) => match element.name().as_ref() {
-                b"w:tbl" => {
+                "w:tbl" => {
                     count += 1;
                     let mut stats = TableStat {
                         index: count,
@@ -35,20 +35,17 @@ fn main() -> Result<(), quick_xml::Error> {
                         skip_buf.clear();
                         match reader.read_event_into(&mut skip_buf)? {
                             Event::Start(element) => match element.name().as_ref() {
-                                b"w:tr" => {
+                                "w:tr" => {
                                     stats.rows.push(vec![]);
                                     row_index = stats.rows.len() - 1;
                                 }
-                                b"w:tc" => {
-                                    stats.rows[row_index].push(
-                                        String::from_utf8(element.name().as_ref().to_vec())
-                                            .unwrap(),
-                                    );
+                                "w:tc" => {
+                                    stats.rows[row_index].push(element.name().as_ref().to_owned());
                                 }
                                 _ => {}
                             },
                             Event::End(element) => {
-                                if element.name().as_ref() == b"w:tbl" {
+                                if element.name().as_ref() == "w:tbl" {
                                     found_tables.push(stats);
                                     break;
                                 }

examples/read_buffered.rs

@@ -17,9 +17,7 @@ fn main() -> Result<(), quick_xml::Error> {
     loop {
         match reader.read_event_into(&mut buf) {
             Ok(Event::Start(ref e)) => {
-                let name = e.name();
-                let name = reader.decoder().decode(name.as_ref())?;
-                println!("read start event {:?}", name.as_ref());
+                println!("read start event {:?}", e.name().as_ref());
                 count += 1;
             }
             Ok(Event::Eof) => break, // exits the loop when reaching end of file

examples/read_texts.rs

@@ -10,7 +10,7 @@ fn main() {
 
     loop {
         match reader.read_event() {
-            Ok(Event::Start(e)) if e.name().as_ref() == b"tag2" => {
+            Ok(Event::Start(e)) if e.name().as_ref() == "tag2" => {
                 // read_text_into for buffered readers not implemented
                 let txt = reader
                     .read_text(e.name())

src/errors.rs

@@ -2,7 +2,6 @@
 
 use crate::escape::EscapeError;
 use crate::events::attributes::AttrError;
-use crate::utils::write_byte_string;
 use std::fmt;
 use std::io::Error as IoError;
 use std::str::Utf8Error;
@@ -38,7 +37,7 @@ pub enum Error {
     /// Escape error
     EscapeError(EscapeError),
     /// Specified namespace prefix is unknown, cannot resolve namespace for it
-    UnknownPrefix(Vec<u8>),
+    UnknownPrefix(String),
 }
 
 impl From<IoError> for Error {
@@ -107,11 +106,7 @@ impl fmt::Display for Error {
             ),
             Error::InvalidAttr(e) => write!(f, "error while parsing attribute: {}", e),
             Error::EscapeError(e) => write!(f, "{}", e),
-            Error::UnknownPrefix(prefix) => {
-                f.write_str("Unknown namespace prefix '")?;
-                write_byte_string(f, prefix)?;
-                f.write_str("'")
-            }
+            Error::UnknownPrefix(prefix) => write!(f, "Unknown namespace prefix '{}'", prefix),
         }
     }
 }
@@ -161,15 +156,15 @@ pub mod serialize {
         /// Deserializer encounter a start tag with a specified name when it is
         /// not expecting. This happens when you try to deserialize a primitive
         /// value (numbers, strings, booleans) from an XML element.
-        UnexpectedStart(Vec<u8>),
+        UnexpectedStart(String),
         /// Deserializer encounter an end tag with a specified name when it is
         /// not expecting. Usually that should not be possible, because XML reader
         /// is not able to produce such stream of events that lead to this error.
         ///
         /// If you get this error this likely indicates and error in the `quick_xml`.
         /// Please open an issue at <https://github.com/tafia/quick-xml>, provide
         /// your Rust code and XML input.
-        UnexpectedEnd(Vec<u8>),
+        UnexpectedEnd(String),
         /// The [`Reader`] produced [`Event::Eof`] when it is not expecting,
         /// for example, after producing [`Event::Start`] but before corresponding
         /// [`Event::End`].
@@ -215,12 +210,12 @@ pub mod serialize {
                 DeError::KeyNotRead => write!(f, "Invalid `Deserialize` implementation: `MapAccess::next_value[_seed]` was called before `MapAccess::next_key[_seed]`"),
                 DeError::UnexpectedStart(e) => {
                     f.write_str("Unexpected `Event::Start(")?;
-                    write_byte_string(f, e)?;
+                    write_byte_string(f, e.as_bytes())?;
                     f.write_str(")`")
                 }
                 DeError::UnexpectedEnd(e) => {
                     f.write_str("Unexpected `Event::End(")?;
-                    write_byte_string(f, e)?;
+                    write_byte_string(f, e.as_bytes())?;
                     f.write_str(")`")
                 }
                 DeError::UnexpectedEof => write!(f, "Unexpected `Event::Eof`"),