youwen/iamb
1
0
Fork 0
mirror of https://github.com/youwen5/iamb.git synced 2025-06-21 06:09:52 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix newer Clippy warnings for 1.80 (#301)

Browse source
This commit is contained in:
Jarkko Sakkinen 2024-08-01 06:02:42 +03:00 • committed by GitHub
parent d8d8e91295
commit 4fc71c9291
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/windows/mod.rs
View file

@ -7,6 +7,7 @@
//! example, [sending messages][crate::base::SendAction] delegate to the [room window][RoomState],
//! where we have the message bar and room ID easily accesible and resetable.
use std::cmp::{Ord, Ordering, PartialOrd};
use std::fmt::{self, Display};
use std::ops::Deref;
use std::sync::Arc;
use std::time::{Duration, Instant};
@ -820,7 +821,7 @@ impl GenericChatItem {
let name = info.name.clone().unwrap_or_default();
let alias = room.canonical_alias();
let unread = info.unreads(&store.application.settings);
info.tags = room_info.deref().1.clone();
info.tags.clone_from(&room_info.deref().1);
if let Some(alias) = &alias {
store.application.names.insert(alias.to_string(), room_id.to_owned());
@ -870,9 +871,9 @@ impl RoomLikeItem for GenericChatItem {
}
}
impl ToString for GenericChatItem {
fn to_string(&self) -> String {
return self.name.clone();
impl Display for GenericChatItem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.name)
}
}
@ -930,7 +931,7 @@ impl RoomItem {
let name = info.name.clone().unwrap_or_default();
let alias = room.canonical_alias();
let unread = info.unreads(&store.application.settings);
info.tags = room_info.deref().1.clone();
info.tags.clone_from(&room_info.deref().1);
if let Some(alias) = &alias {
store.application.names.insert(alias.to_string(), room_id.to_owned());
@ -980,9 +981,9 @@ impl RoomLikeItem for RoomItem {
}
}
impl ToString for RoomItem {
fn to_string(&self) -> String {
return self.name.clone();
impl Display for RoomItem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, ":verify request {}", self.name)
}
}
@ -1034,7 +1035,7 @@ impl DirectItem {
let info = store.application.rooms.get_or_default(room_id);
let name = info.name.clone().unwrap_or_default();
let unread = info.unreads(&store.application.settings);
info.tags = room_info.deref().1.clone();
info.tags.clone_from(&room_info.deref().1);
DirectItem { room_info, name, alias, unread }
}
@ -1080,9 +1081,9 @@ impl RoomLikeItem for DirectItem {
}
}
impl ToString for DirectItem {
fn to_string(&self) -> String {
return self.name.clone();
impl Display for DirectItem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, ":verify request {}", self.name)
}
}
@ -1179,9 +1180,9 @@ impl RoomLikeItem for SpaceItem {
}
}
impl ToString for SpaceItem {
fn to_string(&self) -> String {
return self.room_id().to_string();
impl Display for SpaceItem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, ":verify request {}", self.room_id())
}
}
@ -1300,16 +1301,18 @@ impl From<(&String, &SasVerification)> for VerifyItem {
}
}
impl ToString for VerifyItem {
fn to_string(&self) -> String {
impl Display for VerifyItem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self.sasv1.is_done() {
String::new()
} else if self.sasv1.is_cancelled() {
format!(":verify request {}", self.sasv1.other_user_id())
return Ok(());
}
if self.sasv1.is_cancelled() {
write!(f, ":verify request {}", self.sasv1.other_user_id())
} else if self.sasv1.emoji().is_some() {
format!(":verify confirm {}", self.user_dev)
write!(f, ":verify confirm {}", self.user_dev)
} else {
format!(":verify accept {}", self.user_dev)
write!(f, ":verify accept {}", self.user_dev)
}
}
}
@ -1413,9 +1416,9 @@ impl MemberItem {
}
}
impl ToString for MemberItem {
fn to_string(&self) -> String {
self.member.user_id().to_string()
impl Display for MemberItem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.member.user_id())
}
}

10
src/windows/room/scrollback.rs
View file

@ -1457,11 +1457,11 @@ mod tests {
assert_eq!(scrollback.cursor, MessageCursor::latest());
// Search backwards to MSG4.
scrollback.search(prev.clone(), 1.into(), &ctx, &mut store).unwrap();
scrollback.search(prev, 1.into(), &ctx, &mut store).unwrap();
assert_eq!(scrollback.cursor, MSG4_KEY.clone().into());
// Search backwards to MSG2.
scrollback.search(prev.clone(), 1.into(), &ctx, &mut store).unwrap();
scrollback.search(prev, 1.into(), &ctx, &mut store).unwrap();
assert_eq!(scrollback.cursor, MSG2_KEY.clone().into());
assert_eq!(
std::mem::take(&mut store.application.need_load)
@ -1472,7 +1472,7 @@ mod tests {
);
// Can't go any further; need_load now contains the room ID.
scrollback.search(prev.clone(), 1.into(), &ctx, &mut store).unwrap();
scrollback.search(prev, 1.into(), &ctx, &mut store).unwrap();
assert_eq!(scrollback.cursor, MSG2_KEY.clone().into());
assert_eq!(
std::mem::take(&mut store.application.need_load)
@ -1482,11 +1482,11 @@ mod tests {
);
// Search forward twice to MSG1.
scrollback.search(next.clone(), 2.into(), &ctx, &mut store).unwrap();
scrollback.search(next, 2.into(), &ctx, &mut store).unwrap();
assert_eq!(scrollback.cursor, MSG1_KEY.clone().into());
// Can't go any further.
scrollback.search(next.clone(), 2.into(), &ctx, &mut store).unwrap();
scrollback.search(next, 2.into(), &ctx, &mut store).unwrap();
assert_eq!(scrollback.cursor, MSG1_KEY.clone().into());
}