nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

xml: Differentiate between ValueSerialize and ValueDeserialize to prevent unwraps

Browse Source
This commit is contained in:
Lennart K
2025-01-15 11:05:57 +01:00
parent 4da975c6fb
commit 807335de17
9 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/xml/derive/src/field.rs
View File

@@ -232,7 +232,7 @@ impl Field {
let builder_field_ident = self.builder_field_ident();
let value = wrap_option_if_no_default(
quote! {
rustical_xml::Value::deserialize(text.as_ref())?
::rustical_xml::ValueDeserialize::deserialize(text.as_ref())?
},
self.attrs.default.is_some(),
);
@@ -250,8 +250,8 @@ impl Field {
let value = wrap_option_if_no_default(
quote! {
rustical_xml::Value::deserialize(attr.unescape_value()?.as_ref())?
},
::rustical_xml::ValueDeserialize::deserialize(attr.unescape_value()?.as_ref())?
},
self.attrs.default.is_some(),
);
@@ -270,7 +270,7 @@ impl Field {
let value = wrap_option_if_no_default(
quote! {
rustical_xml::Value::deserialize(&String::from_utf8_lossy(name.as_ref()))?
rustical_xml::ValueDeserialize::deserialize(&String::from_utf8_lossy(name.as_ref()))?
},
self.attrs.default.is_some(),
);

2
crates/xml/derive/src/xml_struct.rs
View File

@@ -239,7 +239,7 @@ impl NamedStruct {
quote! {
::quick_xml::events::attributes::Attribute {
key: ::quick_xml::name::QName(#field_name),
value: ::std::borrow::Cow::from(::rustical_xml::Value::serialize(&self.#field_index).into_bytes())
value: ::std::borrow::Cow::from(::rustical_xml::ValueSerialize::serialize(&self.#field_index).into_bytes())
}
}
});