From 70525c018dfd31a27805bb1fb666501b73d43e21 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Thu, 20 Feb 2025 21:37:33 -0500
Subject: 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.
---
 src/setup/app.rs        | 4 ++--
 src/setup/repo.rs       | 6 +++---
 src/setup/routes/mod.rs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/setup')

diff --git a/src/setup/app.rs b/src/setup/app.rs
index c1f7b69..9553f40 100644
--- a/src/setup/app.rs
+++ b/src/setup/app.rs
@@ -5,11 +5,11 @@ use crate::{
     clock::DateTime,
     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 Setup<'a> {
diff --git a/src/setup/repo.rs b/src/setup/repo.rs
index de93f51..ac01496 100644
--- a/src/setup/repo.rs
+++ b/src/setup/repo.rs
@@ -1,10 +1,10 @@
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
+use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
 
 pub trait Provider {
     fn setup(&mut self) -> Setup;
 }
 
-impl<'c> Provider for Transaction<'c, Sqlite> {
+impl Provider for Transaction<'_, Sqlite> {
     fn setup(&mut self) -> Setup {
         Setup(self)
     }
@@ -12,7 +12,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> {
 
 pub struct Setup<'t>(&'t mut SqliteConnection);
 
-impl<'c> Setup<'c> {
+impl Setup<'_> {
     pub async fn completed(&mut self) -> Result<bool, sqlx::Error> {
         let completed = sqlx::query_scalar!(
             r#"
diff --git a/src/setup/routes/mod.rs b/src/setup/routes/mod.rs
index 6054983..977a790 100644
--- a/src/setup/routes/mod.rs
+++ b/src/setup/routes/mod.rs
@@ -1,4 +1,4 @@
-use axum::{routing::post, Router};
+use axum::{Router, routing::post};
 
 use crate::app::App;
 
-- 
cgit v1.2.3