char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix two pattern matching related warnings

master
Jonas Platte 2020-07-11 20:57:01 +02:00
parent a607d70371
commit ffc5204109
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
matrix_sdk/examples/autojoin.rs
View File

@ -30,16 +30,13 @@ impl EventEmitter for AutoJoinBot {
return; return;
} }
match room { if let SyncRoom::Invited(room) = room {
SyncRoom::Invited(room) => { let room = room.read().await;
let room = room.read().await; println!("Autojoining room {}", room.display_name());
println!("Autojoining room {}", room.display_name()); self.client
self.client .join_room_by_id(&room.room_id)
.join_room_by_id(&room.room_id) .await
.await .expect("Can't join room");
.expect("Can't join room");
}
_ => (),
} }
} }
} }

4
matrix_sdk_base/src/client.rs
View File

@ -727,8 +727,8 @@ impl BaseClient {
let mut olm = self.olm.lock().await; let mut olm = self.olm.lock().await;
if let Some(o) = &mut *olm { if let Some(o) = &mut *olm {
if let Some(decrypted) = if let Ok(decrypted) =
o.decrypt_room_event(&encrypted_event, room_id).await.ok() o.decrypt_room_event(&encrypted_event, room_id).await
{ {
if let Ok(d) = decrypted.deserialize() { if let Ok(d) = decrypted.deserialize() {
e = d e = d