pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

roster: Simplify the @ask parsing using a singleton attribute.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2019-01-12 22:51:02 +01:00
parent 62539cbae3
commit b6796d54e6
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/roster.rs
View file

@ -38,10 +38,10 @@ generate_attribute!(
generate_attribute!( generate_attribute!(
/// The sub-state of subscription with a contact. /// The sub-state of subscription with a contact.
Ask, "ask", { Ask, "ask", (
/// Pending sub-state of the 'none' subscription state /// Pending sub-state of the 'none' subscription state.
Subscribe => "subscribe", Subscribe => "subscribe"
} )
); );
generate_element!( generate_element!(
@ -58,8 +58,8 @@ generate_element!(
/// Subscription status of this contact. /// Subscription status of this contact.
subscription: Subscription = "subscription" => default, subscription: Subscription = "subscription" => default,
/// /// Indicates “Pending Out” sub-states for this contact.
ask: Option<Ask> = "ask" => optional_empty ask: Ask = "ask" => default,
], ],
children: [ children: [
@ -174,7 +174,7 @@ mod tests {
); );
assert_eq!(roster.items[0].name, Some(String::from("Romeo"))); assert_eq!(roster.items[0].name, Some(String::from("Romeo")));
assert_eq!(roster.items[0].subscription, Subscription::Both); assert_eq!(roster.items[0].subscription, Subscription::Both);
assert_eq!(roster.items[0].ask, None); assert_eq!(roster.items[0].ask, Ask::None);
assert_eq!( assert_eq!(
roster.items[0].groups, roster.items[0].groups,
vec!(Group::from_str("Friends").unwrap()) vec!(Group::from_str("Friends").unwrap())
@ -186,7 +186,7 @@ mod tests {
); );
assert_eq!(roster.items[3].name, Some(String::from("MyContact"))); assert_eq!(roster.items[3].name, Some(String::from("MyContact")));
assert_eq!(roster.items[3].subscription, Subscription::None); assert_eq!(roster.items[3].subscription, Subscription::None);
assert_eq!(roster.items[3].ask, Some(Ask::Subscribe)); assert_eq!(roster.items[3].ask, Ask::Subscribe);
assert_eq!( assert_eq!(
roster.items[3].groups, roster.items[3].groups,
vec!(Group::from_str("MyBuddies").unwrap()) vec!(Group::from_str("MyBuddies").unwrap())