From be4c48fa11a9e8143d59ea2674bde18d46252878 Mon Sep 17 00:00:00 2001 From: Lambda Date: Thu, 20 Feb 2025 17:16:11 +0000 Subject: [PATCH] Update MSRV to 1.85.0 And appease clippy (`__CARGO_FIX_YOLO=1 cargo clippy --fix`). --- Cargo.toml | 2 +- rust-toolchain.toml | 2 +- src/api/client_server/sync/msc3575.rs | 4 +- src/api/client_server/sync/v3.rs | 2 +- src/database/key_value/pusher.rs | 2 +- src/observability.rs | 2 +- src/service/rooms/pdu_metadata.rs | 90 +++++++++++++-------------- src/service/rooms/spaces.rs | 2 +- 8 files changed, 52 insertions(+), 54 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c9754bb9..6687c855 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ version = "0.1.0" edition = "2021" # See also `rust-toolchain.toml` -rust-version = "1.84.0" +rust-version = "1.85.0" [lints] workspace = true diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 12390a29..a33aee22 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -9,7 +9,7 @@ # If you're having trouble making the relevant changes, bug a maintainer. [toolchain] -channel = "1.84.0" +channel = "1.85.0" components = [ # For rust-analyzer "rust-src", diff --git a/src/api/client_server/sync/msc3575.rs b/src/api/client_server/sync/msc3575.rs index 1de1c7d1..f345b11d 100644 --- a/src/api/client_server/sync/msc3575.rs +++ b/src/api/client_server/sync/msc3575.rs @@ -147,8 +147,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 }); diff --git a/src/api/client_server/sync/v3.rs b/src/api/client_server/sync/v3.rs index 65830053..57367564 100644 --- a/src/api/client_server/sync/v3.rs +++ b/src/api/client_server/sync/v3.rs @@ -498,7 +498,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 diff --git a/src/database/key_value/pusher.rs b/src/database/key_value/pusher.rs index bd80288a..000c9a5d 100644 --- a/src/database/key_value/pusher.rs +++ b/src/database/key_value/pusher.rs @@ -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) } } } diff --git a/src/observability.rs b/src/observability.rs index 44e06c91..0f136306 100644 --- a/src/observability.rs +++ b/src/observability.rs @@ -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) } diff --git a/src/service/rooms/pdu_metadata.rs b/src/service/rooms/pdu_metadata.rs index d3854523..8bb62746 100644 --- a/src/service/rooms/pdu_metadata.rs +++ b/src/service/rooms/pdu_metadata.rs @@ -66,41 +66,40 @@ impl Service { match ruma::api::Direction::Backward { ruma::api::Direction::Forward => { // TODO: should be relations_after - let events_after: Vec<_> = self - .relations_until(sender_user, room_id, target, from)? - .filter(|r| { - r.as_ref().map_or(true, |(_, pdu)| { + let events_after: Vec<_> = + self.relations_until(sender_user, room_id, target, from)? + .filter(|r| { + r.as_ref().map_or(true, |(_, pdu)| { filter_event_type - .as_ref() - .map_or(true, |t| &&pdu.kind == t) + .as_ref().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 { false } }) - }) - .take(limit) - .filter_map(Result::ok) - .filter(|(_, pdu)| { - services() - .rooms - .state_accessor - .user_can_see_event( - sender_user, - room_id, - &pdu.event_id, - ) - .unwrap_or(false) - }) - .take_while(|&(k, _)| Some(k) != to) - .collect(); + }) + .take(limit) + .filter_map(Result::ok) + .filter(|(_, pdu)| { + services() + .rooms + .state_accessor + .user_can_see_event( + sender_user, + room_id, + &pdu.event_id, + ) + .unwrap_or(false) + }) + .take_while(|&(k, _)| Some(k) != to) + .collect(); next_token = events_after.last().map(|(count, _)| count).copied(); @@ -121,41 +120,40 @@ impl Service { }) } ruma::api::Direction::Backward => { - let events_before: Vec<_> = self - .relations_until(sender_user, room_id, target, from)? - .filter(|r| { - r.as_ref().map_or(true, |(_, pdu)| { + let events_before: Vec<_> = + self.relations_until(sender_user, room_id, target, from)? + .filter(|r| { + r.as_ref().map_or(true, |(_, pdu)| { filter_event_type - .as_ref() - .map_or(true, |t| &&pdu.kind == t) + .as_ref().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 { false } }) - }) - .take(limit) - .filter_map(Result::ok) - .filter(|(_, pdu)| { - services() - .rooms - .state_accessor - .user_can_see_event( - sender_user, - room_id, - &pdu.event_id, - ) - .unwrap_or(false) - }) - .take_while(|&(k, _)| Some(k) != to) - .collect(); + }) + .take(limit) + .filter_map(Result::ok) + .filter(|(_, pdu)| { + services() + .rooms + .state_accessor + .user_can_see_event( + sender_user, + room_id, + &pdu.event_id, + ) + .unwrap_or(false) + }) + .take_while(|&(k, _)| Some(k) != to) + .collect(); next_token = events_before.last().map(|(count, _)| count).copied(); diff --git a/src/service/rooms/spaces.rs b/src/service/rooms/spaces.rs index bfcbb072..d3c52b1d 100644 --- a/src/service/rooms/spaces.rs +++ b/src/service/rooms/spaces.rs @@ -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; }