diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index 38a594fcc..1d4a623f1 100644 --- a/src/api/client/room/upgrade.rs +++ b/src/api/client/room/upgrade.rs @@ -305,8 +305,8 @@ pub(crate) async fn upgrade_room_route( return Err!(Request(Forbidden("Upgrading the admin room this way is not allowed."))); } - // 1. Check that the user has permission to send m.room.tombstone events in the - // room. + // 1. Check that the user has permission to send m.room.tombstone events in + // the room. let old_room_state_lock = services.rooms.state.mutex.lock(body.room_id.as_str()).await; // Check tombstone permission by attempting to create (but not send) the @@ -556,8 +556,8 @@ pub(crate) async fn upgrade_room_route( )?; } - // 5. Send a `m.room.tombstone` event to the old room to indicate that it is not - // intended to be used any further. + // 5. Send a `m.room.tombstone` event to the old room to indicate that it is + // not intended to be used any further. debug!(target=?body.room_id, "Sending tombstone to old room"); services .rooms @@ -598,7 +598,8 @@ pub(crate) async fn upgrade_room_route( power_levels.events_default = new_level; power_levels.invite = new_level; - // 6. Modify the power levels in the old room to prevent sending of events and + // 6. Modify the power levels in the old room to prevent sending of events + // and // inviting new users // Spec dictates that this is allowed to fail. debug!(target=?body.room_id, ?new_level, "Raising power level in old room to lock it"); diff --git a/src/api/client/sync/v3/left.rs b/src/api/client/sync/v3/left.rs index 2e6776284..d5d453da1 100644 --- a/src/api/client/sync/v3/left.rs +++ b/src/api/client/sync/v3/left.rs @@ -74,8 +74,8 @@ pub(super) async fn load_left_room( // return early if: // - this is an initial sync and the room filter doesn't include leaves, or - // - this is an incremental sync, and we've already synced the leave, and the - // room filter doesn't include leaves + // - this is an incremental sync, and we've already synced the leave, and + // the room filter doesn't include leaves if last_sync_end_count.is_none_or(|last_sync_end_count| last_sync_end_count >= left_count) && !filter.room.include_leave { diff --git a/src/core/matrix/state_res/event_auth.rs b/src/core/matrix/state_res/event_auth.rs index 5bd5f8f0e..79408beb9 100644 --- a/src/core/matrix/state_res/event_auth.rs +++ b/src/core/matrix/state_res/event_auth.rs @@ -763,8 +763,8 @@ struct GetThirdPartyInvite { Ok(match target_membership { | MembershipState::Join => { trace!("starting target_membership=join check"); - // 1. If the only previous event is an m.room.create and the state_key is the - // creator, + // 1. If the only previous event is an m.room.create and the + // state_key is the creator, // allow let mut prev_events = current_event.prev_events(); @@ -1052,8 +1052,8 @@ struct GetThirdPartyInvite { allow }, | MembershipState::Knock if room_version.authorization.knocking => { - // 1. If the `join_rule` is anything other than `knock` or `knock_restricted`, - // reject. + // 1. If the `join_rule` is anything other than `knock` or + // `knock_restricted`, reject. if !matches!(join_rules, JoinRule::KnockRestricted(_) | JoinRule::Knock) { warn!( "Join rule is not set to knock or knock_restricted, knocking is not allowed" @@ -1062,8 +1062,8 @@ struct GetThirdPartyInvite { } else if matches!(join_rules, JoinRule::KnockRestricted(_)) && !room_version.authorization.knock_restricted_join_rule { - // 2. If the `join_rule` is `knock_restricted`, but the room does not support - // `knock_restricted`, reject. + // 2. If the `join_rule` is `knock_restricted`, but the room + // does not support `knock_restricted`, reject. warn!( "Join rule is set to knock_restricted but room version does not support \ knock_restricted, knocking is not allowed" @@ -1081,8 +1081,8 @@ struct GetThirdPartyInvite { sender_membership, MembershipState::Ban | MembershipState::Invite | MembershipState::Join ) { - // 4. If the `sender`'s current membership is not `ban`, `invite`, or `join`, - // allow. + // 4. If the `sender`'s current membership is not `ban`, + // `invite`, or `join`, allow. // 5. Otherwise, reject. warn!( ?target_user_membership_event_id, @@ -1175,11 +1175,12 @@ fn check_power_levels( } // - If any of the keys users_default, events_default, state_default, ban, - // redact, kick, or invite in content are present and not an integer, reject. - // - If either of the keys events or notifications in content are present and - // not a dictionary with values that are integers, reject. - // - If users key in content is not a dictionary with keys that are valid user - // IDs with values that are integers, reject. + // redact, kick, or invite in content are present and not an integer, + // reject. + // - If either of the keys events or notifications in content are present + // and not a dictionary with values that are integers, reject. + // - If users key in content is not a dictionary with keys that are valid + // user IDs with values that are integers, reject. let user_content: RoomPowerLevelsEventContent = deserialize_power_levels(power_event.content().get(), room_version)?; diff --git a/src/service/federation/mod.rs b/src/service/federation/mod.rs index e5fbb149d..446516772 100644 --- a/src/service/federation/mod.rs +++ b/src/service/federation/mod.rs @@ -142,8 +142,8 @@ pub fn mark_healthy(&self, server_name: &ServerName) -> bool { /// Returns a rate-limited error if the remote is unhealthy. fn ensure_remote_is_healthy(&self, server_name: &ServerName) -> Result<()> { - // Read the backoff window once. The remote can be marked healthy between two - // lookups. + // Read the backoff window once. The remote can be marked healthy + // between two lookups. let Some(retry_after) = self .retry_after(server_name) .filter(|retry_after| !retry_after.is_zero()) diff --git a/src/service/rooms/event_handler/handle_outlier_pdu.rs b/src/service/rooms/event_handler/handle_outlier_pdu.rs index 4c2cd2d54..ee81a0c04 100644 --- a/src/service/rooms/event_handler/handle_outlier_pdu.rs +++ b/src/service/rooms/event_handler/handle_outlier_pdu.rs @@ -161,8 +161,8 @@ pub async fn handle_outlier_pdu<'a, Pdu>( } } - // 4. Reject "due to auth events" if the event doesn't pass auth based on the - // claimed auth events + // 4. Reject "due to auth events" if the event doesn't pass auth based + // on the claimed auth events debug!("Checking based on auth events"); let mut auth_events_by_key: HashMap<_, _> = HashMap::with_capacity(auth_events.len()); // Build map of auth events diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index 33b8a7001..f966a70c7 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -433,8 +433,9 @@ fn should_attempt_send( }, }); - // Only claim the destination if we are actually going to send. A status - // inserted here without a transaction being queued is never cleared. + // Only claim the destination if we are actually going to send. A + // status inserted here without a transaction being queued is + // never cleared. if allow { trace!("Inserting running status for {dest:?}"); entry.or_insert(TransactionStatus::Running);