From 70525c018dfd31a27805bb1fb666501b73d43e21 Mon Sep 17 00:00:00 2001 From: Owen Jacobson 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/token/repo/auth.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/token/repo/auth.rs') diff --git a/src/token/repo/auth.rs b/src/token/repo/auth.rs index b51db8c..0deed10 100644 --- a/src/token/repo/auth.rs +++ b/src/token/repo/auth.rs @@ -1,10 +1,10 @@ -use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction}; +use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite}; use crate::{ clock::DateTime, db::NotFound, event::{Instant, Sequence}, - login::{self, password::StoredHash, History, Login}, + login::{self, History, Login, password::StoredHash}, name::{self, Name}, }; @@ -12,7 +12,7 @@ pub trait Provider { fn auth(&mut self) -> Auth; } -impl<'c> Provider for Transaction<'c, Sqlite> { +impl Provider for Transaction<'_, Sqlite> { fn auth(&mut self) -> Auth { Auth(self) } @@ -20,7 +20,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> { pub struct Auth<'t>(&'t mut SqliteConnection); -impl<'t> Auth<'t> { +impl Auth<'_> { pub async fn for_name(&mut self, name: &Name) -> Result<(History, StoredHash), LoadError> { let name = name.canonical(); let row = sqlx::query!( -- cgit v1.2.3