From 4858ca5f74a54d1773c433fd02d296a6a95579b3 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 27 Apr 2020 11:52:49 +0200 Subject: [PATCH 1/3] Remove unnecessary clone --- src/test_builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test_builder.rs b/src/test_builder.rs index b28b0139..43ac5e0b 100644 --- a/src/test_builder.rs +++ b/src/test_builder.rs @@ -371,7 +371,7 @@ impl ClientTestRunner { } for event in &self.room_events { - cli.receive_joined_timeline_event(room_id, &mut EventJson::from(event.clone())) + cli.receive_joined_timeline_event(room_id, &mut EventJson::from(event)) .await; } for event in &self.presence_events { From 5cfac42101bf37af093e6e680fa0ffcd8e83d26d Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 27 Apr 2020 12:12:45 +0200 Subject: [PATCH 2/3] Upgrade js_int to 0.1.5 --- Cargo.toml | 2 +- src/models/room.rs | 8 ++++---- src/request_builder.rs | 18 ++++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a284189a..308db8d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ url = "2.1.1" async-trait = "0.1.30" # Ruma dependencies -js_int = "0.1.4" +js_int = "0.1.5" ruma-api = "0.16.0-rc.2" ruma-client-api = { version = "0.8.0-rc.5" } ruma-events = { version = "0.21.0-beta.1" } diff --git a/src/models/room.rs b/src/models/room.rs index d2e19ef6..a7f04230 100644 --- a/src/models/room.rs +++ b/src/models/room.rs @@ -147,13 +147,13 @@ impl RoomName { } else if !self.aliases.is_empty() && !self.aliases[0].alias().is_empty() { self.aliases[0].alias().trim().to_string() } else { - let joined = self.joined_member_count.unwrap_or(UInt::min_value()); - let invited = self.invited_member_count.unwrap_or(UInt::min_value()); + let joined = self.joined_member_count.unwrap_or(UInt::MIN); + let invited = self.invited_member_count.unwrap_or(UInt::MIN); let heroes = UInt::new(self.heroes.len() as u64).unwrap(); let one = UInt::new(1).unwrap(); - let invited_joined = if invited + joined == UInt::min_value() { - UInt::min_value() + let invited_joined = if invited + joined == UInt::MIN { + UInt::MIN } else { invited + joined - one }; diff --git a/src/request_builder.rs b/src/request_builder.rs index f00ed1a3..bdfa9168 100644 --- a/src/request_builder.rs +++ b/src/request_builder.rs @@ -326,17 +326,15 @@ mod test { .invite_3pid(vec![]) .is_direct(true) .power_level_override(PowerLevelsEventContent { - ban: Int::max_value(), + ban: Int::MAX, events: BTreeMap::default(), - events_default: Int::min_value(), - invite: Int::min_value(), - kick: Int::min_value(), - redact: Int::max_value(), - state_default: Int::min_value(), - users_default: Int::min_value(), - notifications: NotificationPowerLevels { - room: Int::min_value(), - }, + events_default: Int::MIN, + invite: Int::MIN, + kick: Int::MIN, + redact: Int::MAX, + state_default: Int::MIN, + users_default: Int::MIN, + notifications: NotificationPowerLevels { room: Int::MIN }, users: BTreeMap::default(), }) .preset(RoomPreset::PrivateChat) From 6d67cd2ac72a9a72a1664f28df9df48aa95019cd Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 27 Apr 2020 12:12:51 +0200 Subject: [PATCH 3/3] Fix clippy lints --- src/base_client.rs | 2 +- src/models/room.rs | 7 +++---- src/test_builder.rs | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/base_client.rs b/src/base_client.rs index d79e94dc..b3e2f913 100644 --- a/src/base_client.rs +++ b/src/base_client.rs @@ -168,7 +168,7 @@ impl Client { pub(crate) async fn calculate_room_names(&self) -> Vec { let mut res = Vec::new(); - for (_id, room) in &self.joined_rooms { + for room in self.joined_rooms.values() { let room = room.read().await; res.push(room.room_name.calculate_name(&room.members)) } diff --git a/src/models/room.rs b/src/models/room.rs index a7f04230..e96f8f1d 100644 --- a/src/models/room.rs +++ b/src/models/room.rs @@ -166,8 +166,7 @@ impl RoomName { .map(|mem| { mem.display_name .clone() - .unwrap_or(mem.user_id.localpart().to_string()) - .to_string() + .unwrap_or_else(|| mem.user_id.localpart().to_string()) }) .collect::>(); // stabilize ordering @@ -180,7 +179,7 @@ impl RoomName { .map(|mem| { mem.display_name .clone() - .unwrap_or(mem.user_id.localpart().to_string()) + .unwrap_or_else(|| mem.user_id.localpart().to_string()) }) .collect::>(); names.sort(); @@ -502,7 +501,7 @@ mod test { .await; assert_eq!(2, room.members.len()); - for (_id, member) in &room.members { + for member in room.members.values() { assert_eq!(MembershipState::Join, member.membership); } diff --git a/src/test_builder.rs b/src/test_builder.rs index 43ac5e0b..75984a66 100644 --- a/src/test_builder.rs +++ b/src/test_builder.rs @@ -96,7 +96,7 @@ impl EventBuilder { variant: fn(Ev) -> Event, ) -> Self { let val = fs::read_to_string(path.as_ref()) - .expect(&format!("file not found {:?}", path.as_ref())); + .unwrap_or_else(|_| panic!("file not found {:?}", path.as_ref())); let event = serde_json::from_str::>(&val) .unwrap() .deserialize() @@ -112,7 +112,7 @@ impl EventBuilder { variant: fn(Ev) -> Event, ) -> Self { let val = fs::read_to_string(path.as_ref()) - .expect(&format!("file not found {:?}", path.as_ref())); + .unwrap_or_else(|_| panic!("file not found {:?}", path.as_ref())); let event = serde_json::from_str::>(&val) .unwrap() .deserialize() @@ -128,7 +128,7 @@ impl EventBuilder { variant: fn(Ev) -> RoomEvent, ) -> Self { let val = fs::read_to_string(path.as_ref()) - .expect(&format!("file not found {:?}", path.as_ref())); + .unwrap_or_else(|_| panic!("file not found {:?}", path.as_ref())); let event = serde_json::from_str::>(&val) .unwrap() .deserialize() @@ -144,7 +144,7 @@ impl EventBuilder { variant: fn(Ev) -> StateEvent, ) -> Self { let val = fs::read_to_string(path.as_ref()) - .expect(&format!("file not found {:?}", path.as_ref())); + .unwrap_or_else(|_| panic!("file not found {:?}", path.as_ref())); let event = serde_json::from_str::>(&val) .unwrap() .deserialize() @@ -156,7 +156,7 @@ impl EventBuilder { /// Add a presence event to the presence events `Vec`. pub fn add_presence_event_from_file>(mut self, path: P) -> Self { let val = fs::read_to_string(path.as_ref()) - .expect(&format!("file not found {:?}", path.as_ref())); + .unwrap_or_else(|_| panic!("file not found {:?}", path.as_ref())); let event = serde_json::from_str::>(&val) .unwrap() .deserialize() @@ -174,7 +174,7 @@ impl EventBuilder { P: AsRef, { let body = fs::read_to_string(path.as_ref()) - .expect(&format!("file not found {:?}", path.as_ref())); + .unwrap_or_else(|_| panic!("file not found {:?}", path.as_ref())); let mock = Some( mock(method, matcher) .with_status(200)