enable match_same_arms lint
Signed-off-by: June Strawberry <june@vern.cc>
This commit is contained in:
@@ -920,7 +920,6 @@ if_then_some_else_none = { level = "allow", priority = 1 }
|
|||||||
inline_always = { level = "allow", priority = 1 }
|
inline_always = { level = "allow", priority = 1 }
|
||||||
map_unwrap_or = { level = "allow", priority = 1 }
|
map_unwrap_or = { level = "allow", priority = 1 }
|
||||||
match_bool = { level = "allow", priority = 1 }
|
match_bool = { level = "allow", priority = 1 }
|
||||||
match_same_arms = { level = "allow", priority = 1 }
|
|
||||||
missing_docs_in_private_items = { level = "allow", priority = 1 }
|
missing_docs_in_private_items = { level = "allow", priority = 1 }
|
||||||
missing_errors_doc = { level = "allow", priority = 1 }
|
missing_errors_doc = { level = "allow", priority = 1 }
|
||||||
missing_panics_doc = { level = "allow", priority = 1 }
|
missing_panics_doc = { level = "allow", priority = 1 }
|
||||||
|
|||||||
@@ -21,20 +21,20 @@ pub(super) async fn filter_room(
|
|||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
membership: Option<&MembershipState>,
|
membership: Option<&MembershipState>,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
let match_invite =
|
#[allow(clippy::match_same_arms)] // helps readability
|
||||||
filter
|
let match_invite = filter
|
||||||
.is_invite
|
.is_invite
|
||||||
.map_async(async |is_invite| match (membership, is_invite) {
|
.map_async(async |is_invite| match (membership, is_invite) {
|
||||||
| (Some(MembershipState::Invite), true) => true,
|
| (Some(MembershipState::Invite), true) => true,
|
||||||
| (Some(MembershipState::Invite), false) => false,
|
| (Some(MembershipState::Invite), false) => false,
|
||||||
| (Some(_), true) => false,
|
| (Some(_), true) => false,
|
||||||
| (Some(_), false) => true,
|
| (Some(_), false) => true,
|
||||||
| _ =>
|
| _ =>
|
||||||
services
|
services
|
||||||
.state_cache
|
.state_cache
|
||||||
.is_invited(sender_user, room_id)
|
.is_invited(sender_user, room_id)
|
||||||
.await == is_invite,
|
.await == is_invite,
|
||||||
});
|
});
|
||||||
|
|
||||||
let match_direct = filter.is_dm.map_async(async |is_dm| {
|
let match_direct = filter.is_dm.map_async(async |is_dm| {
|
||||||
services
|
services
|
||||||
|
|||||||
Reference in New Issue
Block a user