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/event/routes/get.rs         |  5 ++---
 src/event/routes/mod.rs         |  2 +-
 src/event/routes/test/resume.rs | 26 ++++++++++++++++----------
 3 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'src/event/routes')

diff --git a/src/event/routes/get.rs b/src/event/routes/get.rs
index ceebcc9..2ca8991 100644
--- a/src/event/routes/get.rs
+++ b/src/event/routes/get.rs
@@ -1,9 +1,8 @@
 use axum::{
     extract::State,
     response::{
-        self,
+        self, IntoResponse,
         sse::{self, Sse},
-        IntoResponse,
     },
 };
 use axum_extra::extract::Query;
@@ -12,7 +11,7 @@ use futures::stream::{Stream, StreamExt as _};
 use crate::{
     app::App,
     error::{Internal, Unauthorized},
-    event::{app, extract::LastEventId, Event, Sequence, Sequenced as _},
+    event::{Event, Sequence, Sequenced as _, app, extract::LastEventId},
     token::{app::ValidateError, extract::Identity},
 };
 
diff --git a/src/event/routes/mod.rs b/src/event/routes/mod.rs
index 57ab9db..742d397 100644
--- a/src/event/routes/mod.rs
+++ b/src/event/routes/mod.rs
@@ -1,4 +1,4 @@
-use axum::{routing::get, Router};
+use axum::{Router, routing::get};
 
 use crate::app::App;
 
diff --git a/src/event/routes/test/resume.rs b/src/event/routes/test/resume.rs
index fabda0c..dc27691 100644
--- a/src/event/routes/test/resume.rs
+++ b/src/event/routes/test/resume.rs
@@ -5,7 +5,7 @@ use axum_extra::extract::Query;
 use futures::stream::{self, StreamExt as _};
 
 use crate::{
-    event::{routes::get, Sequenced as _},
+    event::{Sequenced as _, routes::get},
     test::fixtures::{self, future::Expect as _},
 };
 
@@ -132,9 +132,11 @@ async fn serial_resume() {
             .expect_ready("zipping a finite list of events is ready immediately")
             .await;
 
-        assert!(events
-            .iter()
-            .all(|(event, message)| message == &event.message));
+        assert!(
+            events
+                .iter()
+                .all(|(event, message)| message == &event.message)
+        );
 
         let (event, _) = events.last().expect("this vec is non-empty");
 
@@ -173,9 +175,11 @@ async fn serial_resume() {
             .expect_ready("zipping a finite list of events is ready immediately")
             .await;
 
-        assert!(events
-            .iter()
-            .all(|(event, message)| message == &event.message));
+        assert!(
+            events
+                .iter()
+                .all(|(event, message)| message == &event.message)
+        );
 
         let (event, _) = events.last().expect("this vec is non-empty");
 
@@ -214,8 +218,10 @@ async fn serial_resume() {
             .expect_ready("zipping a finite list of events is ready immediately")
             .await;
 
-        assert!(events
-            .iter()
-            .all(|(event, message)| message == &event.message));
+        assert!(
+            events
+                .iter()
+                .all(|(event, message)| message == &event.message)
+        );
     };
 }
-- 
cgit v1.2.3