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

push: Don't use deprecated methods

Browse Source
This commit is contained in:
Kévin Commaille 2024-02-14 13:00:50 +01:00 committed by Kévin Commaille
parent 05c88d6afc
commit 76c58b143a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-common/src/push/predefined.rs
View File

@ -87,7 +87,7 @@ impl Ruleset {
.into_iter() .into_iter()
.map(|mut new_rule| { .map(|mut new_rule| {
if let Some(old_rule) = if let Some(old_rule) =
$old_ruleset.$field_name.take(new_rule.rule_id.as_str()) $old_ruleset.$field_name.shift_take(new_rule.rule_id.as_str())
{ {
new_rule.enabled = old_rule.enabled; new_rule.enabled = old_rule.enabled;
new_rule.actions = old_rule.actions; new_rule.actions = old_rule.actions;
@ -114,7 +114,7 @@ impl Ruleset {
// `.m.rule.master` comes before all other push rules, while the other server-default push // `.m.rule.master` comes before all other push rules, while the other server-default push
// rules come after. // rules come after.
if let Some(master_rule) = if let Some(master_rule) =
new_server_default.override_.take(PredefinedOverrideRuleId::Master.as_str()) new_server_default.override_.shift_take(PredefinedOverrideRuleId::Master.as_str())
{ {
let (pos, _) = self.override_.insert_full(master_rule); let (pos, _) = self.override_.insert_full(master_rule);
self.override_.move_index(pos, 0); self.override_.move_index(pos, 0);