diff --git a/ruma-common/src/push.rs b/ruma-common/src/push.rs index 7af2ec1d..f24ba6c5 100644 --- a/ruma-common/src/push.rs +++ b/ruma-common/src/push.rs @@ -101,19 +101,20 @@ pub struct RulesetIter { override_: BTreeSetIter, room: BTreeSetIter, sender: BTreeSetIter, - underride: BTreeSetIter + underride: BTreeSetIter, } impl Iterator for RulesetIter { type Item = AnyPushRule; fn next(&mut self) -> Option { - self.content.next().map(|x| x.0.into()) + self.content + .next() + .map(|x| x.0.into()) .or_else(|| self.override_.next().map(|x| x.0.into())) .or_else(|| self.room.next().map(|x| x.0.into())) .or_else(|| self.sender.next().map(|x| x.0.into())) .or_else(|| self.underride.next().map(|x| x.0.into())) - } } @@ -170,13 +171,13 @@ macro_rules! rulekind { } impl Extend<$name> for Ruleset { - fn extend>(&mut self, iter: T) { + fn extend>(&mut self, iter: T) { for rule in iter { rule.add_to(self); } } } - + // The following trait are needed to be able to make // a BTreeSet of the new type diff --git a/ruma-common/src/push/predefined.rs b/ruma-common/src/push/predefined.rs index 56df2302..4ef046c7 100644 --- a/ruma-common/src/push/predefined.rs +++ b/ruma-common/src/push/predefined.rs @@ -1,7 +1,6 @@ ///! Constructors for [predefined push rules]. ///! ///! [predefined push rules]: https://matrix.org/docs/spec/client_server/r0.6.1#predefined-rules - use maplit::btreeset; use ruma_identifiers::UserId; @@ -10,7 +9,6 @@ use super::{ PushCondition::*, RoomMemberCountIs, Ruleset, Tweak, UnderridePushRule, }; - impl Ruleset { /// The list of all [predefined push rules]. ///