Browse Source

chore: Run rustfmt

Fixes formatting of let-else statements.
merge-requests/1327/merge
Kévin Commaille 3 years ago
parent
commit
7c9f0676ac
No known key found for this signature in database
GPG Key ID: 29A48C1F03620416
  1. 2
      src/session/model/room/event/mod.rs
  2. 8
      src/session/model/sidebar/category/category_filter.rs
  3. 3
      src/session/view/content/room_details/history_viewer/media.rs
  4. 4
      src/session/view/create_dm_dialog/dm_user_list.rs
  5. 5
      src/session/view/media_viewer.rs

2
src/session/model/room/event/mod.rs

@ -467,7 +467,7 @@ impl Event {
/// This is a no-op if called for a local event.
pub async fn fetch_missing_details(&self) -> Result<(), MatrixError> {
let Some(event_id) = self.event_id() else {
return Ok(())
return Ok(());
};
let timeline = self.room().timeline().matrix_timeline();

8
src/session/model/sidebar/category/category_filter.rs

@ -78,7 +78,13 @@ mod imp {
return true;
}
let Some(value) = self.expression.borrow().as_ref().and_then(|e| e.evaluate(Some(item))).map(|v| v.get::<CategoryType>().unwrap()) else {
let Some(value) = self
.expression
.borrow()
.as_ref()
.and_then(|e| e.evaluate(Some(item)))
.map(|v| v.get::<CategoryType>().unwrap())
else {
return false;
};

3
src/session/view/content/room_details/history_viewer/media.rs

@ -91,7 +91,8 @@ impl MediaHistoryViewer {
let imp = self.imp();
let event = item.event().unwrap();
let Some(AnyMessageLikeEventContent::RoomMessage(message)) = event.original_content() else {
let Some(AnyMessageLikeEventContent::RoomMessage(message)) = event.original_content()
else {
error!("Trying to open the media viewer with an event that is not a message");
return;
};

4
src/session/view/create_dm_dialog/dm_user_list.rs

@ -226,7 +226,9 @@ impl DmUserList {
let room = if let Some(rooms) = dm_rooms.get(other_user_id) {
let mut final_rooms: Vec<Room> = vec![];
for room in rooms {
let Some(room) = room.upgrade() else { continue; };
let Some(room) = room.upgrade() else {
continue;
};
let members = room.members();
if !room.is_joined() || room.matrix_room().active_members_count() > 2 {

5
src/session/view/media_viewer.rs

@ -521,10 +521,7 @@ impl MediaViewer {
/// Copy the current image to the clipboard.
fn copy_image(&self) {
let Some(texture) = self
.imp()
.media
.texture() else {
let Some(texture) = self.imp().media.texture() else {
return;
};
self.clipboard().set_texture(&texture);

Loading…
Cancel
Save