From 24d2aa80784fedbc2354cc7661037eba3d1311af Mon Sep 17 00:00:00 2001 From: Denis Kasak Date: Fri, 10 Jul 2020 11:14:10 +0200 Subject: [PATCH] Style (cargo fmt, reordering import). --- matrix_sdk_base/src/models/room.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs index ea171660..0ca03459 100644 --- a/matrix_sdk_base/src/models/room.rs +++ b/matrix_sdk_base/src/models/room.rs @@ -17,6 +17,8 @@ use std::borrow::Cow; use std::collections::{BTreeMap, HashMap}; use std::convert::TryFrom; +use serde::{Deserialize, Serialize}; + #[cfg(feature = "messages")] use super::message::MessageQueue; use super::RoomMember; @@ -42,7 +44,7 @@ use crate::events::room::message::MessageEvent; use crate::identifiers::{RoomAliasId, RoomId, UserId}; use crate::js_int::{Int, UInt}; -use serde::{Deserialize, Serialize}; + #[derive(Debug, Default, PartialEq, Serialize, Deserialize, Clone)] /// `RoomName` allows the calculation of a text room name. pub struct RoomName { @@ -467,6 +469,7 @@ impl Room { inclusive: bool, ) -> HashMap { let users_with_same_name = self.shares_displayname_with(member, inclusive); + let disambiguate_with = |members: Vec, f: fn(&RoomMember) -> String| { members .into_iter() @@ -831,7 +834,11 @@ impl Room { /// /// * `event` - The power level event to process. /// * `max_power` - Maximum power level allowed. - pub fn update_member_power(member: &mut RoomMember, event: &PowerLevelsEvent, max_power: Int) -> bool { + pub fn update_member_power( + member: &mut RoomMember, + event: &PowerLevelsEvent, + max_power: Int, + ) -> bool { let changed; if let Some(user_power) = event.content.users.get(&member.user_id) { @@ -843,7 +850,8 @@ impl Room { } if max_power > Int::from(0) { - member.power_level_norm = Some((member.power_level.unwrap() * Int::from(100)) / max_power); + member.power_level_norm = + Some((member.power_level.unwrap() * Int::from(100)) / max_power); } changed @@ -963,7 +971,6 @@ mod test { .add_custom_joined_event(&room_id, member2_join_event, RoomEvent::RoomMember) .build_sync_response(); - // Test that `user` is either joined or invited to `room` but not both. async fn invited_or_joined_but_not_both(client: &BaseClient, room: &RoomId, user: &UserId) { let room = client.get_joined_room(&room).await.unwrap(); @@ -1172,7 +1179,11 @@ mod test { .build_sync_response(); let mut member2_rejoins_when_invited_sync_response = event_builder - .add_custom_joined_event(&room_id, member1_invites_member2_event, RoomEvent::RoomMember) + .add_custom_joined_event( + &room_id, + member1_invites_member2_event, + RoomEvent::RoomMember, + ) .add_custom_joined_event(&room_id, member2_join_event, RoomEvent::RoomMember) .build_sync_response();