diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2025-02-20 21:37:33 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2025-02-20 22:35:25 -0500 |
| commit | 70525c018dfd31a27805bb1fb666501b73d43e21 (patch) | |
| tree | 348a78e6a1c5f1dcc0b788e4c177732f33609610 /src/broadcast.rs | |
| parent | d0cc34800243807dc1e4d352375566fde3b0f950 (diff) | |
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.
Diffstat (limited to 'src/broadcast.rs')
| -rw-r--r-- | src/broadcast.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/broadcast.rs b/src/broadcast.rs index bedc263..2792a18 100644 --- a/src/broadcast.rs +++ b/src/broadcast.rs @@ -1,8 +1,8 @@ use std::sync::{Arc, Mutex}; -use futures::{future, stream::StreamExt as _, Stream}; -use tokio::sync::broadcast::{channel, Sender}; -use tokio_stream::wrappers::{errors::BroadcastStreamRecvError, BroadcastStream}; +use futures::{Stream, future, stream::StreamExt as _}; +use tokio::sync::broadcast::{Sender, channel}; +use tokio_stream::wrappers::{BroadcastStream, errors::BroadcastStreamRecvError}; // Clones will share the same sender. #[derive(Clone)] @@ -47,7 +47,7 @@ where // panic: if ``channel`` has not been previously registered, and was not // part of the initial set of channels. - pub fn subscribe(&self) -> impl Stream<Item = M> + std::fmt::Debug { + pub fn subscribe(&self) -> impl Stream<Item = M> + std::fmt::Debug + use<M> { let rx = self.sender().subscribe(); BroadcastStream::from(rx).scan((), |(), r| { |
