backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 15:21:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix new lints from clippy 0.1.85

Browse source
This commit is contained in:
Olivia Lee 2025-07-20 12:51:25 -07:00 • committed by Charles Hall
parent e65815c82e
commit fb4d168921
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/client_server/sync/msc3575.rs
View file

@ -148,8 +148,8 @@ pub(crate) async fn sync_events_v4_route(
"",
)?;
let joined_since_last_sync = since_sender_member
.map_or(true, |member| {
let joined_since_last_sync =
since_sender_member.is_none_or(|member| {
member.membership != MembershipState::Join
});

2
src/api/client_server/sync/v3.rs
View file

@ -495,7 +495,7 @@ async fn load_joined_room(
});
let joined_since_last_sync = since_sender_member
.map_or(true, |member| member.membership != MembershipState::Join);
.is_none_or(|member| member.membership != MembershipState::Join);
if since_shortstatehash.is_none() || joined_since_last_sync {
// Probably since = 0, we will do an initial sync

2
src/database/key_value/pusher.rs
View file

@ -27,7 +27,7 @@ impl service::pusher::Data for KeyValueDatabase {
let mut key = sender.as_bytes().to_vec();
key.push(0xFF);
key.extend_from_slice(ids.pushkey.as_bytes());
self.senderkey_pusher.remove(&key).map_err(Into::into)
self.senderkey_pusher.remove(&key)
}
}
}

2
src/observability.rs
View file

@ -555,5 +555,5 @@ pub(crate) fn init_for_cli(
let subscriber = Registry::default().with(log_layer);
tracing::subscriber::set_global_default(subscriber).map_err(Into::into)
tracing::subscriber::set_global_default(subscriber)
}

8
src/service/rooms/pdu_metadata.rs
View file

@ -72,13 +72,13 @@ impl Service {
r.as_ref().map_or(true, |(_, pdu)| {
filter_event_type
.as_ref()
.map_or(true, |t| &&pdu.kind == t)
.is_none_or(|t| &&pdu.kind == t)
&& if let Ok(content) = serde_json::from_str::<
ExtractRelatesToEventId,
>(
pdu.content.get()
) {
filter_rel_type.as_ref().map_or(true, |r| {
filter_rel_type.as_ref().is_none_or(|r| {
&&content.relates_to.rel_type == r
})
} else {
@ -127,13 +127,13 @@ impl Service {
r.as_ref().map_or(true, |(_, pdu)| {
filter_event_type
.as_ref()
.map_or(true, |t| &&pdu.kind == t)
.is_none_or(|t| &&pdu.kind == t)
&& if let Ok(content) = serde_json::from_str::<
ExtractRelatesToEventId,
>(
pdu.content.get()
) {
filter_rel_type.as_ref().map_or(true, |r| {
filter_rel_type.as_ref().is_none_or(|r| {
&&content.relates_to.rel_type == r
})
} else {

2
src/service/rooms/spaces.rs
View file

@ -148,7 +148,7 @@ impl Service {
)
.ok()
.map(|c| c.via)
.map_or(true, |v| v.is_empty())
.is_none_or(|v| v.is_empty())
{
continue;
}