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/token.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/token/repo/token.rs') diff --git a/src/token/repo/token.rs b/src/token/repo/token.rs index 33b89d5..ff42fad 100644 --- a/src/token/repo/token.rs +++ b/src/token/repo/token.rs @@ -1,4 +1,4 @@ -use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction}; +use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite}; use uuid::Uuid; use crate::{ @@ -14,7 +14,7 @@ pub trait Provider { fn tokens(&mut self) -> Tokens; } -impl<'c> Provider for Transaction<'c, Sqlite> { +impl Provider for Transaction<'_, Sqlite> { fn tokens(&mut self) -> Tokens { Tokens(self) } @@ -22,7 +22,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> { pub struct Tokens<'t>(&'t mut SqliteConnection); -impl<'c> Tokens<'c> { +impl Tokens<'_> { // Issue a new token for an existing login. The issued_at timestamp will // be used to control expiry, until the token is actually used. pub async fn issue( -- cgit v1.2.3