chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use bool::then to simplify some code

Browse Source
This commit is contained in:
Jonas Platte
2021-01-13 17:47:31 +01:00
parent 7fbb0ade77
commit e622803679
11 changed files with 85 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ruma-state-res/src/event_auth.rs
View File

@@ -341,24 +341,12 @@ pub fn valid_membership_change<E: Event>(
)?;
let sender_power = power_levels.users.get(user_sender).map_or_else(
|| {
if sender_membership != MembershipState::Join {
None
} else {
Some(&power_levels.users_default)
}
},
|| (sender_membership == MembershipState::Join).then(|| &power_levels.users_default),
// If it's okay, wrap with Some(_)
Some,
);
let target_power = power_levels.users.get(&target_user_id).map_or_else(
|| {
if target_membership != MembershipState::Join {
None
} else {
Some(&power_levels.users_default)
}
},
|| (target_membership == MembershipState::Join).then(|| &power_levels.users_default),
// If it's okay, wrap with Some(_)
Some,
);

9
crates/ruma-state-res/src/lib.rs
View File

@@ -450,11 +450,10 @@ impl StateResolution {
// The key for this is (eventType + a state_key of the signed token not sender) so
// search for it
let current_third_party = auth_events.iter().find_map(|(_, pdu)| {
if pdu.kind() == EventType::RoomThirdPartyInvite {
Some(pdu.clone()) // TODO no clone, auth_events is borrowed while moved
} else {
None
}
(pdu.kind() == EventType::RoomThirdPartyInvite).then(|| {
// TODO no clone, auth_events is borrowed while moved
pdu.clone()
})
});
if auth_check(