plugins/roster: Subscription is now an enum

Maxime “pep” Buquet created 8 years ago

Change summary

src/plugins/roster.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Detailed changes

src/plugins/roster.rs

@@ -77,7 +77,7 @@ impl RosterPlugin {
 
     // TODO: use a better error type.
     pub fn send_roster_set(&self, to: Option<Jid>, item: Item) -> Result<(), String> {
-        if item.subscription.is_some() && item.subscription != Some(Subscription::Remove) {
+        if item.subscription != Subscription::Remove {
             return Err(String::from("Subscription must be either nothing or Remove."));
         }
         let iq = Iq {
@@ -117,10 +117,10 @@ impl RosterPlugin {
         let mut jids = self.jids.lock().unwrap();
         let previous = jids.insert(item.jid.clone(), item.clone());
         if previous.is_none() {
-            assert!(item.subscription != Some(Subscription::Remove));
+            assert!(item.subscription != Subscription::Remove);
             self.proxy.dispatch(RosterPush::Added(item));
         } else {
-            if item.subscription == Some(Subscription::Remove) {
+            if item.subscription == Subscription::Remove {
                 self.proxy.dispatch(RosterPush::Removed(item));
             } else {
                 self.proxy.dispatch(RosterPush::Modified(item));