use let ... else in a few places

Author: gburgessiv

llvm_buildbot_monitor/src/discord.rs

@@ -960,9 +960,8 @@ impl MessageHandler {
     }
 
     fn handle_add_email(&self, from_uid: UserId, email: Option<&str>) -> String {
-        let raw_email = match email {
-            Some(x) => x,
-            None => return "Need an email.".into(),
+        let Some(raw_email) = email else {
+            return "Need an email.".into();
         };
 
         let email = match Email::parse(&remove_zero_width_spaces(raw_email)) {
@@ -1009,9 +1008,8 @@ impl MessageHandler {
     }
 
     fn handle_remove_email(&self, from_uid: UserId, email: Option<&str>) -> String {
-        let raw_email = match email {
-            Some(x) => x,
-            None => return "Need an email.".into(),
+        let Some(raw_email) = email else {
+            return "Need an email.".into();
         };
 
         let email = match Email::parse(&remove_zero_width_spaces(raw_email)) {

llvm_buildbot_monitor/src/greendragon.rs

@@ -407,12 +407,11 @@ async fn fetch_completed_build(
         json_get(client, &format!("green/job/{bot_name}/{id}/api/json")).await?;
 
     let mut blamelist = Vec::new();
-    let all_change_sets: Vec<ChangeSetListing>;
-    if let Some(x) = data.change_set {
-        all_change_sets = vec![x];
+    let all_change_sets = if let Some(x) = data.change_set {
+        vec![x]
     } else {
-        all_change_sets = data.change_sets;
-    }
+        data.change_sets
+    };
     for change_sets in all_change_sets {
         for change_set in change_sets.items {
             match Email::parse(&change_set.author_email) {

llvm_buildbot_monitor/src/lab.rs

@@ -526,12 +526,12 @@ async fn fetch_build_blamelist(
 
     let mut rs: Vec<Email> = results
         .into_iter()
-        .filter_map(|x| match Email::parse(remove_name_from_email(&x.author)) {
-            Some(x) => Some(x),
-            None => {
+        .filter_map(|x| {
+            let Some(x) = Email::parse(remove_name_from_email(&x.author)) else {
                 warn!("Failed parsing email {:?} -- oh, well.", x.author);
-                None
-            }
+                return None;
+            };
+            Some(x)
         })
         .collect();
 

llvm_buildbot_monitor/src/storage.rs

@@ -105,10 +105,10 @@ impl Storage {
         let mut result = Vec::new();
         for elem in iter {
             let elem = elem?;
-            result.push(match Email::parse(&elem) {
-                Some(x) => x,
-                None => bail!("Invalid email address in db: {:?}", elem),
-            });
+            let Some(x) = Email::parse(&elem) else {
+                bail!("Invalid email address in db: {:?}", elem);
+            };
+            result.push(x);
         }
         Ok(result)
     }