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.

6 files changed, 14 insertions, 14 deletions

diff --git a/src/login/app.rs b/src/login/app.rs
index f458561..2da4d6a 100644
--- a/src/login/app.rs
+++ b/src/login/app.rs
@@ -1,8 +1,8 @@
 use sqlx::sqlite::SqlitePool;
 
 use super::{
-    create::{self, Create},
     Login, Password,
+    create::{self, Create},
 };
 use crate::{clock::DateTime, event::Broadcaster, name::Name};
 
diff --git a/src/login/create.rs b/src/login/create.rs
index 693daaf..c4cb2bb 100644
--- a/src/login/create.rs
+++ b/src/login/create.rs
@@ -1,9 +1,9 @@
-use sqlx::{sqlite::Sqlite, Transaction};
+use sqlx::{Transaction, sqlite::Sqlite};
 
-use super::{password::StoredHash, repo::Provider as _, validate, History, Password};
+use super::{History, Password, password::StoredHash, repo::Provider as _, validate};
 use crate::{
     clock::DateTime,
-    event::{repo::Provider as _, Broadcaster, Event},
+    event::{Broadcaster, Event, repo::Provider as _},
     name::Name,
 };
 
@@ -51,9 +51,9 @@ pub struct Validated<'a> {
     created_at: &'a DateTime,
 }
 
-impl<'a> Validated<'a> {
+impl Validated<'_> {
     #[must_use = "dropping a login creation attempt is likely a mistake"]
-    pub async fn store<'c>(self, tx: &mut Transaction<'c, Sqlite>) -> Result<Stored, sqlx::Error> {
+    pub async fn store(self, tx: &mut Transaction<'_, Sqlite>) -> Result<Stored, sqlx::Error> {
         let Self {
             name,
             password_hash,
diff --git a/src/login/history.rs b/src/login/history.rs
index 8161b0b..d67bcce 100644
--- a/src/login/history.rs
+++ b/src/login/history.rs
@@ -1,6 +1,6 @@
 use super::{
-    event::{Created, Event},
     Id, Login,
+    event::{Created, Event},
 };
 use crate::event::{Instant, Sequence};
 
@@ -46,7 +46,7 @@ impl History {
         .into()
     }
 
-    pub fn events(&self) -> impl Iterator<Item = Event> {
+    pub fn events(&self) -> impl Iterator<Item = Event> + use<> {
         [self.created()].into_iter()
     }
 }
diff --git a/src/login/repo.rs b/src/login/repo.rs
index 1c63a4b..03f2c17 100644
--- a/src/login/repo.rs
+++ b/src/login/repo.rs
@@ -1,10 +1,10 @@
 use futures::stream::{StreamExt as _, TryStreamExt as _};
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
+use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
 
 use crate::{
     clock::DateTime,
     event::{Instant, Sequence},
-    login::{password::StoredHash, History, Id, Login},
+    login::{History, Id, Login, password::StoredHash},
     name::{self, Name},
 };
 
@@ -12,7 +12,7 @@ pub trait Provider {
     fn logins(&mut self) -> Logins;
 }
 
-impl<'c> Provider for Transaction<'c, Sqlite> {
+impl Provider for Transaction<'_, Sqlite> {
     fn logins(&mut self) -> Logins {
         Logins(self)
     }
@@ -20,7 +20,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> {
 
 pub struct Logins<'t>(&'t mut SqliteConnection);
 
-impl<'c> Logins<'c> {
+impl Logins<'_> {
     pub async fn create(
         &mut self,
         name: &Name,
diff --git a/src/login/routes/mod.rs b/src/login/routes/mod.rs
index bbd0c3f..ade96cb 100644
--- a/src/login/routes/mod.rs
+++ b/src/login/routes/mod.rs
@@ -1,4 +1,4 @@
-use axum::{routing::post, Router};
+use axum::{Router, routing::post};
 
 use crate::app::App;
 
diff --git a/src/login/snapshot.rs b/src/login/snapshot.rs
index e1eb96c..5c5dce0 100644
--- a/src/login/snapshot.rs
+++ b/src/login/snapshot.rs
@@ -1,6 +1,6 @@
 use super::{
-    event::{Created, Event},
     Id,
+    event::{Created, Event},
 };
 use crate::name::Name;