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, 11 insertions, 11 deletions

diff --git a/src/message/app.rs b/src/message/app.rs
index 7bf68d1..60206f1 100644
--- a/src/message/app.rs
+++ b/src/message/app.rs
@@ -2,12 +2,12 @@ use chrono::TimeDelta;
 use itertools::Itertools;
 use sqlx::sqlite::SqlitePool;
 
-use super::{repo::Provider as _, Body, Id, Message};
+use super::{Body, Id, Message, repo::Provider as _};
 use crate::{
     channel::{self, repo::Provider as _},
     clock::DateTime,
     db::NotFound as _,
-    event::{repo::Provider as _, Broadcaster, Event, Sequence},
+    event::{Broadcaster, Event, Sequence, repo::Provider as _},
     login::Login,
     name,
 };
diff --git a/src/message/event.rs b/src/message/event.rs
index 1cd5847..bd116b1 100644
--- a/src/message/event.rs
+++ b/src/message/event.rs
@@ -1,4 +1,4 @@
-use super::{snapshot::Message, Id};
+use super::{Id, snapshot::Message};
 use crate::event::{Instant, Sequenced};
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
diff --git a/src/message/history.rs b/src/message/history.rs
index ed8f5df..1a72c08 100644
--- a/src/message/history.rs
+++ b/src/message/history.rs
@@ -1,8 +1,8 @@
 use itertools::Itertools as _;
 
 use super::{
-    event::{Deleted, Event, Sent},
     Id, Message,
+    event::{Deleted, Event, Sent},
 };
 use crate::event::{Instant, Sequence};
 
@@ -58,7 +58,7 @@ impl History {
         })
     }
 
-    pub fn events(&self) -> impl Iterator<Item = Event> {
+    pub fn events(&self) -> impl Iterator<Item = Event> + use<> {
         [self.sent()]
             .into_iter()
             .merge_by(self.deleted(), Sequence::merge)
diff --git a/src/message/repo.rs b/src/message/repo.rs
index 14f8eaf..8a0a72c 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -1,6 +1,6 @@
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
+use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
 
-use super::{snapshot::Message, Body, History, Id};
+use super::{Body, History, Id, snapshot::Message};
 use crate::{
     channel,
     clock::DateTime,
@@ -12,7 +12,7 @@ pub trait Provider {
     fn messages(&mut self) -> Messages;
 }
 
-impl<'c> Provider for Transaction<'c, Sqlite> {
+impl Provider for Transaction<'_, Sqlite> {
     fn messages(&mut self) -> Messages {
         Messages(self)
     }
@@ -20,7 +20,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> {
 
 pub struct Messages<'t>(&'t mut SqliteConnection);
 
-impl<'c> Messages<'c> {
+impl Messages<'_> {
     pub async fn create(
         &mut self,
         channel: &channel::History,
diff --git a/src/message/routes/mod.rs b/src/message/routes/mod.rs
index 85c192f..00b2b1a 100644
--- a/src/message/routes/mod.rs
+++ b/src/message/routes/mod.rs
@@ -1,4 +1,4 @@
-use axum::{routing::delete, Router};
+use axum::{Router, routing::delete};
 
 use crate::app::App;
 
diff --git a/src/message/snapshot.rs b/src/message/snapshot.rs
index 53b7176..d924ea1 100644
--- a/src/message/snapshot.rs
+++ b/src/message/snapshot.rs
@@ -1,6 +1,6 @@
 use super::{
-    event::{Event, Sent},
     Body, Id,
+    event::{Event, Sent},
 };
 use crate::{channel, clock::DateTime, event::Instant, login};