studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix and enable collapsible_if lint

Browse Source 
Signed-off-by: June Strawberry <june@vern.cc>
This commit is contained in:
June Strawberry
2026-01-15 17:39:33 -05:00
parent fb102f0e0a
commit 04e66a03d3
54 changed files with 453 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/matrix/event/filter.rs
View File

@@ -65,10 +65,10 @@ fn matches_user_id(user_id: &UserId, filter: &Filter) -> bool {
return false;
}
if let Some(senders) = filter.senders.as_ref() {
if !senders.iter().any(is_equal_to!(user_id)) {
return false;
}
if let Some(senders) = filter.senders.as_ref()
&& !senders.iter().any(is_equal_to!(user_id))
{
return false;
}
true
@@ -79,10 +79,10 @@ fn matches_room_id(room_id: &RoomId, filter: &RoomFilter) -> bool {
return false;
}
if let Some(rooms) = filter.rooms.as_ref() {
if !rooms.iter().any(is_equal_to!(room_id)) {
return false;
}
if let Some(rooms) = filter.rooms.as_ref()
&& !rooms.iter().any(is_equal_to!(room_id))
{
return false;
}
true
@@ -97,10 +97,10 @@ fn matches_room<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
return false;
}
if let Some(rooms) = filter.rooms.as_ref() {
if !rooms.iter().any(is_equal_to!(event.room_id())) {
return false;
}
if let Some(rooms) = filter.rooms.as_ref()
&& !rooms.iter().any(is_equal_to!(event.room_id()))
{
return false;
}
true
@@ -115,10 +115,10 @@ fn matches_sender<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
return false;
}
if let Some(senders) = filter.senders.as_ref() {
if !senders.iter().any(is_equal_to!(event.sender())) {
return false;
}
if let Some(senders) = filter.senders.as_ref()
&& !senders.iter().any(is_equal_to!(event.sender()))
{
return false;
}
true
@@ -131,10 +131,10 @@ fn matches_type<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
return false;
}
if let Some(types) = filter.types.as_ref() {
if !types.iter().any(is_equal_to!(&kind)) {
return false;
}
if let Some(types) = filter.types.as_ref()
&& !types.iter().any(is_equal_to!(&kind))
{
return false;
}
true

8
src/core/matrix/pdu/format.rs
View File

@@ -32,14 +32,12 @@ pub fn into_outgoing_federation(
if !room_rules
.event_format
.require_room_create_room_id
{
if pdu_json
&& pdu_json
.get("type")
.and_then(CanonicalJsonValue::as_str)
.is_some_and(is_equal_to!("m.room.create"))
{
pdu_json.remove("room_id");
}
{
pdu_json.remove("room_id");
}
if matches!(room_rules.events_reference_format, EventsReferenceFormatVersion::V1) {

13
src/core/matrix/state_res/resolve/power_sort.rs
View File

@@ -201,15 +201,14 @@ where
let mut room_create_event = None;
let mut room_power_levels_event = None;
let event = fetch(event_id.to_owned()).await;
if let Ok(event) = &event {
if rules
if let Ok(event) = &event
&& rules
.authorization
.room_create_event_id_as_room_id
{
let create_id = event.room_id().as_event_id()?;
let fetched = fetch(create_id).await?;
room_create_event = Some(RoomCreateEvent::new(fetched));
}
{
let create_id = event.room_id().as_event_id()?;
let fetched = fetch(create_id).await?;
room_create_event = Some(RoomCreateEvent::new(fetched));
}
for auth_event_id in event