Skip to content

Commit b19e02c

Browse files
authored
Merge pull request #2080 from Urgau/edition-2024
Migrate to 2024 edition
2 parents 5dbb7d1 + 401f571 commit b19e02c

25 files changed

+80
-58
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name = "triagebot"
33
version = "0.1.0"
44
authors = ["Mark Rousskov <mark.simulacrum@gmail.com>"]
5-
edition = "2021"
6-
rust-version = "1.80.0"
5+
edition = "2024"
6+
rust-version = "1.85.0"
77

88
[workspace]
99

src/changelogs/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mod rustc;
22

3-
use comrak::{nodes::AstNode, Arena, ComrakOptions, ComrakRenderOptions};
3+
use comrak::{Arena, ComrakOptions, ComrakRenderOptions, nodes::AstNode};
44
use std::collections::HashMap;
55

66
#[derive(Copy, Clone, PartialEq, Eq, Debug, serde::Deserialize)]

src/changelogs/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use super::Changelog;
22
use anyhow::Context as _;
33
use comrak::{
4-
nodes::{AstNode, NodeHeading, NodeValue},
54
Arena, ComrakOptions,
5+
nodes::{AstNode, NodeHeading, NodeValue},
66
};
77
use std::collections::HashMap;
88

src/db.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ pub async fn make_client(db_url: &str) -> anyhow::Result<tokio_postgres::Client>
132132
}
133133

134134
fn make_certificates() -> Vec<Certificate> {
135-
use x509_cert::der::pem::LineEnding;
136135
use x509_cert::der::EncodePem;
136+
use x509_cert::der::pem::LineEnding;
137137

138138
let certs = x509_cert::Certificate::load_pem_chain(&CERTIFICATE_PEMS[..]).unwrap();
139139
certs

src/db/review_prefs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::db::users::record_username;
22
use crate::github::{User, UserId};
33
use anyhow::Context;
44
use bytes::BytesMut;
5-
use postgres_types::{to_sql_checked, FromSql, IsNull, ToSql, Type};
5+
use postgres_types::{FromSql, IsNull, ToSql, Type, to_sql_checked};
66
use std::collections::HashMap;
77
use std::error::Error;
88

@@ -171,7 +171,7 @@ SET max_assigned_prs = excluded.max_assigned_prs,
171171

172172
#[cfg(test)]
173173
mod tests {
174-
use crate::db::review_prefs::{get_review_prefs, upsert_review_prefs, RotationMode};
174+
use crate::db::review_prefs::{RotationMode, get_review_prefs, upsert_review_prefs};
175175
use crate::db::users::get_user;
176176
use crate::tests::github::user;
177177
use crate::tests::run_db_test;

src/github.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::team_data::TeamClient;
2-
use anyhow::{anyhow, Context};
2+
use anyhow::{Context, anyhow};
33
use async_trait::async_trait;
44
use bytes::Bytes;
55
use chrono::{DateTime, FixedOffset, Utc};
6-
use futures::{future::BoxFuture, FutureExt};
6+
use futures::{FutureExt, future::BoxFuture};
77
use octocrab::models::{Author, AuthorAssociation};
88
use regex::Regex;
99
use reqwest::header::{AUTHORIZATION, USER_AGENT};
@@ -2649,9 +2649,9 @@ impl GithubClient {
26492649
.await
26502650
{
26512651
Ok(c) => {
2652-
if let Some(c) = c["data"]["repository"]["defaultBranchRef"]["target"]["history"]
2653-
["totalCount"]
2654-
.as_i64()
2652+
if let Some(c) =
2653+
c["data"]["repository"]["defaultBranchRef"]["target"]["history"]["totalCount"]
2654+
.as_i64()
26552655
{
26562656
return c == 0;
26572657
}

src/handlers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::handlers::pr_tracking::ReviewerWorkqueue;
44
use crate::team_data::TeamClient;
55
use crate::zulip::client::ZulipClient;
66
use octocrab::Octocrab;
7-
use parser::command::{assign::AssignCommand, Command, Input};
7+
use parser::command::{Command, Input, assign::AssignCommand};
88
use std::fmt;
99
use std::sync::Arc;
1010
use tracing as log;

src/handlers/assign.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
//! the PR modifies.
2222
2323
use crate::db::issue_data::IssueData;
24-
use crate::db::review_prefs::{get_review_prefs_batch, RotationMode};
24+
use crate::db::review_prefs::{RotationMode, get_review_prefs_batch};
2525
use crate::github::UserId;
2626
use crate::handlers::pr_tracking::ReviewerWorkqueue;
2727
use crate::{
@@ -30,7 +30,7 @@ use crate::{
3030
handlers::{Context, GithubClient, IssuesEvent},
3131
interactions::EditIssueBody,
3232
};
33-
use anyhow::{bail, Context as _};
33+
use anyhow::{Context as _, bail};
3434
use octocrab::models::AuthorAssociation;
3535
use parser::command::assign::AssignCommand;
3636
use parser::command::{Command, Input};

src/handlers/assign/tests/tests_candidates.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//! Tests for `candidate_reviewers_from_names`
22
33
use super::super::*;
4-
use crate::db::review_prefs::{upsert_review_prefs, RotationMode};
4+
use crate::db::review_prefs::{RotationMode, upsert_review_prefs};
55
use crate::github::{PullRequestNumber, User};
66
use crate::handlers::pr_tracking::{AssignedPullRequest, ReviewerWorkqueue};
77
use crate::tests::github::{issue, user};
8-
use crate::tests::{run_db_test, TestContext};
8+
use crate::tests::{TestContext, run_db_test};
99

1010
#[must_use]
1111
struct AssignCtx {

src/handlers/check_commits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::collections::HashSet;
22

3-
use anyhow::bail;
43
use anyhow::Context as _;
4+
use anyhow::bail;
55

66
use super::Context;
77
use crate::{

0 commit comments

Comments
 (0)