summaryrefslogtreecommitdiff
path: root/src/message/history.rs
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2025-02-20 21:37:33 -0500
committerOwen Jacobson <owen@grimoire.ca>2025-02-20 22:35:25 -0500
commit70525c018dfd31a27805bb1fb666501b73d43e21 (patch)
tree348a78e6a1c5f1dcc0b788e4c177732f33609610 /src/message/history.rs
parentd0cc34800243807dc1e4d352375566fde3b0f950 (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/message/history.rs')
-rw-r--r--src/message/history.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/message/history.rs b/src/message/history.rs
index ed8f5df..1a72c08 100644
--- a/src/message/history.rs
+++ b/src/message/history.rs
@@ -1,8 +1,8 @@
use itertools::Itertools as _;
use super::{
- event::{Deleted, Event, Sent},
Id, Message,
+ event::{Deleted, Event, Sent},
};
use crate::event::{Instant, Sequence};
@@ -58,7 +58,7 @@ impl History {
})
}
- pub fn events(&self) -> impl Iterator<Item = Event> {
+ pub fn events(&self) -> impl Iterator<Item = Event> + use<> {
[self.sent()]
.into_iter()
.merge_by(self.deleted(), Sequence::merge)