Merge pull request #240 from xosnrdev/edition-2024

chore: Update crate to Edition 2024

Author: Kobzol

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.82.0
+          toolchain: 1.85.0
           components: clippy, rustfmt
 
       - name: Install sqlx-cli

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "bors"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.80.0"
+edition = "2024"
+rust-version = "1.85.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.82 AS base
+FROM rust:1.85 AS base
 
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 

src/bin/bors.rs

@@ -6,8 +6,8 @@ use std::time::Duration;
 
 use anyhow::Context;
 use bors::{
-    create_app, create_bors_process, create_github_client, load_repositories, BorsContext,
-    BorsGlobalEvent, CommandParser, PgDbClient, ServerState, TeamApiClient, WebhookSecret,
+    BorsContext, BorsGlobalEvent, CommandParser, PgDbClient, ServerState, TeamApiClient,
+    WebhookSecret, create_app, create_bors_process, create_github_client, load_repositories,
 };
 use clap::Parser;
 use sqlx::postgres::PgConnectOptions;

src/bors/context.rs

@@ -3,7 +3,7 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-use crate::{bors::command::CommandParser, github::GithubRepoName, PgDbClient};
+use crate::{PgDbClient, bors::command::CommandParser, github::GithubRepoName};
 
 use super::RepositoryState;
 

src/bors/handlers/help.rs

@@ -1,6 +1,6 @@
-use crate::bors::command::{Approver, BorsCommand, RollupMode};
 use crate::bors::Comment;
 use crate::bors::RepositoryState;
+use crate::bors::command::{Approver, BorsCommand, RollupMode};
 use crate::github::PullRequest;
 use std::sync::Arc;
 
@@ -49,45 +49,35 @@ pub(super) async fn command_help(
 fn get_command_help(command: BorsCommand) -> String {
     // !!! When modifying this match, also update the command list above (in [`command_help`]) !!!
     let help = match command {
-        BorsCommand::Approve { approver: Approver::Myself, .. } => {
+        BorsCommand::Approve {
+            approver: Approver::Myself,
+            ..
+        } => {
             "`r+ [p=<priority>] [rollup=<never/iffy/maybe/always>]`: Approve this PR. Optionally, you can specify `<priority>`, `<rollup>`."
         }
-        BorsCommand::Approve {approver: Approver::Specified(_), ..} => {
+        BorsCommand::Approve {
+            approver: Approver::Specified(_),
+            ..
+        } => {
             "`r=<user> [p=<priority>]`: Approve this PR on behalf of `<user>`. Optionally, you can specify a `<priority>`."
         }
-        BorsCommand::Unapprove => {
-            "`r-`: Unapprove this PR"
-        }
-        BorsCommand::SetPriority(_) => {
-            "`p=<priority>`: Set the priority of this PR"
-        }
-        BorsCommand::Delegate => {
-            "`delegate+`: Delegate approval authority to the PR author"
-        }
-        BorsCommand::Undelegate => {
-            "`delegate-`: Remove any previously granted delegation"
-        }
-        BorsCommand::Help => {
-            "`help`: Print this help message"
-        }
-        BorsCommand::Ping => {
-            "`ping`: Check if the bot is alive"
-        }
+        BorsCommand::Unapprove => "`r-`: Unapprove this PR",
+        BorsCommand::SetPriority(_) => "`p=<priority>`: Set the priority of this PR",
+        BorsCommand::Delegate => "`delegate+`: Delegate approval authority to the PR author",
+        BorsCommand::Undelegate => "`delegate-`: Remove any previously granted delegation",
+        BorsCommand::Help => "`help`: Print this help message",
+        BorsCommand::Ping => "`ping`: Check if the bot is alive",
         BorsCommand::Try { .. } => {
             "`try [parent=<parent>] [jobs=<jobs>]`: Start a try build. Optionally, you can specify a `<parent>` SHA or a list of `<jobs>` to run"
         }
-        BorsCommand::TryCancel => {
-            "`try cancel`: Cancel a running try build"
-        }
+        BorsCommand::TryCancel => "`try cancel`: Cancel a running try build",
         BorsCommand::SetRollupMode(_) => {
             "`rollup=<never/iffy/maybe/always>`: Mark the rollup status of the PR"
         }
         BorsCommand::Info => {
-        "`info`: Get information about the current PR including delegation, priority, merge status, and try build status"
-        }
-        BorsCommand::OpenTree => {
-            "`treeclosed-`: Open the repository tree for merging"
+            "`info`: Get information about the current PR including delegation, priority, merge status, and try build status"
         }
+        BorsCommand::OpenTree => "`treeclosed-`: Open the repository tree for merging",
         BorsCommand::TreeClosed(_) => {
             "`treeclosed=<priority>`: Close the tree for PRs with priority less than `<priority>`"
         }

src/bors/handlers/mod.rs

@@ -9,14 +9,14 @@ use crate::bors::handlers::refresh::refresh_repository;
 use crate::bors::handlers::review::{
     command_approve, command_close_tree, command_open_tree, command_unapprove,
 };
-use crate::bors::handlers::trybuild::{command_try_build, command_try_cancel, TRY_BRANCH_NAME};
+use crate::bors::handlers::trybuild::{TRY_BRANCH_NAME, command_try_build, command_try_cancel};
 use crate::bors::handlers::workflow::{
     handle_check_suite_completed, handle_workflow_completed, handle_workflow_started,
 };
 use crate::bors::{BorsContext, Comment, RepositoryState};
 use crate::github::{GithubUser, PullRequest};
 use crate::permissions::PermissionType;
-use crate::{load_repositories, PgDbClient, TeamApiClient};
+use crate::{PgDbClient, TeamApiClient, load_repositories};
 use anyhow::Context;
 use octocrab::Octocrab;
 use pr_events::{
@@ -458,7 +458,7 @@ async fn has_permission(
 
 #[cfg(test)]
 mod tests {
-    use crate::tests::mocks::{run_test, Comment, User};
+    use crate::tests::mocks::{Comment, User, run_test};
 
     #[sqlx::test]
     async fn ignore_bot_comment(pool: sqlx::PgPool) {

src/bors/handlers/pr_events.rs

@@ -1,9 +1,9 @@
+use crate::PgDbClient;
 use crate::bors::event::{PullRequestEdited, PullRequestOpened, PullRequestPushed, PushToBranch};
 use crate::bors::handlers::labels::handle_label_trigger;
 use crate::bors::{Comment, RepositoryState};
 use crate::database::MergeableState;
 use crate::github::{CommitSha, LabelTrigger, PullRequestNumber};
-use crate::PgDbClient;
 use std::sync::Arc;
 
 pub(super) async fn handle_pull_request_edited(
@@ -130,7 +130,7 @@ mod tests {
     use crate::tests::mocks::default_pr_number;
     use crate::{
         database::MergeableState,
-        tests::mocks::{default_branch_name, default_repo_name, run_test, User},
+        tests::mocks::{User, default_branch_name, default_repo_name, run_test},
     };
 
     #[sqlx::test]

src/bors/handlers/refresh.rs

@@ -4,9 +4,9 @@ use std::time::Duration;
 use anyhow::Context;
 use chrono::{DateTime, Utc};
 
-use crate::bors::handlers::trybuild::cancel_build_workflows;
 use crate::bors::Comment;
 use crate::bors::RepositoryState;
+use crate::bors::handlers::trybuild::cancel_build_workflows;
 use crate::database::BuildStatus;
 use crate::{PgDbClient, TeamApiClient};
 
@@ -107,10 +107,10 @@ fn elapsed_time(date: DateTime<Utc>) -> Duration {
 
 #[cfg(test)]
 mod tests {
-    use crate::bors::handlers::refresh::MOCK_TIME;
     use crate::bors::handlers::WAIT_FOR_WORKFLOW_STARTED;
+    use crate::bors::handlers::refresh::MOCK_TIME;
     use crate::tests::mocks::{
-        default_repo_name, run_test, BorsBuilder, GitHubState, WorkflowEvent,
+        BorsBuilder, GitHubState, WorkflowEvent, default_repo_name, run_test,
     };
     use chrono::Utc;
     use std::future::Future;

src/bors/handlers/review.rs

@@ -1,19 +1,19 @@
 use std::sync::Arc;
 
+use crate::PgDbClient;
+use crate::bors::Comment;
+use crate::bors::RepositoryState;
 use crate::bors::command::Approver;
 use crate::bors::command::RollupMode;
 use crate::bors::handlers::deny_request;
 use crate::bors::handlers::has_permission;
 use crate::bors::handlers::labels::handle_label_trigger;
-use crate::bors::Comment;
-use crate::bors::RepositoryState;
 use crate::database::ApprovalInfo;
 use crate::database::TreeState;
 use crate::github::GithubUser;
 use crate::github::LabelTrigger;
 use crate::github::PullRequest;
 use crate::permissions::PermissionType;
-use crate::PgDbClient;
 
 /// Approve a pull request.
 /// A pull request can only be approved by a user of sufficient authority.
@@ -300,12 +300,12 @@ mod tests {
     use crate::database::TreeState;
     use crate::{
         bors::{
-            handlers::{trybuild::TRY_MERGE_BRANCH_NAME, TRY_BRANCH_NAME},
             RollupMode,
+            handlers::{TRY_BRANCH_NAME, trybuild::TRY_MERGE_BRANCH_NAME},
         },
         tests::mocks::{
-            default_pr_number, default_repo_name, run_test, BorsBuilder, Comment, GitHubState,
-            Permissions, User,
+            BorsBuilder, Comment, GitHubState, Permissions, User, default_pr_number,
+            default_repo_name, run_test,
         },
     };