backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update MSRV to 1.85.0

Browse source 
And appease clippy (`__CARGO_FIX_YOLO=1 cargo clippy --fix`).
This commit is contained in:
Lambda 2025-02-20 17:16:11 +00:00
parent 65ec500d75
commit be4c48fa11
8 changed files with 52 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -81,7 +81,7 @@ version = "0.1.0"
edition = "2021" edition = "2021"
# See also `rust-toolchain.toml` # See also `rust-toolchain.toml`
rust-version = "1.84.0" rust-version = "1.85.0"
[lints] [lints]
workspace = true workspace = true

2
rust-toolchain.toml
View file

@ -9,7 +9,7 @@
# If you're having trouble making the relevant changes, bug a maintainer. # If you're having trouble making the relevant changes, bug a maintainer.
[toolchain] [toolchain]
channel = "1.84.0" channel = "1.85.0"
components = [ components = [
# For rust-analyzer # For rust-analyzer
"rust-src", "rust-src",

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

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

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

@ -498,7 +498,7 @@ async fn load_joined_room(
}); });
let joined_since_last_sync = since_sender_member 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 { if since_shortstatehash.is_none() || joined_since_last_sync {
// Probably since = 0, we will do an initial 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(); let mut key = sender.as_bytes().to_vec();
key.push(0xFF); key.push(0xFF);
key.extend_from_slice(ids.pushkey.as_bytes()); 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); let subscriber = Registry::default().with(log_layer);
tracing::subscriber::set_global_default(subscriber).map_err(Into::into) tracing::subscriber::set_global_default(subscriber)
} }

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

@ -66,41 +66,40 @@ impl Service {
match ruma::api::Direction::Backward { match ruma::api::Direction::Backward {
ruma::api::Direction::Forward => { ruma::api::Direction::Forward => {
// TODO: should be relations_after // TODO: should be relations_after
let events_after: Vec<_> = self let events_after: Vec<_> =
.relations_until(sender_user, room_id, target, from)? self.relations_until(sender_user, room_id, target, from)?
.filter(|r| { .filter(|r| {
r.as_ref().map_or(true, |(_, pdu)| { r.as_ref().map_or(true, |(_, pdu)| {
filter_event_type filter_event_type
.as_ref() .as_ref().is_none_or(|t| &&pdu.kind == t)
.map_or(true, |t| &&pdu.kind == t)
&& if let Ok(content) = serde_json::from_str::< && if let Ok(content) = serde_json::from_str::<
ExtractRelatesToEventId, ExtractRelatesToEventId,
>( >(
pdu.content.get() 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 &&content.relates_to.rel_type == r
}) })
} else { } else {
false false
} }
}) })
}) })
.take(limit) .take(limit)
.filter_map(Result::ok) .filter_map(Result::ok)
.filter(|(_, pdu)| { .filter(|(_, pdu)| {
services() services()
.rooms .rooms
.state_accessor .state_accessor
.user_can_see_event( .user_can_see_event(
sender_user, sender_user,
room_id, room_id,
&pdu.event_id, &pdu.event_id,
) )
.unwrap_or(false) .unwrap_or(false)
}) })
.take_while(|&(k, _)| Some(k) != to) .take_while(|&(k, _)| Some(k) != to)
.collect(); .collect();
next_token = next_token =
events_after.last().map(|(count, _)| count).copied(); events_after.last().map(|(count, _)| count).copied();
@ -121,41 +120,40 @@ impl Service {
}) })
} }
ruma::api::Direction::Backward => { ruma::api::Direction::Backward => {
let events_before: Vec<_> = self let events_before: Vec<_> =
.relations_until(sender_user, room_id, target, from)? self.relations_until(sender_user, room_id, target, from)?
.filter(|r| { .filter(|r| {
r.as_ref().map_or(true, |(_, pdu)| { r.as_ref().map_or(true, |(_, pdu)| {
filter_event_type filter_event_type
.as_ref() .as_ref().is_none_or(|t| &&pdu.kind == t)
.map_or(true, |t| &&pdu.kind == t)
&& if let Ok(content) = serde_json::from_str::< && if let Ok(content) = serde_json::from_str::<
ExtractRelatesToEventId, ExtractRelatesToEventId,
>( >(
pdu.content.get() 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 &&content.relates_to.rel_type == r
}) })
} else { } else {
false false
} }
}) })
}) })
.take(limit) .take(limit)
.filter_map(Result::ok) .filter_map(Result::ok)
.filter(|(_, pdu)| { .filter(|(_, pdu)| {
services() services()
.rooms .rooms
.state_accessor .state_accessor
.user_can_see_event( .user_can_see_event(
sender_user, sender_user,
room_id, room_id,
&pdu.event_id, &pdu.event_id,
) )
.unwrap_or(false) .unwrap_or(false)
}) })
.take_while(|&(k, _)| Some(k) != to) .take_while(|&(k, _)| Some(k) != to)
.collect(); .collect();
next_token = next_token =
events_before.last().map(|(count, _)| count).copied(); events_before.last().map(|(count, _)| count).copied();

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

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