From 1fcb68c59fafb99c734d27332d80fab6abfb1ad0 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 11 Jul 2020 20:55:05 +0200 Subject: [PATCH 1/6] Remove unused dependencies --- matrix_sdk/Cargo.toml | 1 - matrix_sdk_crypto/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/matrix_sdk/Cargo.toml b/matrix_sdk/Cargo.toml index 08257320..505f1d73 100644 --- a/matrix_sdk/Cargo.toml +++ b/matrix_sdk/Cargo.toml @@ -49,7 +49,6 @@ async-trait = "0.1.36" dirs = "3.0.1" matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } tokio = { version = "0.2.21", features = ["rt-threaded", "macros"] } -ruma-identifiers = { version = "0.16.2", features = ["rand"] } serde_json = "1.0.56" tracing-subscriber = "0.2.7" tempfile = "3.1.0" diff --git a/matrix_sdk_crypto/Cargo.toml b/matrix_sdk_crypto/Cargo.toml index 920f8a45..a5e9833a 100644 --- a/matrix_sdk_crypto/Cargo.toml +++ b/matrix_sdk_crypto/Cargo.toml @@ -46,7 +46,6 @@ features = ["runtime-tokio", "sqlite"] [dev-dependencies] tokio = { version = "0.2.21", features = ["rt-threaded", "macros"] } -ruma-identifiers = { version = "0.16.2", features = ["rand"] } serde_json = "1.0.56" tempfile = "3.1.0" http = "0.2.1" From a607d703710dcf3f01ceb61f6fa8187ffa1a5c18 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 11 Jul 2020 20:55:19 +0200 Subject: [PATCH 2/6] Upgrade mockito in matrix-sdk-base --- matrix_sdk_base/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml index e78749b3..d7f4d0dc 100644 --- a/matrix_sdk_base/Cargo.toml +++ b/matrix_sdk_base/Cargo.toml @@ -39,7 +39,7 @@ matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } http = "0.2.1" tracing-subscriber = "0.2.7" tempfile = "3.1.0" -mockito = "0.25.1" +mockito = "0.26.0" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] tokio = { version = "0.2.21", features = ["rt-threaded", "macros"] } From ffc520410992ad6d6862791968deb0dfd61f5c60 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 11 Jul 2020 20:57:01 +0200 Subject: [PATCH 3/6] Fix two pattern matching related warnings --- matrix_sdk/examples/autojoin.rs | 17 +++++++---------- matrix_sdk_base/src/client.rs | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/matrix_sdk/examples/autojoin.rs b/matrix_sdk/examples/autojoin.rs index 943ab4f0..ed73a48e 100644 --- a/matrix_sdk/examples/autojoin.rs +++ b/matrix_sdk/examples/autojoin.rs @@ -30,16 +30,13 @@ impl EventEmitter for AutoJoinBot { return; } - match room { - SyncRoom::Invited(room) => { - let room = room.read().await; - println!("Autojoining room {}", room.display_name()); - self.client - .join_room_by_id(&room.room_id) - .await - .expect("Can't join room"); - } - _ => (), + if let SyncRoom::Invited(room) = room { + let room = room.read().await; + println!("Autojoining room {}", room.display_name()); + self.client + .join_room_by_id(&room.room_id) + .await + .expect("Can't join room"); } } } diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs index c37ca77b..94f345f0 100644 --- a/matrix_sdk_base/src/client.rs +++ b/matrix_sdk_base/src/client.rs @@ -727,8 +727,8 @@ impl BaseClient { let mut olm = self.olm.lock().await; if let Some(o) = &mut *olm { - if let Some(decrypted) = - o.decrypt_room_event(&encrypted_event, room_id).await.ok() + if let Ok(decrypted) = + o.decrypt_room_event(&encrypted_event, room_id).await { if let Ok(d) = decrypted.deserialize() { e = d From 9b5f95672b08ba094804eb0b2c2de5a2e5de55ba Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 11 Jul 2020 21:06:21 +0200 Subject: [PATCH 4/6] Use js_int macros to improve readability --- matrix_sdk_base/src/models/room.rs | 14 +++++------- matrix_sdk_base/src/models/room_member.rs | 12 +++++------ matrix_sdk_common/Cargo.toml | 2 +- matrix_sdk_crypto/src/machine.rs | 26 +++++++++++------------ 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs index 0012dff2..28a3f930 100644 --- a/matrix_sdk_base/src/models/room.rs +++ b/matrix_sdk_base/src/models/room.rs @@ -46,7 +46,7 @@ use crate::events::{ use crate::identifiers::{RoomAliasId, RoomId, UserId}; -use crate::js_int::{Int, UInt}; +use crate::js_int::{uint, Int, UInt}; use serde::{Deserialize, Serialize}; #[cfg(feature = "messages")] @@ -253,12 +253,11 @@ impl RoomName { 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 { UInt::MIN } else { - invited + joined - one + invited + joined - uint!(1) }; let members = joined_members.values().chain(invited_members.values()); @@ -277,7 +276,7 @@ impl RoomName { // stabilize ordering names.sort(); names.join(", ") - } else if heroes < invited_joined && invited + joined > one { + } else if heroes < invited_joined && invited + joined > uint!(1) { let mut names = members .filter(|m| m.user_id != *own_user_id) .take(3) @@ -1094,13 +1093,10 @@ mod test { assert!(room.power_levels.is_some()); assert_eq!( room.power_levels.as_ref().unwrap().kick, - crate::js_int::Int::new(50).unwrap() + crate::js_int::int!(50) ); let admin = room.joined_members.get(&user_id).unwrap(); - assert_eq!( - admin.power_level.unwrap(), - crate::js_int::Int::new(100).unwrap() - ); + assert_eq!(admin.power_level.unwrap(), crate::js_int::int!(100)); } #[async_test] diff --git a/matrix_sdk_base/src/models/room_member.rs b/matrix_sdk_base/src/models/room_member.rs index 33b16b44..6b56d49c 100644 --- a/matrix_sdk_base/src/models/room_member.rs +++ b/matrix_sdk_base/src/models/room_member.rs @@ -23,7 +23,7 @@ use crate::events::room::{ use crate::events::StateEventStub; use crate::identifiers::{RoomId, UserId}; -use crate::js_int::{Int, UInt}; +use crate::js_int::{int, Int, UInt}; use serde::{Deserialize, Serialize}; // Notes: if Alice invites Bob into a room we will get an event with the sender as Alice and the state key as Bob. @@ -143,8 +143,8 @@ impl RoomMember { self.power_level = Some(event.content.users_default); } - if max_power > Int::from(0) { - self.power_level_norm = Some((self.power_level.unwrap() * Int::from(100)) / max_power); + if max_power > int!(0) { + self.power_level_norm = Some((self.power_level.unwrap() * int!(100)) / max_power); } changed @@ -216,7 +216,7 @@ mod test { use crate::identifiers::{RoomId, UserId}; use crate::{BaseClient, Session}; - use crate::js_int::Int; + use crate::js_int::int; #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::*; @@ -258,7 +258,7 @@ mod test { .joined_members .get(&UserId::try_from("@example:localhost").unwrap()) .unwrap(); - assert_eq!(member.power_level, Int::new(100)); + assert_eq!(member.power_level, Some(int!(100))); } #[async_test] @@ -283,7 +283,7 @@ mod test { .get(&UserId::try_from("@example:localhost").unwrap()) .unwrap(); - assert_eq!(member.power_level, Int::new(100)); + assert_eq!(member.power_level, Some(int!(100))); assert!(member.avatar_url.is_none()); assert_eq!(member.last_active_ago, None); diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml index 31f718cd..2bdc5f65 100644 --- a/matrix_sdk_common/Cargo.toml +++ b/matrix_sdk_common/Cargo.toml @@ -12,7 +12,7 @@ version = "0.1.0" [dependencies] instant = { version = "0.1.4", features = ["wasm-bindgen", "now"] } -js_int = "0.1.5" +js_int = "0.1.8" [dependencies.ruma] git = "https://github.com/ruma/ruma" diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs index eb19734f..1cb18b25 100644 --- a/matrix_sdk_crypto/src/machine.rs +++ b/matrix_sdk_crypto/src/machine.rs @@ -1485,9 +1485,10 @@ impl OlmMachine { mod test { static USER_ID: &str = "@bob:example.org"; - use matrix_sdk_common::js_int::UInt; + use matrix_sdk_common::js_int::uint; use std::collections::BTreeMap; use std::convert::TryFrom; + use std::convert::TryInto; use std::sync::atomic::AtomicU64; use std::time::SystemTime; @@ -1681,20 +1682,18 @@ mod test { .unwrap(); assert!(machine.should_upload_keys().await); - response.one_time_key_counts.insert( - keys::KeyAlgorithm::SignedCurve25519, - UInt::try_from(10).unwrap(), - ); + response + .one_time_key_counts + .insert(keys::KeyAlgorithm::SignedCurve25519, uint!(10)); machine .receive_keys_upload_response(&response) .await .unwrap(); assert!(machine.should_upload_keys().await); - response.one_time_key_counts.insert( - keys::KeyAlgorithm::SignedCurve25519, - UInt::try_from(50).unwrap(), - ); + response + .one_time_key_counts + .insert(keys::KeyAlgorithm::SignedCurve25519, uint!(50)); machine .receive_keys_upload_response(&response) .await @@ -1718,10 +1717,9 @@ mod test { assert!(machine.should_upload_keys().await); assert!(machine.generate_one_time_keys().await.is_ok()); - response.one_time_key_counts.insert( - keys::KeyAlgorithm::SignedCurve25519, - UInt::try_from(50).unwrap(), - ); + response + .one_time_key_counts + .insert(keys::KeyAlgorithm::SignedCurve25519, uint!(50)); machine .receive_keys_upload_response(&response) .await @@ -1829,7 +1827,7 @@ mod test { let mut response = keys_upload_response(); response.one_time_key_counts.insert( keys::KeyAlgorithm::SignedCurve25519, - UInt::new_wrapping(one_time_keys.unwrap().len() as u64), + (one_time_keys.unwrap().len() as u64).try_into().unwrap(), ); machine From 85522ac35a7f0169a566923138b7c539fdd6747b Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 11 Jul 2020 21:14:32 +0200 Subject: [PATCH 5/6] Slightly simplify RoomName::calculate_name --- matrix_sdk_base/src/models/room.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs index 28a3f930..070bed11 100644 --- a/matrix_sdk_base/src/models/room.rs +++ b/matrix_sdk_base/src/models/room.rs @@ -250,15 +250,10 @@ 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); - let invited = self.invited_member_count.unwrap_or(UInt::MIN); + let joined = self.joined_member_count.unwrap_or(uint!(0)); + let invited = self.invited_member_count.unwrap_or(uint!(0)); let heroes = UInt::new(self.heroes.len() as u64).unwrap(); - - let invited_joined = if invited + joined == UInt::MIN { - UInt::MIN - } else { - invited + joined - uint!(1) - }; + let invited_joined = (invited + joined).saturating_sub(uint!(1)); let members = joined_members.values().chain(invited_members.values()); From eea00301ff85d05f043fc1b5428d8fa8c609923b Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 11 Jul 2020 21:20:02 +0200 Subject: [PATCH 6/6] Remove immediately-deref'ed double references --- matrix_sdk_base/src/client.rs | 40 ++++++++++++++---------------- matrix_sdk_base/src/models/room.rs | 26 +++++++++---------- matrix_sdk_crypto/src/machine.rs | 4 +-- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs index 94f345f0..75a422bf 100644 --- a/matrix_sdk_base/src/client.rs +++ b/matrix_sdk_base/src/client.rs @@ -890,9 +890,9 @@ impl BaseClient { /// /// * `event` - The presence event for a specified room member. pub async fn receive_account_data_event(&self, _: &RoomId, event: &AnyBasicEvent) -> bool { - match &event { - AnyBasicEvent::IgnoredUserList(event) => self.handle_ignored_users(&event).await, - AnyBasicEvent::PushRules(event) => self.handle_push_rules(&event).await, + match event { + AnyBasicEvent::IgnoredUserList(event) => self.handle_ignored_users(event).await, + AnyBasicEvent::PushRules(event) => self.handle_push_rules(event).await, _ => false, } } @@ -907,7 +907,7 @@ impl BaseClient { /// /// * `event` - The presence event for a specified room member. pub async fn receive_ephemeral_event(&self, event: &AnyEphemeralRoomEventStub) -> bool { - match &event { + match event { AnyEphemeralRoomEventStub::FullyRead(_) => {} AnyEphemeralRoomEventStub::Receipt(_) => {} AnyEphemeralRoomEventStub::Typing(_) => {} @@ -1471,44 +1471,42 @@ impl BaseClient { } }; - match &event { - AnyRoomEventStub::State(event) => match &event { - AnyStateEventStub::RoomMember(e) => event_emitter.on_room_member(room, &e).await, - AnyStateEventStub::RoomName(e) => event_emitter.on_room_name(room, &e).await, + match event { + AnyRoomEventStub::State(event) => match event { + AnyStateEventStub::RoomMember(e) => event_emitter.on_room_member(room, e).await, + AnyStateEventStub::RoomName(e) => event_emitter.on_room_name(room, e).await, AnyStateEventStub::RoomCanonicalAlias(e) => { - event_emitter.on_room_canonical_alias(room, &e).await + event_emitter.on_room_canonical_alias(room, e).await } - AnyStateEventStub::RoomAliases(e) => event_emitter.on_room_aliases(room, &e).await, - AnyStateEventStub::RoomAvatar(e) => event_emitter.on_room_avatar(room, &e).await, + AnyStateEventStub::RoomAliases(e) => event_emitter.on_room_aliases(room, e).await, + AnyStateEventStub::RoomAvatar(e) => event_emitter.on_room_avatar(room, e).await, AnyStateEventStub::RoomPowerLevels(e) => { - event_emitter.on_room_power_levels(room, &e).await + event_emitter.on_room_power_levels(room, e).await } AnyStateEventStub::RoomTombstone(e) => { - event_emitter.on_room_tombstone(room, &e).await + event_emitter.on_room_tombstone(room, e).await } AnyStateEventStub::RoomJoinRules(e) => { - event_emitter.on_room_join_rules(room, &e).await + event_emitter.on_room_join_rules(room, e).await } AnyStateEventStub::Custom(e) => { event_emitter - .on_unrecognized_event(room, &CustomOrRawEvent::State(&e)) + .on_unrecognized_event(room, &CustomOrRawEvent::State(e)) .await } _ => {} }, - AnyRoomEventStub::Message(event) => match &event { - AnyMessageEventStub::RoomMessage(e) => { - event_emitter.on_room_message(room, &e).await - } + AnyRoomEventStub::Message(event) => match event { + AnyMessageEventStub::RoomMessage(e) => event_emitter.on_room_message(room, e).await, AnyMessageEventStub::RoomMessageFeedback(e) => { - event_emitter.on_room_message_feedback(room, &e).await + event_emitter.on_room_message_feedback(room, e).await } AnyMessageEventStub::RoomRedaction(e) => { event_emitter.on_room_redaction(room, e).await } AnyMessageEventStub::Custom(e) => { event_emitter - .on_unrecognized_event(room, &CustomOrRawEvent::Message(&e)) + .on_unrecognized_event(room, &CustomOrRawEvent::Message(e)) .await } _ => {} diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs index 070bed11..b15dbb22 100644 --- a/matrix_sdk_base/src/models/room.rs +++ b/matrix_sdk_base/src/models/room.rs @@ -746,27 +746,27 @@ impl Room { /// /// * `event` - The event of the room. pub fn receive_timeline_event(&mut self, event: &AnyRoomEventStub) -> bool { - match &event { - AnyRoomEventStub::State(event) => match &event { + match event { + AnyRoomEventStub::State(event) => match event { // update to the current members of the room - AnyStateEventStub::RoomMember(event) => self.handle_membership(&event), + AnyStateEventStub::RoomMember(event) => self.handle_membership(event), // finds all events related to the name of the room for later use - AnyStateEventStub::RoomName(event) => self.handle_room_name(&event), - AnyStateEventStub::RoomCanonicalAlias(event) => self.handle_canonical(&event), - AnyStateEventStub::RoomAliases(event) => self.handle_room_aliases(&event), + AnyStateEventStub::RoomName(event) => self.handle_room_name(event), + AnyStateEventStub::RoomCanonicalAlias(event) => self.handle_canonical(event), + AnyStateEventStub::RoomAliases(event) => self.handle_room_aliases(event), // power levels of the room members - AnyStateEventStub::RoomPowerLevels(event) => self.handle_power_level(&event), - AnyStateEventStub::RoomTombstone(event) => self.handle_tombstone(&event), - AnyStateEventStub::RoomEncryption(event) => self.handle_encryption_event(&event), + AnyStateEventStub::RoomPowerLevels(event) => self.handle_power_level(event), + AnyStateEventStub::RoomTombstone(event) => self.handle_tombstone(event), + AnyStateEventStub::RoomEncryption(event) => self.handle_encryption_event(event), _ => false, }, - AnyRoomEventStub::Message(event) => match &event { + AnyRoomEventStub::Message(event) => match event { #[cfg(feature = "messages")] // We ignore this variants event because `handle_message` takes the enum // to store AnyMessageEventStub events in the `MessageQueue`. - AnyMessageEventStub::RoomMessage(_) => self.handle_message(&event), + AnyMessageEventStub::RoomMessage(_) => self.handle_message(event), #[cfg(feature = "messages")] - AnyMessageEventStub::RoomRedaction(event) => self.handle_redaction(&event), + AnyMessageEventStub::RoomRedaction(event) => self.handle_redaction(event), _ => false, }, } @@ -804,7 +804,7 @@ impl Room { /// * `event` - The `AnyStrippedStateEvent` sent by the server for invited but not /// joined rooms. pub fn receive_stripped_state_event(&mut self, event: &AnyStrippedStateEventStub) -> bool { - match &event { + match event { AnyStrippedStateEventStub::RoomName(event) => self.handle_stripped_room_name(event), _ => false, } diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs index 1cb18b25..4a1d1c08 100644 --- a/matrix_sdk_crypto/src/machine.rs +++ b/matrix_sdk_crypto/src/machine.rs @@ -1333,7 +1333,7 @@ impl OlmMachine { match &event { AnyToDeviceEvent::RoomEncrypted(e) => { - let decrypted_event = match self.decrypt_to_device_event(&e).await { + let decrypted_event = match self.decrypt_to_device_event(e).await { Ok(e) => e, Err(err) => { warn!( @@ -1350,7 +1350,7 @@ impl OlmMachine { // before we replace the result. *event_result = decrypted_event; } - AnyToDeviceEvent::RoomKeyRequest(e) => self.handle_room_key_request(&e), + AnyToDeviceEvent::RoomKeyRequest(e) => self.handle_room_key_request(e), AnyToDeviceEvent::KeyVerificationAccept(..) | AnyToDeviceEvent::KeyVerificationCancel(..) | AnyToDeviceEvent::KeyVerificationKey(..)