Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions xmlity-quick-xml/tests/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ pub mod groups;
pub mod other;
pub mod text;
pub mod utils;
pub mod value;
pub mod with;
34 changes: 34 additions & 0 deletions xmlity-quick-xml/tests/value/indirect_direct_equal.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
pub mod linkbase_ref_items {
#[derive(
Debug, ::xmlity::SerializationGroup, ::xmlity::DeserializationGroup, PartialEq, Clone,
)]
pub struct LinkbaseRef {}
}
#[derive(Debug, ::xmlity::Serialize, ::xmlity::Deserialize, PartialEq, Clone)]
pub enum LinkbaseRef {
#[xelement(
name = "linkbaseRef",
namespace = "http://www.xbrl.org/2003/linkbase",
allow_unknown_attributes = "any"
)]
LinkbaseRef(#[xgroup] linkbase_ref_items::LinkbaseRef),
}

const LINKBASE_REF: &str = r###"
<link:linkbaseRef
xmlns:link="http://www.xbrl.org/2003/linkbase" />
"###;

#[test]
fn linkbase_ref() {
let direct: LinkbaseRef =
xmlity_quick_xml::from_str(LINKBASE_REF.trim()).expect("Failed to parse linkbaseRef XML");

let element: xmlity::value::XmlValue =
xmlity_quick_xml::from_str(LINKBASE_REF.trim()).expect("Failed to parse linkbaseRef XML");

let indirect: LinkbaseRef =
xmlity::Deserialize::deserialize(&element).expect("Failed to deserialize linkbaseRef XML");

assert_eq!(direct, indirect);
}
1 change: 1 addition & 0 deletions xmlity-quick-xml/tests/value/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pub mod indirect_direct_equal;
50 changes: 50 additions & 0 deletions xmlity/src/types/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,56 @@ impl<T: SerializationGroup> SerializationGroup for Option<T> {
}
}

impl<'de, D> de::SeqAccess<'de> for Option<&'de D>
where
&'de D: de::Deserializer<'de>,
{
type Error = <&'de D as de::Deserializer<'de>>::Error;

type SubAccess<'g>
= Self
where
Self: 'g;

fn next_element<T>(&mut self) -> Result<Option<T>, Self::Error>
where
T: Deserialize<'de>,
{
let Some(text) = self.take() else {
return Ok(None);
};

match T::deserialize(text) {
Ok(value) => Ok(Some(value)),
Err(_) => {
*self = Some(text);
Ok(None)
}
}
}

fn next_element_seq<T>(&mut self) -> Result<Option<T>, Self::Error>
where
T: Deserialize<'de>,
{
let Some(text) = self.take() else {
return Ok(None);
};

match T::deserialize_seq(text) {
Ok(value) => Ok(Some(value)),
Err(_) => {
*self = Some(text);
Ok(None)
}
}
}

fn sub_access(&mut self) -> Result<Self::SubAccess<'_>, Self::Error> {
Ok(*self)
}
}

impl<T: Serialize> Serialize for Box<T> {
fn serialize<S: crate::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
(**self).serialize(serializer)
Expand Down
59 changes: 6 additions & 53 deletions xmlity/src/value/deserializer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl<'de> Deserializer<'de> for &'de XmlCData {
where
V: Visitor<'de>,
{
self.deserialize_any(visitor)
visitor.visit_seq(Some(self))
}
}

Expand Down Expand Up @@ -174,7 +174,7 @@ impl<'de> Deserializer<'de> for &'de XmlElement {
where
V: Visitor<'de>,
{
self.deserialize_any(visitor)
visitor.visit_seq(Some(self))
}
}

Expand Down Expand Up @@ -277,7 +277,7 @@ impl<'de> Deserializer<'de> for &'de XmlProcessingInstruction {
where
V: Visitor<'de>,
{
self.deserialize_any(visitor)
visitor.visit_seq(Some(self))
}
}

Expand All @@ -294,7 +294,7 @@ impl<'de> Deserializer<'de> for &'de XmlDecl {
where
V: Visitor<'de>,
{
self.deserialize_any(visitor)
visitor.visit_seq(Some(self))
}
}

Expand All @@ -310,7 +310,7 @@ impl<'de> Deserializer<'de> for &'de XmlComment {
where
V: Visitor<'de>,
{
self.deserialize_any(visitor)
visitor.visit_seq(Some(self))
}
}

Expand All @@ -328,7 +328,7 @@ impl<'de> Deserializer<'de> for &'de XmlDoctype {
where
V: Visitor<'de>,
{
self.deserialize_any(visitor)
visitor.visit_seq(Some(self))
}
}

Expand Down Expand Up @@ -591,50 +591,3 @@ impl<'de> de::XmlText<'de> for &'de XmlText {

fn context(&self) -> Self::DeserializeContext<'_> {}
}

impl<'de> de::SeqAccess<'de> for Option<&'de XmlText> {
type Error = XmlValueDeserializerError;

type SubAccess<'g>
= Self
where
Self: 'g;

fn next_element<T>(&mut self) -> Result<Option<T>, Self::Error>
where
T: Deserialize<'de>,
{
let Some(text) = self.take() else {
return Ok(None);
};

match T::deserialize(text) {
Ok(value) => Ok(Some(value)),
Err(_) => {
*self = Some(text);
Ok(None)
}
}
}

fn next_element_seq<T>(&mut self) -> Result<Option<T>, Self::Error>
where
T: Deserialize<'de>,
{
let Some(text) = self.take() else {
return Ok(None);
};

match T::deserialize_seq(text) {
Ok(value) => Ok(Some(value)),
Err(_) => {
*self = Some(text);
Ok(None)
}
}
}

fn sub_access(&mut self) -> Result<Self::SubAccess<'_>, Self::Error> {
Ok(*self)
}
}