xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xmpp-parsers: Switch from zero-sized types to #[xml(flag)]

Browse source 
That way we can simply use true/false, instead of
Some(TheZeroSizedType)/None.
This commit is contained in:
Emmanuel Gil Peyrot 2025-01-25 19:39:49 +01:00
commit 244a9bbbf2
6 changed files with 19 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
parsers/src/starttls.rs
View file

@ -25,16 +25,10 @@ pub struct Proceed;
#[xml(namespace = ns::TLS, name = "starttls")]
pub struct StartTls {
/// Marker for mandatory StartTLS.
// TODO: replace with `#[xml(flag)]` once we have it
#[xml(child(default))]
pub required: Option<RequiredStartTls>,
#[xml(flag(name = "required"))]
pub required: bool,
}
/// Marker for mandatory StartTLS.
#[derive(FromXml, AsXml, PartialEq, Debug, Clone)]
#[xml(namespace = ns::TLS, name = "required")]
pub struct RequiredStartTls;
/// Enum which allows parsing/serialising any STARTTLS element.
#[derive(FromXml, AsXml, PartialEq, Debug, Clone)]
#[xml()]
@ -58,7 +52,6 @@ mod tests {
assert_size!(Request, 0);
assert_size!(Proceed, 0);
assert_size!(StartTls, 1);
assert_size!(RequiredStartTls, 0);
assert_size!(Nonza, 1);
}
@ -82,7 +75,7 @@ mod tests {
.parse()
.unwrap();
let starttls = StartTls::try_from(elem.clone()).unwrap();
assert_eq!(starttls.required, None);
assert_eq!(starttls.required, false);
let elem2 = Element::from(starttls);
assert_eq!(elem, elem2);
@ -91,7 +84,7 @@ mod tests {
.parse()
.unwrap();
let starttls = StartTls::try_from(elem.clone()).unwrap();
assert_eq!(starttls.required, Some(RequiredStartTls));
assert_eq!(starttls.required, true);
let elem2 = Element::from(starttls);
assert_eq!(elem, elem2);