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/message/repo.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/message/repo.rs')

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,
-- 
cgit v1.2.3