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/test/fixtures/cookie.rs |  2 +-
 src/test/fixtures/event.rs  |  6 +++---
 src/test/fixtures/future.rs | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/test/fixtures')

diff --git a/src/test/fixtures/cookie.rs b/src/test/fixtures/cookie.rs
index 58777c8..fcb379f 100644
--- a/src/test/fixtures/cookie.rs
+++ b/src/test/fixtures/cookie.rs
@@ -5,7 +5,7 @@ use crate::{
     clock::RequestedAt,
     login::Password,
     name::Name,
-    token::{extract::IdentityCookie, Secret},
+    token::{Secret, extract::IdentityCookie},
 };
 
 pub fn not_logged_in() -> IdentityCookie {
diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
index de02d4d..e11f6ee 100644
--- a/src/test/fixtures/event.rs
+++ b/src/test/fixtures/event.rs
@@ -26,8 +26,8 @@ pub fn login(event: Event) -> Ready<Option<login::Event>> {
 pub mod channel {
     use std::future::{self, Ready};
 
-    use crate::channel::event;
     pub use crate::channel::Event;
+    use crate::channel::event;
 
     pub fn created(event: Event) -> Ready<Option<event::Created>> {
         future::ready(match event {
@@ -47,8 +47,8 @@ pub mod channel {
 pub mod message {
     use std::future::{self, Ready};
 
-    use crate::message::event;
     pub use crate::message::Event;
+    use crate::message::event;
 
     pub fn sent(event: Event) -> Ready<Option<event::Sent>> {
         future::ready(match event {
@@ -68,8 +68,8 @@ pub mod message {
 pub mod login {
     use std::future::{self, Ready};
 
-    use crate::login::event;
     pub use crate::login::Event;
+    use crate::login::event;
 
     pub fn created(event: Event) -> Ready<Option<event::Created>> {
         future::ready(match event {
diff --git a/src/test/fixtures/future.rs b/src/test/fixtures/future.rs
index 2f810a3..c0fa528 100644
--- a/src/test/fixtures/future.rs
+++ b/src/test/fixtures/future.rs
@@ -52,7 +52,7 @@ pub trait Expect: Sized {
         Self: Future<Output = Option<T>>;
 }
 
-impl<'a, St> Expect for stream::Next<'a, St> {
+impl<St> Expect for stream::Next<'_, St> {
     fn expect_ready(self, message: &str) -> Ready<Self> {
         Ready {
             future: self,
@@ -131,7 +131,7 @@ pub struct Ready<'m, F> {
     message: &'m str,
 }
 
-impl<'m, F> Future for Ready<'m, F>
+impl<F> Future for Ready<'_, F>
 where
     F: Future + std::fmt::Debug,
 {
@@ -155,7 +155,7 @@ pub struct Wait<'m, F> {
     message: &'m str,
 }
 
-impl<'m, F> Future for Wait<'m, F>
+impl<F> Future for Wait<'_, F>
 where
     F: Future + std::fmt::Debug,
 {
@@ -179,7 +179,7 @@ pub struct Some<'m, F> {
     message: &'m str,
 }
 
-impl<'m, F, T> Future for Some<'m, F>
+impl<F, T> Future for Some<'_, F>
 where
     F: Future<Output = Option<T>> + std::fmt::Debug,
 {
@@ -203,7 +203,7 @@ pub struct None<'m, F> {
     message: &'m str,
 }
 
-impl<'m, F, T> Future for None<'m, F>
+impl<F, T> Future for None<'_, F>
 where
     F: Future<Output = Option<T>> + std::fmt::Debug,
 {
-- 
cgit v1.2.3