refactor: use vec instead of Option<Vec>

Author: vohoanglong0107

src/bors/command/mod.rs

@@ -23,7 +23,7 @@ pub enum BorsCommand {
         /// Parent commit which should be used as the merge base.
         parent: Option<Parent>,
         /// The CI workflow to run.
-        jobs: Option<Vec<String>>,
+        jobs: Vec<String>,
     },
     /// Cancel a try build.
     TryCancel,

src/bors/command/parser.rs

@@ -140,7 +140,7 @@ fn parser_try<'a>(command: &'a str, parts: &[CommandPart<'a>]) -> ParseResult<'a
     }
 
     let mut parent = None;
-    let mut jobs = None;
+    let mut jobs = Vec::new();
 
     for part in parts {
         match part {
@@ -165,18 +165,18 @@ fn parser_try<'a>(command: &'a str, parts: &[CommandPart<'a>]) -> ParseResult<'a
                 "jobs" => {
                     let raw_jobs: Vec<_> = value.split(',').map(|s| s.to_string()).collect();
                     if raw_jobs.is_empty() {
-                        return Some(Err(CommandParseError::ValidationError(format!(
-                            "Try jobs must not be empty"
-                        ))));
+                        return Some(Err(CommandParseError::ValidationError(
+                            "Try jobs must not be empty".to_string(),
+                        )));
                     }
 
                     // rust ci currently allows specifying 10 jobs max
                     if raw_jobs.len() > 10 {
-                        return Some(Err(CommandParseError::ValidationError(format!(
-                            "Try jobs must not have more than 10 jobs"
-                        ))));
+                        return Some(Err(CommandParseError::ValidationError(
+                            "Try jobs must not have more than 10 jobs".to_string(),
+                        )));
                     }
-                    jobs = Some(raw_jobs);
+                    jobs = raw_jobs;
                 }
                 _ => {
                     return Some(Err(CommandParseError::UnknownArg(key)));
@@ -189,7 +189,7 @@ fn parser_try<'a>(command: &'a str, parts: &[CommandPart<'a>]) -> ParseResult<'a
 
 /// Parses "@bors try cancel".
 fn parser_try_cancel<'a>(command: &'a str, parts: &[CommandPart<'a>]) -> ParseResult<'a> {
-    if command == "try" && parts.get(0) == Some(&CommandPart::Bare("cancel")) {
+    if command == "try" && parts.first() == Some(&CommandPart::Bare("cancel")) {
         Some(Ok(BorsCommand::TryCancel))
     } else {
         None
@@ -280,26 +280,28 @@ line two
 "#,
         );
         assert_eq!(cmds.len(), 1);
-        assert!(matches!(
-            cmds[0],
-            Ok(BorsCommand::Try {
+        insta::assert_debug_snapshot!(cmds[0], @r###"
+        Ok(
+            Try {
                 parent: None,
-                jobs: None
-            })
-        ));
+                jobs: [],
+            },
+        )
+        "###);
     }
 
     #[test]
     fn parse_try() {
         let cmds = parse_commands("@bors try");
         assert_eq!(cmds.len(), 1);
-        assert!(matches!(
-            cmds[0],
-            Ok(BorsCommand::Try {
+        insta::assert_debug_snapshot!(cmds[0], @r###"
+        Ok(
+            Try {
                 parent: None,
-                jobs: None
-            })
-        ));
+                jobs: [],
+            },
+        )
+        "###);
     }
 
     #[test]
@@ -312,7 +314,7 @@ line two
                 parent: Some(Parent::CommitSha(CommitSha(
                     "ea9c1b050cc8b420c2c211d2177811e564a4dc60".to_string()
                 ))),
-                jobs: None
+                jobs: Vec::new()
             })
         );
     }
@@ -325,7 +327,7 @@ line two
             cmds[0],
             Ok(BorsCommand::Try {
                 parent: Some(Parent::Last),
-                jobs: None
+                jobs: Vec::new()
             })
         );
     }
@@ -351,7 +353,7 @@ line two
             cmds[0],
             Ok(BorsCommand::Try {
                 parent: None,
-                jobs: Some(vec!["ci".to_string(), "lint".to_string()])
+                jobs: vec!["ci".to_string(), "lint".to_string()]
             })
         );
     }
@@ -405,13 +407,14 @@ line two
 "#,
         );
         assert_eq!(cmds.len(), 1);
-        assert!(matches!(
-            cmds[0],
-            Ok(BorsCommand::Try {
+        insta::assert_debug_snapshot!(cmds[0], @r###"
+        Ok(
+            Try {
                 parent: None,
-                jobs: None
-            })
-        ));
+                jobs: [],
+            },
+        )
+        "###)
     }
 
     #[test]

src/bors/handlers/trybuild.rs

@@ -36,7 +36,7 @@ pub(super) async fn command_try_build<Client: RepositoryClient>(
     pr: &PullRequest,
     author: &GithubUser,
     parent: Option<Parent>,
-    jobs: Option<Vec<String>>,
+    jobs: Vec<String>,
 ) -> anyhow::Result<()> {
     let repo = repo.as_ref();
     if !check_try_permissions(repo, pr, author).await? {
@@ -233,11 +233,7 @@ fn get_pending_build(pr: PullRequestModel) -> Option<BuildModel> {
         .and_then(|b| (b.status == BuildStatus::Pending).then_some(b))
 }
 
-fn auto_merge_commit_message(
-    pr: &PullRequest,
-    reviewer: &str,
-    jobs: Option<Vec<String>>,
-) -> String {
+fn auto_merge_commit_message(pr: &PullRequest, reviewer: &str, jobs: Vec<String>) -> String {
     let pr_number = pr.number;
     let mut message = format!(
         r#"Auto merge of #{pr_number} - {pr_label}, r={reviewer}
@@ -248,10 +244,10 @@ fn auto_merge_commit_message(
         pr_title = pr.title,
         pr_message = pr.message
     );
-    if let Some(jobs) = jobs {
-        for job in jobs {
-            message.push_str(&format!("\nci-job: {}", job));
-        }
+
+    // if jobs is empty, try-job won't be added to the message
+    for job in jobs {
+        message.push_str(&format!("\ntry-job: {}", job));
     }
     message
 }