Rename stalled to failed

Author: Kobzol

src/bors/handlers/retry.rs

@@ -22,7 +22,7 @@ pub(super) async fn command_retry(
 
     let pr_model = pr.db;
 
-    if matches!(pr_model.queue_status(), QueueStatus::Stalled(_, _)) {
+    if matches!(pr_model.queue_status(), QueueStatus::Failed(_, _)) {
         db.clear_auto_build(pr_model).await?;
         merge_queue_tx.notify().await?;
     } else {

src/bors/merge_queue.rs

@@ -132,8 +132,8 @@ async fn process_repository(repo: &RepositoryState, ctx: &BorsContext) -> anyhow
             QueueStatus::NotApproved => unreachable!(
                 "PR {pr:?} is not approved. It should not have been returned by `get_merge_queue_prs`, this is a bug."
             ),
-            QueueStatus::Stalled(..) => unreachable!(
-                "PR {pr:?} is stalled. It should not have been returned by `get_merge_queue_prs`, this is a bug."
+            QueueStatus::Failed(..) => unreachable!(
+                "Build of PR {pr:?} has failed. It should not have been returned by `get_merge_queue_prs`, this is a bug."
             ),
             QueueStatus::Pending(..) => {
                 // Build in progress - stop queue. We can only have one PR being built

src/database/mod.rs

@@ -187,7 +187,7 @@ pub enum QueueStatus {
     /// Approved with running auto build.
     Pending(ApprovalInfo, BuildModel),
     /// Approved with failed auto build.
-    Stalled(ApprovalInfo, BuildModel),
+    Failed(ApprovalInfo, BuildModel),
     /// Approved with no auto build started yet or a failed auto build was reset
     /// with `@bors retry`.
     Approved(ApprovalInfo),
@@ -441,7 +441,7 @@ impl PullRequestModel {
                         QueueStatus::ReadyForMerge(approval_info.clone(), build.clone())
                     }
                     BuildStatus::Failure | BuildStatus::Cancelled | BuildStatus::Timeouted => {
-                        QueueStatus::Stalled(approval_info.clone(), build.clone())
+                        QueueStatus::Failed(approval_info.clone(), build.clone())
                     }
                 },
                 None => QueueStatus::Approved(approval_info.clone()),

src/server/mod.rs

@@ -294,7 +294,7 @@ pub async fn queue_handler(
                     QueueStatus::Approved(..) => (1, 0),
                     QueueStatus::ReadyForMerge(..) => (1, 0),
                     QueueStatus::Pending(..) => (1, 0),
-                    QueueStatus::Stalled(..) => (0, 1),
+                    QueueStatus::Failed(..) => (0, 1),
                     QueueStatus::NotApproved => (0, 0),
                 };
 

src/templates.rs

@@ -15,7 +15,7 @@ pub fn status_text(pr: &PullRequestModel) -> String {
             QueueStatus::Approved(_) => "approved".to_string(),
             QueueStatus::ReadyForMerge(_, _) => "ready for merge".to_string(),
             QueueStatus::Pending(_, _) => "pending".to_string(),
-            QueueStatus::Stalled(_, _) => "stalled".to_string(),
+            QueueStatus::Failed(_, _) => "failed".to_string(),
             QueueStatus::NotApproved => String::new(),
         }
     }

src/utils/sort_queue.rs

@@ -2,11 +2,11 @@ use crate::bors::RollupMode;
 use crate::database::{MergeableState, PullRequestModel, QueueStatus};
 
 /// Sorts pull requests according to merge queue priority rules.
-/// Ordered by: ready for merge > pending builds > approved > stalled > not approved > mergeability
+/// Ordered by: ready for merge > pending builds > approved > failed > not approved > mergeability
 /// > priority > rollup > age.
 pub fn sort_queue_prs(mut prs: Vec<PullRequestModel>) -> Vec<PullRequestModel> {
     prs.sort_by(|a, b| {
-        // 1. Compare queue status (ready for merge > pending > approved > stalled > not approved)
+        // 1. Compare queue status (ready for merge > pending > approved > failed > not approved)
         get_queue_status_priority(&a.queue_status())
             .cmp(&get_queue_status_priority(&b.queue_status()))
             // 2. Compare mergeability state (0 = mergeable, 1 = conflicts/unknown)
@@ -33,7 +33,7 @@ fn get_queue_status_priority(status: &QueueStatus) -> u32 {
         QueueStatus::ReadyForMerge(_, _) => 0,
         QueueStatus::Pending(_, _) => 1,
         QueueStatus::Approved(_) => 2,
-        QueueStatus::Stalled(_, _) => 3,
+        QueueStatus::Failed(_, _) => 3,
         QueueStatus::NotApproved => 4,
     }
 }