summaryrefslogtreecommitdiff
path: root/src/invite
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2025-02-20 21:37:33 -0500
committerOwen Jacobson <owen@grimoire.ca>2025-02-20 22:35:25 -0500
commit70525c018dfd31a27805bb1fb666501b73d43e21 (patch)
tree348a78e6a1c5f1dcc0b788e4c177732f33609610 /src/invite
parentd0cc34800243807dc1e4d352375566fde3b0f950 (diff)
Upgrade to Rust 1.85 and Rust 2024 edition.
There are a couple of migration suggestions from `cargo fix --edition` that I have deliberately skipped, which are intended to make sure that the changes to `if let` scoping don't bite us. They don't, I'm pretty sure, and if I turn out to be wrong, I'd rather fix the scoping issues (as they arise) than use `match` (`cargo fix --edition`'s suggestion). This change also includes a bulk reformat and a clippy cleanup. NOTA BENE: As this requires a new Rust toolchain, you'll need to update Rust (`rustup update`, normally) or the server won't build. This also applies to the Debian builder Docker image; it'll need to be rebuilt (from scratch, pulling its base image again) as well.
Diffstat (limited to 'src/invite')
-rw-r--r--src/invite/app.rs6
-rw-r--r--src/invite/repo.rs6
-rw-r--r--src/invite/routes/mod.rs2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/invite/app.rs b/src/invite/app.rs
index d4e877a..c56c9b3 100644
--- a/src/invite/app.rs
+++ b/src/invite/app.rs
@@ -1,17 +1,17 @@
use chrono::TimeDelta;
use sqlx::sqlite::SqlitePool;
-use super::{repo::Provider as _, Id, Invite, Summary};
+use super::{Id, Invite, Summary, repo::Provider as _};
use crate::{
clock::DateTime,
db::{Duplicate as _, NotFound as _},
event::Broadcaster,
login::{
- create::{self, Create},
Login, Password,
+ create::{self, Create},
},
name::Name,
- token::{repo::Provider as _, Secret},
+ token::{Secret, repo::Provider as _},
};
pub struct Invites<'a> {
diff --git a/src/invite/repo.rs b/src/invite/repo.rs
index 5f86e49..c1dc701 100644
--- a/src/invite/repo.rs
+++ b/src/invite/repo.rs
@@ -1,4 +1,4 @@
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
+use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
use super::{Id, Invite, Summary};
use crate::{
@@ -11,7 +11,7 @@ pub trait Provider {
fn invites(&mut self) -> Invites;
}
-impl<'c> Provider for Transaction<'c, Sqlite> {
+impl Provider for Transaction<'_, Sqlite> {
fn invites(&mut self) -> Invites {
Invites(self)
}
@@ -19,7 +19,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> {
pub struct Invites<'t>(&'t mut SqliteConnection);
-impl<'c> Invites<'c> {
+impl Invites<'_> {
pub async fn create(
&mut self,
issuer: &Login,
diff --git a/src/invite/routes/mod.rs b/src/invite/routes/mod.rs
index a25dcd9..d83efc6 100644
--- a/src/invite/routes/mod.rs
+++ b/src/invite/routes/mod.rs
@@ -1,6 +1,6 @@
use axum::{
- routing::{get, post},
Router,
+ routing::{get, post},
};
use crate::app::App;