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/token/app.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/token/app.rs')

diff --git a/src/token/app.rs b/src/token/app.rs
index 5c0aeb0..3f054ff 100644
--- a/src/token/app.rs
+++ b/src/token/app.rs
@@ -1,19 +1,18 @@
 use chrono::TimeDelta;
 use futures::{
-    future,
+    Stream, future,
     stream::{self, StreamExt as _},
-    Stream,
 };
 use sqlx::sqlite::SqlitePool;
 
 use super::{
-    repo::{self, auth::Provider as _, Provider as _},
     Broadcaster, Event as TokenEvent, Id, Secret,
+    repo::{self, Provider as _, auth::Provider as _},
 };
 use crate::{
     clock::DateTime,
     db::NotFound as _,
-    login::{repo::Provider as _, Login, Password},
+    login::{Login, Password, repo::Provider as _},
     name::{self, Name},
 };
 
@@ -120,12 +119,13 @@ impl<'a> Tokens<'a> {
         Ok((token, login))
     }
 
-    pub async fn limit_stream<E>(
+    pub async fn limit_stream<S, E>(
         &self,
         token: Id,
-        events: impl Stream<Item = E> + std::fmt::Debug,
-    ) -> Result<impl Stream<Item = E> + std::fmt::Debug, ValidateError>
+        events: S,
+    ) -> Result<impl Stream<Item = E> + std::fmt::Debug + use<S, E>, ValidateError>
     where
+        S: Stream<Item = E> + std::fmt::Debug,
         E: std::fmt::Debug,
     {
         // Subscribe, first.
-- 
cgit v1.2.3