Merge pull request #2080 from Urgau/edition-2024

Kobzol · web-flow · commit b19e02c3b305 · 2025-06-14T17:27:38.000Z
Migrate to 2024 edition
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,8 +2,8 @@
 name = "triagebot"
 version = "0.1.0"
 authors = ["Mark Rousskov <mark.simulacrum@gmail.com>"]
-edition = "2021"
-rust-version = "1.80.0"
+edition = "2024"
+rust-version = "1.85.0"
 
 [workspace]
 
diff --git a/src/changelogs/mod.rs b/src/changelogs/mod.rs
@@ -1,6 +1,6 @@
 mod rustc;
 
-use comrak::{nodes::AstNode, Arena, ComrakOptions, ComrakRenderOptions};
+use comrak::{Arena, ComrakOptions, ComrakRenderOptions, nodes::AstNode};
 use std::collections::HashMap;
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug, serde::Deserialize)]
diff --git a/src/changelogs/rustc.rs b/src/changelogs/rustc.rs
@@ -1,8 +1,8 @@
 use super::Changelog;
 use anyhow::Context as _;
 use comrak::{
-    nodes::{AstNode, NodeHeading, NodeValue},
     Arena, ComrakOptions,
+    nodes::{AstNode, NodeHeading, NodeValue},
 };
 use std::collections::HashMap;
 
diff --git a/src/db.rs b/src/db.rs
@@ -132,8 +132,8 @@ pub async fn make_client(db_url: &str) -> anyhow::Result<tokio_postgres::Client>
 }
 
 fn make_certificates() -> Vec<Certificate> {
-    use x509_cert::der::pem::LineEnding;
     use x509_cert::der::EncodePem;
+    use x509_cert::der::pem::LineEnding;
 
     let certs = x509_cert::Certificate::load_pem_chain(&CERTIFICATE_PEMS[..]).unwrap();
     certs
diff --git a/src/db/review_prefs.rs b/src/db/review_prefs.rs
@@ -2,7 +2,7 @@ use crate::db::users::record_username;
 use crate::github::{User, UserId};
 use anyhow::Context;
 use bytes::BytesMut;
-use postgres_types::{to_sql_checked, FromSql, IsNull, ToSql, Type};
+use postgres_types::{FromSql, IsNull, ToSql, Type, to_sql_checked};
 use std::collections::HashMap;
 use std::error::Error;
 
@@ -171,7 +171,7 @@ SET max_assigned_prs = excluded.max_assigned_prs,
 
 #[cfg(test)]
 mod tests {
-    use crate::db::review_prefs::{get_review_prefs, upsert_review_prefs, RotationMode};
+    use crate::db::review_prefs::{RotationMode, get_review_prefs, upsert_review_prefs};
     use crate::db::users::get_user;
     use crate::tests::github::user;
     use crate::tests::run_db_test;
diff --git a/src/github.rs b/src/github.rs
@@ -1,9 +1,9 @@
 use crate::team_data::TeamClient;
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use bytes::Bytes;
 use chrono::{DateTime, FixedOffset, Utc};
-use futures::{future::BoxFuture, FutureExt};
+use futures::{FutureExt, future::BoxFuture};
 use octocrab::models::{Author, AuthorAssociation};
 use regex::Regex;
 use reqwest::header::{AUTHORIZATION, USER_AGENT};
@@ -2649,9 +2649,9 @@ impl GithubClient {
             .await
         {
             Ok(c) => {
-                if let Some(c) = c["data"]["repository"]["defaultBranchRef"]["target"]["history"]
-                    ["totalCount"]
-                    .as_i64()
+                if let Some(c) =
+                    c["data"]["repository"]["defaultBranchRef"]["target"]["history"]["totalCount"]
+                        .as_i64()
                 {
                     return c == 0;
                 }
diff --git a/src/handlers.rs b/src/handlers.rs
@@ -4,7 +4,7 @@ use crate::handlers::pr_tracking::ReviewerWorkqueue;
 use crate::team_data::TeamClient;
 use crate::zulip::client::ZulipClient;
 use octocrab::Octocrab;
-use parser::command::{assign::AssignCommand, Command, Input};
+use parser::command::{Command, Input, assign::AssignCommand};
 use std::fmt;
 use std::sync::Arc;
 use tracing as log;
diff --git a/src/handlers/assign.rs b/src/handlers/assign.rs
@@ -21,7 +21,7 @@
 //! the PR modifies.
 
 use crate::db::issue_data::IssueData;
-use crate::db::review_prefs::{get_review_prefs_batch, RotationMode};
+use crate::db::review_prefs::{RotationMode, get_review_prefs_batch};
 use crate::github::UserId;
 use crate::handlers::pr_tracking::ReviewerWorkqueue;
 use crate::{
@@ -30,7 +30,7 @@ use crate::{
     handlers::{Context, GithubClient, IssuesEvent},
     interactions::EditIssueBody,
 };
-use anyhow::{bail, Context as _};
+use anyhow::{Context as _, bail};
 use octocrab::models::AuthorAssociation;
 use parser::command::assign::AssignCommand;
 use parser::command::{Command, Input};
diff --git a/src/handlers/assign/tests/tests_candidates.rs b/src/handlers/assign/tests/tests_candidates.rs
@@ -1,11 +1,11 @@
 //! Tests for `candidate_reviewers_from_names`
 
 use super::super::*;
-use crate::db::review_prefs::{upsert_review_prefs, RotationMode};
+use crate::db::review_prefs::{RotationMode, upsert_review_prefs};
 use crate::github::{PullRequestNumber, User};
 use crate::handlers::pr_tracking::{AssignedPullRequest, ReviewerWorkqueue};
 use crate::tests::github::{issue, user};
-use crate::tests::{run_db_test, TestContext};
+use crate::tests::{TestContext, run_db_test};
 
 #[must_use]
 struct AssignCtx {
diff --git a/src/handlers/check_commits.rs b/src/handlers/check_commits.rs
@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
-use anyhow::bail;
 use anyhow::Context as _;
+use anyhow::bail;
 
 use super::Context;
 use crate::{
diff --git a/src/handlers/concern.rs b/src/handlers/concern.rs
@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use anyhow::{bail, Context as _};
+use anyhow::{Context as _, bail};
 use octocrab::models::AuthorAssociation;
 
 use crate::{
@@ -202,7 +202,10 @@ fn markdown_content(concerns: &[Concern], bot: &str) -> String {
     }
 
     let _ = writeln!(md, ">");
-    let _ = writeln!(md, "> *Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*");
+    let _ = writeln!(
+        md,
+        "> *Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*"
+    );
 
     md
 }
diff --git a/src/handlers/major_change.rs b/src/handlers/major_change.rs
@@ -201,8 +201,11 @@ pub(super) async fn handle_input(
             //
             // However, since this handler is stateless, we can't track when to re-add it, it's also a bit unclear if it
             // should be re-added at all. Also historically the `enable_label` wasn't removed either, so we don't touch it.
-            format!("Concern(s) have been raised on the [associated GitHub issue]({}). This proposal is now blocked until those concerns are fully resolved.", event.issue.html_url),
-            None
+            format!(
+                "Concern(s) have been raised on the [associated GitHub issue]({}). This proposal is now blocked until those concerns are fully resolved.",
+                event.issue.html_url
+            ),
+            None,
         ),
         Invocation::ConcernsResolved => (
             if event.issue.labels().contains(&Label {
@@ -211,12 +214,18 @@ pub(super) async fn handle_input(
                 // Re-schedule acceptance job to automaticaly close the MCP
                 schedule_acceptance_job(ctx, config, &event.issue).await?;
 
-                format!("All concerns on the [associated GitHub issue]({}) have been resolved, this proposal is no longer blocked, and will be approved in {} days if no (new) objections are raised.", event.issue.html_url, config.waiting_period)
+                format!(
+                    "All concerns on the [associated GitHub issue]({}) have been resolved, this proposal is no longer blocked, and will be approved in {} days if no (new) objections are raised.",
+                    event.issue.html_url, config.waiting_period
+                )
             } else {
-                format!("All concerns on the [associated GitHub issue]({}) have been resolved, this proposal is no longer blocked.", event.issue.html_url)
+                format!(
+                    "All concerns on the [associated GitHub issue]({}) have been resolved, this proposal is no longer blocked.",
+                    event.issue.html_url
+                )
             },
-            None
-        )
+            None,
+        ),
     };
 
     handle(
diff --git a/src/handlers/merge_conflicts.rs b/src/handlers/merge_conflicts.rs
@@ -15,8 +15,8 @@
 
 use crate::{
     config::MergeConflictConfig,
-    db::issue_data::IssueData,
     db::PooledClient,
+    db::issue_data::IssueData,
     github::{
         Event, GithubClient, Issue, IssuesAction, IssuesEvent, Label, MergeConflictInfo,
         MergeableState, PushEvent, ReportedContentClassifiers, Repository,
diff --git a/src/handlers/note.rs b/src/handlers/note.rs
@@ -110,7 +110,10 @@ impl NoteData {
         for (_, entry) in self.entries_by_url.iter().sorted() {
             text.push_str(&entry.to_markdown());
         }
-        let _ = writeln!(text, "\n\n*Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/note.html) for details*");
+        let _ = writeln!(
+            text,
+            "\n\n*Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/note.html) for details*"
+        );
         text
     }
 }
diff --git a/src/handlers/pr_tracking.rs b/src/handlers/pr_tracking.rs
@@ -14,10 +14,10 @@ use crate::{
     handlers::Context,
 };
 use futures::TryStreamExt;
+use octocrab::Octocrab;
 use octocrab::models::IssueState;
 use octocrab::params::pulls::Sort;
 use octocrab::params::{Direction, State};
-use octocrab::Octocrab;
 use std::collections::HashMap;
 use tokio::sync::RwLockWriteGuard;
 use tracing as log;
@@ -339,10 +339,10 @@ mod tests {
     use crate::github::{Issue, IssuesAction, IssuesEvent, Repository, User};
     use crate::github::{Label, PullRequestNumber};
     use crate::handlers::pr_tracking::{
-        handle_input, parse_input, upsert_pr_into_user_queue, AssignedPullRequest,
+        AssignedPullRequest, handle_input, parse_input, upsert_pr_into_user_queue,
     };
     use crate::tests::github::{default_test_user, issue, pull_request, user};
-    use crate::tests::{run_db_test, TestContext};
+    use crate::tests::{TestContext, run_db_test};
 
     #[tokio::test]
     async fn add_pr_to_workqueue_on_assign() {
diff --git a/src/handlers/relabel.rs b/src/handlers/relabel.rs
@@ -185,7 +185,7 @@ fn match_pattern(pattern: &str, label: &str) -> anyhow::Result<MatchPatternResul
 #[cfg(test)]
 mod tests {
     use super::{
-        check_filter, match_pattern, CheckFilterResult, MatchPatternResult, TeamMembership,
+        CheckFilterResult, MatchPatternResult, TeamMembership, check_filter, match_pattern,
     };
     use crate::config::RelabelConfig;
 
diff --git a/src/handlers/types_planning_updates.rs b/src/handlers/types_planning_updates.rs
@@ -28,10 +28,12 @@ impl Job for TypesPlanningMeetingThreadOpenJob {
             return Ok(());
         }
         let meeting_date_string = first_monday.format("%Y-%m-%d").to_string();
-        let message = format!("\
+        let message = format!(
+            "\
             Hello @*T-types/meetings*. Monthly planning meeting in one week.\n\
             This is a reminder to update the current [roadmap tracking issues](https://github.com/rust-lang/types-team/issues?q=is%3Aissue+is%3Aopen+label%3Aroadmap-tracking-issue).\n\
-            Extra reminders will be sent later this week.");
+            Extra reminders will be sent later this week."
+        );
         let zulip_req = crate::zulip::MessageApiRequest {
             recipient: Recipient::Stream {
                 id: TYPES_MEETINGS_STREAM,
diff --git a/src/handlers/validate_config.rs b/src/handlers/validate_config.rs
@@ -3,7 +3,7 @@
 //! It won't validate anything unless the PR is open and has changed.
 
 use crate::{
-    config::{ValidateConfig, CONFIG_FILE_NAME},
+    config::{CONFIG_FILE_NAME, ValidateConfig},
     github::IssuesAction,
     handlers::{Context, IssuesEvent},
 };
diff --git a/src/jobs.rs b/src/jobs.rs
@@ -50,8 +50,8 @@ use crate::handlers::pull_requests_assignment_update::PullRequestAssignmentUpdat
 use crate::{
     db::jobs::JobSchedule,
     handlers::{
-        docs_update::DocsUpdateJob, major_change::MajorChangeAcceptenceJob,
-        rustc_commits::RustcCommitsJob, Context,
+        Context, docs_update::DocsUpdateJob, major_change::MajorChangeAcceptenceJob,
+        rustc_commits::RustcCommitsJob,
     },
 };
 
diff --git a/src/main.rs b/src/main.rs
@@ -1,9 +1,9 @@
 #![allow(clippy::new_without_default)]
 
 use anyhow::Context as _;
-use futures::future::FutureExt;
 use futures::StreamExt;
-use hyper::{header, Body, Request, Response, Server, StatusCode};
+use futures::future::FutureExt;
+use hyper::{Body, Request, Response, Server, StatusCode, header};
 use route_recognizer::Router;
 use std::time::Duration;
 use std::{env, net::SocketAddr, sync::Arc};
@@ -12,14 +12,14 @@ use tokio::{task, time};
 use tower::{Service, ServiceExt};
 use tracing as log;
 use tracing::Instrument;
-use triagebot::handlers::pr_tracking::load_workqueue;
 use triagebot::handlers::pr_tracking::ReviewerWorkqueue;
+use triagebot::handlers::pr_tracking::load_workqueue;
 use triagebot::jobs::{
-    default_jobs, JOB_PROCESSING_CADENCE_IN_SECS, JOB_SCHEDULING_CADENCE_IN_SECS,
+    JOB_PROCESSING_CADENCE_IN_SECS, JOB_SCHEDULING_CADENCE_IN_SECS, default_jobs,
 };
 use triagebot::team_data::TeamClient;
 use triagebot::zulip::client::ZulipClient;
-use triagebot::{db, github, handlers::Context, notification_listing, payload, EventName};
+use triagebot::{EventName, db, github, handlers::Context, notification_listing, payload};
 
 async fn handle_agenda_request(req: String) -> anyhow::Result<String> {
     if req == "/agenda/lang/triage" {
@@ -78,13 +78,13 @@ async fn serve_req(
                 return Ok(Response::builder()
                     .status(StatusCode::OK)
                     .body(Body::from(agenda))
-                    .unwrap())
+                    .unwrap());
             }
             Err(err) => {
                 return Ok(Response::builder()
                     .status(StatusCode::INTERNAL_SERVER_ERROR)
                     .body(Body::from(err.to_string()))
-                    .unwrap())
+                    .unwrap());
             }
         }
     }
diff --git a/src/team_data.rs b/src/team_data.rs
@@ -1,5 +1,5 @@
 use reqwest::Client;
-use rust_team_data::v1::{People, Teams, ZulipMapping, BASE_URL};
+use rust_team_data::v1::{BASE_URL, People, Teams, ZulipMapping};
 use serde::de::DeserializeOwned;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
@@ -1,6 +1,6 @@
 use crate::db;
 use crate::db::users::record_username;
-use crate::db::{make_client, ClientPool, PooledClient};
+use crate::db::{ClientPool, PooledClient, make_client};
 use crate::github::GithubClient;
 use crate::handlers::Context;
 use crate::team_data::TeamClient;
@@ -9,8 +9,8 @@ use octocrab::Octocrab;
 use std::future::Future;
 use std::sync::Arc;
 use tokio::sync::RwLock;
-use tokio_postgres::config::Host;
 use tokio_postgres::Config;
+use tokio_postgres::config::Host;
 
 pub(crate) mod github;
 
diff --git a/src/triage.rs b/src/triage.rs
@@ -2,7 +2,7 @@ use crate::handlers::Context;
 use chrono::{Duration, Utc};
 use hyper::{Body, Response, StatusCode};
 use serde::Serialize;
-use serde_json::value::{to_value, Value};
+use serde_json::value::{Value, to_value};
 use std::sync::Arc;
 use url::Url;
 
diff --git a/src/zulip.rs b/src/zulip.rs
diff --git a/src/zulip/client.rs b/src/zulip/client.rs

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,8 @@ pub async fn make_client(db_url: &str) -> anyhow::Result<tokio_postgres::Client>`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`fn make_certificates() -> Vec<Certificate> {`
`135`		`- use x509_cert::der::pem::LineEnding;`
`136`	`135`	`use x509_cert::der::EncodePem;`
	`136`	`+ use x509_cert::der::pem::LineEnding;`
`137`	`137`
`138`	`138`	`let certs = x509_cert::Certificate::load_pem_chain(&CERTIFICATE_PEMS[..]).unwrap();`
`139`	`139`	`certs`