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

ruma-common: Small refactorings in any_push_rule.rs

Browse Source 
* Make field order consistent
* Use `Self` type alias for shorter code
This commit is contained in:
Jonas Platte 2020-07-24 20:49:18 +02:00
parent c89905283f
commit 69c8914b03
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruma-common/src/push/any_push_rule.rs
View File

@ -37,28 +37,21 @@ pub struct AnyPushRule {
impl From<PushRule> for AnyPushRule { impl From<PushRule> for AnyPushRule {
fn from(push_rule: PushRule) -> Self { fn from(push_rule: PushRule) -> Self {
let PushRule { actions, default, enabled, rule_id } = push_rule; let PushRule { actions, default, enabled, rule_id } = push_rule;
AnyPushRule { actions, default, enabled, rule_id, pattern: None, conditions: None } Self { actions, default, enabled, rule_id, conditions: None, pattern: None }
} }
} }
impl From<PatternedPushRule> for AnyPushRule { impl From<PatternedPushRule> for AnyPushRule {
fn from(push_rule: PatternedPushRule) -> Self { fn from(push_rule: PatternedPushRule) -> Self {
let PatternedPushRule { actions, default, enabled, rule_id, pattern } = push_rule; let PatternedPushRule { actions, default, enabled, rule_id, pattern } = push_rule;
AnyPushRule { actions, default, enabled, rule_id, pattern: Some(pattern), conditions: None } Self { actions, default, enabled, rule_id, conditions: None, pattern: Some(pattern) }
} }
} }
impl From<ConditionalPushRule> for AnyPushRule { impl From<ConditionalPushRule> for AnyPushRule {
fn from(push_rule: ConditionalPushRule) -> Self { fn from(push_rule: ConditionalPushRule) -> Self {
let ConditionalPushRule { actions, default, enabled, rule_id, conditions } = push_rule; let ConditionalPushRule { actions, default, enabled, rule_id, conditions } = push_rule;
AnyPushRule { Self { actions, default, enabled, rule_id, conditions: Some(conditions), pattern: None }
actions,
default,
enabled,
rule_id,
pattern: None,
conditions: Some(conditions),
}
} }
} }