fixup! Remove optional

eclipse-kuksa · Apr 17, 2024 · 17ea444 · 17ea444
1 parent b6733c9
commit 17ea444
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/databroker/src/broker.rs b/databroker/src/broker.rs
@@ -661,19 +661,19 @@ impl Subscriptions {
             }
         });
         self.change_subscriptions.retain_mut(|sub| {
-                if sub.sender.is_closed() {
-                    info!("Subscriber gone: removing subscription");
-                    false
-                } else {
-                    match &sub.permissions.expired() {
-                        Ok(()) => true,
-                        Err(PermissionError::Expired) => {
-                            info!("Token expired: removing subscription");
-                            false
-                        }
-                        Err(err) => panic!("Error: {:?}", err),
+            if sub.sender.is_closed() {
+                info!("Subscriber gone: removing subscription");
+                false
+            } else {
+                match &sub.permissions.expired() {
+                    Ok(()) => true,
+                    Err(PermissionError::Expired) => {
+                        info!("Token expired: removing subscription");
+                        false
                     }
+                    Err(err) => panic!("Error: {:?}", err),
                 }
+            }
         });
     }
 }
@@ -744,8 +744,7 @@ impl ChangeSubscription {
                     };
                     if notifications.updates.is_empty() {
                         Ok(())
-                    } 
-                    else {
+                    } else {
                         match &self.sender.send(notifications).await {
                             Ok(()) => Ok(()),
                             Err(_) => Err(NotificationError {}),
@@ -786,8 +785,7 @@ impl ChangeSubscription {
                     }
                     notifications
                 };
-                match &self.sender.send(notifications).await
-                {
+                match &self.sender.send(notifications).await {
                     Ok(()) => Ok(()),
                     Err(_) => Err(NotificationError {}),
                 }