Run cargo fmt

This commit is contained in:
Ana Gelez 2020-11-27 20:34:38 +01:00
parent 57efd8cd5b
commit 483fe8f940
2 changed files with 6 additions and 7 deletions

View File

@ -101,19 +101,20 @@ pub struct RulesetIter {
override_: BTreeSetIter<OverridePushRule>, override_: BTreeSetIter<OverridePushRule>,
room: BTreeSetIter<RoomPushRule>, room: BTreeSetIter<RoomPushRule>,
sender: BTreeSetIter<SenderPushRule>, sender: BTreeSetIter<SenderPushRule>,
underride: BTreeSetIter<UnderridePushRule> underride: BTreeSetIter<UnderridePushRule>,
} }
impl Iterator for RulesetIter { impl Iterator for RulesetIter {
type Item = AnyPushRule; type Item = AnyPushRule;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
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.override_.next().map(|x| x.0.into()))
.or_else(|| self.room.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.sender.next().map(|x| x.0.into()))
.or_else(|| self.underride.next().map(|x| x.0.into())) .or_else(|| self.underride.next().map(|x| x.0.into()))
} }
} }
@ -170,7 +171,7 @@ macro_rules! rulekind {
} }
impl Extend<$name> for Ruleset { impl Extend<$name> for Ruleset {
fn extend<T: IntoIterator<Item=$name>>(&mut self, iter: T) { fn extend<T: IntoIterator<Item = $name>>(&mut self, iter: T) {
for rule in iter { for rule in iter {
rule.add_to(self); rule.add_to(self);
} }

View File

@ -1,7 +1,6 @@
///! Constructors for [predefined push rules]. ///! Constructors for [predefined push rules].
///! ///!
///! [predefined push rules]: https://matrix.org/docs/spec/client_server/r0.6.1#predefined-rules ///! [predefined push rules]: https://matrix.org/docs/spec/client_server/r0.6.1#predefined-rules
use maplit::btreeset; use maplit::btreeset;
use ruma_identifiers::UserId; use ruma_identifiers::UserId;
@ -10,7 +9,6 @@ use super::{
PushCondition::*, RoomMemberCountIs, Ruleset, Tweak, UnderridePushRule, PushCondition::*, RoomMemberCountIs, Ruleset, Tweak, UnderridePushRule,
}; };
impl Ruleset { impl Ruleset {
/// The list of all [predefined push rules]. /// The list of all [predefined push rules].
/// ///