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/channel/history.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/channel/history.rs')
| -rw-r--r-- | src/channel/history.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/channel/history.rs b/src/channel/history.rs index ef2120d..4af46ce 100644 --- a/src/channel/history.rs +++ b/src/channel/history.rs @@ -1,8 +1,8 @@ use itertools::Itertools as _; use super::{ - event::{Created, Deleted, Event}, Channel, Id, + event::{Created, Deleted, Event}, }; use crate::event::{Instant, Sequence}; @@ -42,7 +42,7 @@ impl History { // Event factories impl History { - pub fn events(&self) -> impl Iterator<Item = Event> { + pub fn events(&self) -> impl Iterator<Item = Event> + use<> { [self.created()] .into_iter() .merge_by(self.deleted(), Sequence::merge) |