xml: Some restructuring

crates/xml/src/lib.rs

@@ -1,11 +1,10 @@
-use quick_xml::events::{BytesStart, Event};
-use quick_xml::name::{Namespace, QName};
+use quick_xml::name::Namespace;
 use std::collections::HashMap;
-use std::io::BufRead;
 
 pub mod de;
 mod error;
 pub mod se;
+mod unparsed;
 mod value;
 
 pub use de::XmlDeserialize;
@@ -13,94 +12,10 @@ pub use de::XmlDocument;
 pub use error::XmlError;
 pub use se::XmlSerialize;
 pub use se::XmlSerializeRoot;
+pub use unparsed::Unparsed;
 pub use value::{ParseValueError, ValueDeserialize, ValueSerialize};
 pub use xml_derive::XmlRootTag;
 
-impl XmlDeserialize for () {
-    fn deserialize<R: BufRead>(
-        reader: &mut quick_xml::NsReader<R>,
-        start: &BytesStart,
-        empty: bool,
-    ) -> Result<Self, XmlError> {
-        if empty {
-            return Ok(());
-        }
-        let mut buf = Vec::new();
-        loop {
-            match reader.read_event_into(&mut buf)? {
-                Event::End(e) if e.name() == start.name() => return Ok(()),
-                Event::Eof => return Err(XmlError::Eof),
-                _ => {}
-            };
-        }
-    }
-}
-
-impl XmlSerialize for () {
-    fn serialize<W: std::io::Write>(
-        &self,
-        ns: Option<Namespace>,
-        tag: Option<&[u8]>,
-        namespaces: &HashMap<Namespace, &[u8]>,
-        writer: &mut quick_xml::Writer<W>,
-    ) -> std::io::Result<()> {
-        let prefix = ns
-            .map(|ns| namespaces.get(&ns))
-            .unwrap_or(None)
-            .map(|prefix| {
-                if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
-                } else {
-                    Vec::new()
-                }
-            });
-        let has_prefix = prefix.is_some();
-        let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname.as_ref().map(|tagname| QName(tagname));
-        if let Some(qname) = &qname {
-            let mut bytes_start = BytesStart::from(qname.to_owned());
-            if !has_prefix {
-                if let Some(ns) = &ns {
-                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                }
-            }
-            writer.write_event(Event::Empty(bytes_start))?;
-        }
-        Ok(())
-    }
-
-    #[allow(refining_impl_trait)]
-    fn attributes<'a>(&self) -> Option<Vec<quick_xml::events::attributes::Attribute<'a>>> {
-        None
-    }
-}
-
-// TODO: actually implement
-#[derive(Debug, Clone, PartialEq)]
-pub struct Unparsed(BytesStart<'static>);
-
-impl Unparsed {
-    pub fn tag_name(&self) -> String {
-        // TODO: respect namespace?
-        String::from_utf8_lossy(self.0.local_name().as_ref()).to_string()
-    }
-}
-
-impl XmlDeserialize for Unparsed {
-    fn deserialize<R: BufRead>(
-        reader: &mut quick_xml::NsReader<R>,
-        start: &BytesStart,
-        empty: bool,
-    ) -> Result<Self, XmlError> {
-        // let reader_cloned = NsReader::from_reader(reader.get_ref().to_owned());
-        if !empty {
-            let mut buf = vec![];
-            reader.read_to_end_into(start.name(), &mut buf)?;
-        }
-        Ok(Self(start.to_owned()))
-    }
-}
-
 pub trait XmlRootTag {
     fn root_tag() -> &'static [u8];
     fn root_ns() -> Option<Namespace<'static>>;