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: Replace Unit with ()

Browse Source
This commit is contained in:
Lennart
2024-12-25 10:28:50 +01:00
parent 80472289dc
commit bb2708c17e
7 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/caldav/src/calendar/methods/mkcalendar.rs
View File

@@ -3,14 +3,14 @@ use actix_web::web::{Data, Path};
use actix_web::HttpResponse;
use rustical_store::auth::User;
use rustical_store::{Calendar, CalendarStore};
use rustical_xml::{Unit, XmlDeserialize, XmlDocument, XmlRootTag};
use rustical_xml::{XmlDeserialize, XmlDocument, XmlRootTag};
use tracing::instrument;
use tracing_actix_web::RootSpan;
#[derive(XmlDeserialize, Clone, Debug)]
pub struct Resourcetype {
calendar: Option<Unit>,
collection: Option<Unit>,
calendar: Option<()>,
collection: Option<()>,
}
#[derive(XmlDeserialize, Clone, Debug)]

8
crates/caldav/src/calendar/methods/report/calendar_query.rs
View File

@@ -6,7 +6,7 @@ use rustical_dav::{
xml::{MultistatusElement, PropElement, PropfindType},
};
use rustical_store::{auth::User, calendar::UtcDateTime, CalendarObject, CalendarStore};
use rustical_xml::{Unit, XmlDeserialize};
use rustical_xml::XmlDeserialize;
use crate::{
calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
@@ -27,7 +27,7 @@ pub(crate) struct TimeRangeElement {
#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
#[allow(dead_code)]
struct ParamFilterElement {
is_not_defined: Option<Unit>,
is_not_defined: Option<()>,
text_match: Option<TextMatchElement>,
#[xml(ty = "attr")]
@@ -46,7 +46,7 @@ struct TextMatchElement {
#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
#[allow(dead_code)]
pub(crate) struct PropFilterElement {
is_not_defined: Option<Unit>,
is_not_defined: Option<()>,
time_range: Option<TimeRangeElement>,
text_match: Option<TextMatchElement>,
#[xml(flatten)]
@@ -57,7 +57,7 @@ pub(crate) struct PropFilterElement {
#[allow(dead_code)]
// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
pub(crate) struct CompFilterElement {
pub(crate) is_not_defined: Option<Unit>,
pub(crate) is_not_defined: Option<()>,
pub(crate) time_range: Option<TimeRangeElement>,
#[xml(flatten)]
pub(crate) prop_filter: Vec<PropFilterElement>,

10
crates/carddav/src/addressbook/methods/mkcol.rs
View File

@@ -2,14 +2,14 @@ use crate::Error;
use actix_web::web::Path;
use actix_web::{web::Data, HttpResponse};
use rustical_store::{auth::User, Addressbook, AddressbookStore};
use rustical_xml::{Unit, XmlDeserialize, XmlDocument, XmlRootTag};
use rustical_xml::{XmlDeserialize, XmlDocument, XmlRootTag};
use tracing::instrument;
use tracing_actix_web::RootSpan;
#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
pub struct Resourcetype {
addressbook: Option<Unit>,
collection: Option<Unit>,
addressbook: Option<()>,
collection: Option<()>,
}
#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -110,8 +110,8 @@ mod tests {
set: PropElement {
prop: MkcolAddressbookProp {
resourcetype: Some(Resourcetype {
addressbook: Some(Unit),
collection: Some(Unit)
addressbook: Some(()),
collection: Some(())
}),
displayname: Some("whoops".to_owned()),
description: Some("okay".to_owned())

6
crates/xml/derive/src/de/de_enum.rs
View File

@@ -117,7 +117,7 @@ impl Variant {
quote! {
#variant_name => {
// Make sure that content is still consumed
::rustical_xml::Unit::deserialize(reader, start, empty)?;
<() as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
Ok(Self::#ident)
}
}
@@ -129,7 +129,7 @@ impl Variant {
quote! {
_ => {
// Make sure that content is still consumed
::rustical_xml::Unit::deserialize(reader, start, empty)?;
<() as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
Ok(Self::#ident)
}
}
@@ -168,7 +168,7 @@ impl Variant {
Fields::Unit => {
quote! {
// Make sure that content is still consumed
if let Ok(_) = ::rustical_xml::Unit::deserialize(reader, start, empty) {
if let Ok(_) = <() as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty) {
return Ok(Self::#ident);
}
}

19
crates/xml/src/lib.rs
View File

@@ -12,32 +12,19 @@ pub use de::XmlRootTag;
pub use se::XmlSerialize;
pub use value::Value;
// impl<T: XmlDeserialize> XmlDeserialize for Option<T> {
// fn deserialize<R: BufRead>(
// reader: &mut quick_xml::NsReader<R>,
// start: &BytesStart,
// empty: bool,
// ) -> Result<Self, XmlDeError> {
// Ok(Some(T::deserialize(reader, start, empty)?))
// }
// }
#[derive(Debug, Clone, PartialEq)]
pub struct Unit;
impl XmlDeserialize for Unit {
impl XmlDeserialize for () {
fn deserialize<R: BufRead>(
reader: &mut quick_xml::NsReader<R>,
start: &BytesStart,
empty: bool,
) -> Result<Self, XmlDeError> {
if empty {
return Ok(Unit);
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(Unit),
Event::End(e) if e.name() == start.name() => return Ok(()),
Event::Eof => return Err(XmlDeError::Eof),
_ => {}
};

5
crates/xml/tests/de_enum.rs
View File

@@ -1,4 +1,4 @@
use rustical_xml::{de::XmlDocument, Unit, XmlDeserialize, XmlRootTag};
use rustical_xml::{de::XmlDocument, XmlDeserialize, XmlRootTag};
#[test]
fn test_struct_tagged_enum() {
@@ -78,7 +78,7 @@ fn test_tagged_enum_complex() {
#[derive(Debug, XmlDeserialize, PartialEq)]
struct Nice {
nice: Unit,
nice: (),
}
let asd = Propfind::parse_str(
@@ -94,7 +94,6 @@ fn test_tagged_enum_complex() {
"#,
)
.unwrap();
dbg!(asd);
}
#[test]

10
crates/xml/tests/de_struct.rs
View File

@@ -1,6 +1,6 @@
use rustical_xml::de::XmlDocument;
use rustical_xml::XmlRootTag;
use rustical_xml::{Unit, Unparsed, XmlDeserialize};
use rustical_xml::{Unparsed, XmlDeserialize};
use std::collections::HashSet;
#[test]
@@ -155,11 +155,11 @@ fn test_struct_ns() {
#[xml(root = b"document", ns_strict)]
struct Document {
#[xml(ns = b"hello")]
child: Unit,
child: (),
}
let doc = Document::parse_str(r#"<document><child xmlns="hello" /></document>"#).unwrap();
assert_eq!(doc, Document { child: Unit });
assert_eq!(doc, Document { child: () });
}
#[test]
@@ -168,7 +168,7 @@ fn test_struct_attr() {
#[xml(root = b"document", ns_strict)]
struct Document {
#[xml(ns = b"hello")]
child: Unit,
child: (),
#[xml(ty = "attr", default = "Default::default")]
test: String,
#[xml(ty = "attr")]
@@ -182,7 +182,7 @@ fn test_struct_attr() {
assert_eq!(
doc,
Document {
child: Unit,
child: (),
test: "hello!".to_owned(),
number: 2
}