Remove obsolete merge bot variants

rust_team_data/src/v1.rs

@@ -334,21 +334,17 @@ pub enum BranchProtectionMode {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "snake_case")]
 pub enum MergeBot {
-    Homu,
-    RustTimer,
     Bors,
     WorkflowsCratesIo,
     PromoteRelease,
 }
 
 impl MergeBot {
-    pub fn app_id(&self) -> Option<i64> {
+    pub fn app_id(&self) -> i64 {
         match self {
-            MergeBot::WorkflowsCratesIo => Some(2201425),
-            MergeBot::Bors => Some(278306),
-            MergeBot::PromoteRelease => Some(217112),
-            // These are user-based bots, not GitHub Apps
-            MergeBot::RustTimer | MergeBot::Homu => None,
+            MergeBot::WorkflowsCratesIo => 2201425,
+            MergeBot::Bors => 278306,
+            MergeBot::PromoteRelease => 217112,
         }
     }
 }

src/schema.rs

@@ -944,7 +944,6 @@ pub(crate) enum RepoPermission {
 #[derive(serde::Deserialize, Debug, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 pub(crate) enum BypassApp {
-    RustTimer,
     Bors,
     WorkflowsCratesIo,
     PromoteRelease,

src/static_api.rs

@@ -244,7 +244,6 @@ impl<'a> Generator<'a> {
     fn convert_bypass_apps(apps: &[BypassApp]) -> Vec<v1::MergeBot> {
         apps.iter()
             .map(|app| match app {
-                BypassApp::RustTimer => v1::MergeBot::RustTimer,
                 BypassApp::Bors => v1::MergeBot::Bors,
                 BypassApp::WorkflowsCratesIo => v1::MergeBot::WorkflowsCratesIo,
                 BypassApp::PromoteRelease => v1::MergeBot::PromoteRelease,

src/sync/github/mod.rs

@@ -469,13 +469,14 @@ impl SyncGitHub {
             .allowed_merge_teams(expected_repo, branch_protection)
             .await?;
         bypass_actors.extend(allowed_teams);
-        let bypass_apps = branch_protection.bypass_apps.iter().filter_map(|app| {
-            app.app_id().map(|app_id| RulesetBypassActor {
-                actor_id: app_id,
+        let bypass_apps = branch_protection
+            .bypass_apps
+            .iter()
+            .map(|app| RulesetBypassActor {
+                actor_id: app.app_id(),
                 actor_type: RulesetActorType::Integration,
                 bypass_mode: RulesetBypassMode::Always,
-            })
-        });
+            });
         bypass_actors.extend(bypass_apps);
         Ok(bypass_actors)
     }