Skip to content

Commit 6ac4a84

Browse files
jplatteHywan
authored andcommitted
chore: Prepare matrix-sdk-common for edition 2024
Cherry-picked some changes from cargo fix --edition.
1 parent b585963 commit 6ac4a84

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

crates/matrix-sdk-common/src/linked_chunk/relational.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ where
369369
pub fn unordered_linked_chunk_items<'a>(
370370
&'a self,
371371
target: &OwnedLinkedChunkId,
372-
) -> impl 'a + Iterator<Item = (&'a Item, Position)> {
372+
) -> impl Iterator<Item = (&'a Item, Position)> + use<'a, ItemId, Item, Gap> {
373373
self.items.get(target).into_iter().flat_map(|items| {
374374
// Only keep items which have a position.
375375
items.values().filter_map(|(item, pos)| pos.map(|pos| (item, pos)))

crates/matrix-sdk-common/src/store_locks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ impl<S: BackingStore + Clone + SendOutsideWasm + 'static> CrossProcessStoreLock<
309309
let mut backoff = self.backoff.lock().await;
310310

311311
let wait = match &mut *backoff {
312-
WaitingTime::Some(ref mut val) => {
312+
WaitingTime::Some(val) => {
313313
let wait = *val;
314314
*val = val.saturating_mul(2);
315315
if *val >= max_backoff {

0 commit comments

Comments
 (0)