From 050b76b5bf8c85183407fe50ab17eff4db3c7555 Mon Sep 17 00:00:00 2001 From: Kevin Boos Date: Wed, 24 Jul 2024 18:07:20 -0700 Subject: [PATCH] Fix outdated rust-toolchain file. Misc cleanup --- rust-toolchain.toml | 2 +- src/profile/user_profile.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d8c7a9d4..292fe499 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2023-12-22" +channel = "stable" diff --git a/src/profile/user_profile.rs b/src/profile/user_profile.rs index 8e88a922..59776bfe 100644 --- a/src/profile/user_profile.rs +++ b/src/profile/user_profile.rs @@ -1,7 +1,7 @@ use std::{borrow::Cow, cell::RefCell, collections::{btree_map::Entry, BTreeMap}, ops::{Deref, DerefMut}, sync::Arc}; use crossbeam_queue::SegQueue; use makepad_widgets::*; -use matrix_sdk::{room::RoomMember, ruma::events::room::member::MembershipState, OwnedRoomId, OwnedUserId, UserId}; +use matrix_sdk::{room::RoomMember, ruma::{events::room::member::MembershipState, OwnedRoomId, OwnedUserId, UserId}}; use crate::{ shared::avatar::AvatarWidgetExt, sliding_sync::{get_client, submit_async_request, MatrixRequest}, utils }; @@ -57,6 +57,7 @@ impl UserProfileUpdate { /// only if the user_id and room_id match that of the update. /// /// Returns `true` if the update resulted in any actual content changes. + #[allow(unused)] fn apply_to_current_pane(&self, info: &mut UserProfilePaneInfo) -> bool { match self { UserProfileUpdate::Full { new_profile, room_id, room_member } => {