Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Placate clippy

Browse source
This commit is contained in:
Joscha 2022-08-17 23:06:49 +02:00
parent 80dad00125
commit 6dc7d2bd0b
2 changed files with 30 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ui/widgets/list.rs
View file

@ -256,15 +256,15 @@ enum Row<Id> {
impl<Id> Row<Id> { impl<Id> Row<Id> {
fn id(&self) -> Option<&Id> { fn id(&self) -> Option<&Id> {
match self { match self {
Row::Unselectable { .. } => None, Self::Unselectable { .. } => None,
Row::Selectable { id, .. } => Some(id), Self::Selectable { id, .. } => Some(id),
} }
} }
fn size(&self, frame: &mut Frame, max_width: Option<u16>, max_height: Option<u16>) -> Size { fn size(&self, frame: &mut Frame, max_width: Option<u16>, max_height: Option<u16>) -> Size {
match self { match self {
Row::Unselectable { normal } => normal.size(frame, max_width, max_height), Self::Unselectable { normal } => normal.size(frame, max_width, max_height),
Row::Selectable { Self::Selectable {
normal, selected, .. normal, selected, ..
} => { } => {
let normal_size = normal.size(frame, max_width, max_height); let normal_size = normal.size(frame, max_width, max_height);

62
src/vault/euph.rs
View file

@ -481,70 +481,60 @@ pub(super) enum EuphRequest {
impl EuphRequest { impl EuphRequest {
pub(super) fn perform(self, conn: &mut Connection) { pub(super) fn perform(self, conn: &mut Connection) {
let result = match self { let result = match self {
EuphRequest::GetCookies { result } => Self::get_cookies(conn, result), Self::GetCookies { result } => Self::get_cookies(conn, result),
EuphRequest::SetCookies { cookies } => Self::set_cookies(conn, cookies), Self::SetCookies { cookies } => Self::set_cookies(conn, cookies),
EuphRequest::GetRooms { result } => Self::get_rooms(conn, result), Self::GetRooms { result } => Self::get_rooms(conn, result),
EuphRequest::Join { room, time } => Self::join(conn, room, time), Self::Join { room, time } => Self::join(conn, room, time),
EuphRequest::Delete { room } => Self::delete(conn, room), Self::Delete { room } => Self::delete(conn, room),
EuphRequest::AddMsg { Self::AddMsg {
room, room,
msg, msg,
prev_msg, prev_msg,
own_user_id, own_user_id,
} => Self::add_msg(conn, room, *msg, prev_msg, own_user_id), } => Self::add_msg(conn, room, *msg, prev_msg, own_user_id),
EuphRequest::AddMsgs { Self::AddMsgs {
room, room,
msgs, msgs,
next_msg, next_msg,
own_user_id, own_user_id,
} => Self::add_msgs(conn, room, msgs, next_msg, own_user_id), } => Self::add_msgs(conn, room, msgs, next_msg, own_user_id),
EuphRequest::GetLastSpan { room, result } => Self::get_last_span(conn, room, result), Self::GetLastSpan { room, result } => Self::get_last_span(conn, room, result),
EuphRequest::GetPath { room, id, result } => Self::get_path(conn, room, id, result), Self::GetPath { room, id, result } => Self::get_path(conn, room, id, result),
EuphRequest::GetTree { room, root, result } => Self::get_tree(conn, room, root, result), Self::GetTree { room, root, result } => Self::get_tree(conn, room, root, result),
EuphRequest::GetFirstTreeId { room, result } => { Self::GetFirstTreeId { room, result } => Self::get_first_tree_id(conn, room, result),
Self::get_first_tree_id(conn, room, result) Self::GetLastTreeId { room, result } => Self::get_last_tree_id(conn, room, result),
} Self::GetPrevTreeId { room, root, result } => {
EuphRequest::GetLastTreeId { room, result } => {
Self::get_last_tree_id(conn, room, result)
}
EuphRequest::GetPrevTreeId { room, root, result } => {
Self::get_prev_tree_id(conn, room, root, result) Self::get_prev_tree_id(conn, room, root, result)
} }
EuphRequest::GetNextTreeId { room, root, result } => { Self::GetNextTreeId { room, root, result } => {
Self::get_next_tree_id(conn, room, root, result) Self::get_next_tree_id(conn, room, root, result)
} }
EuphRequest::GetOldestMsgId { room, result } => { Self::GetOldestMsgId { room, result } => Self::get_oldest_msg_id(conn, room, result),
Self::get_oldest_msg_id(conn, room, result) Self::GetNewestMsgId { room, result } => Self::get_newest_msg_id(conn, room, result),
} Self::GetOlderMsgId { room, id, result } => {
EuphRequest::GetNewestMsgId { room, result } => {
Self::get_newest_msg_id(conn, room, result)
}
EuphRequest::GetOlderMsgId { room, id, result } => {
Self::get_older_msg_id(conn, room, id, result) Self::get_older_msg_id(conn, room, id, result)
} }
EuphRequest::GetNewerMsgId { room, id, result } => { Self::GetNewerMsgId { room, id, result } => {
Self::get_newer_msg_id(conn, room, id, result) Self::get_newer_msg_id(conn, room, id, result)
} }
EuphRequest::GetOldestUnseenMsgId { room, result } => { Self::GetOldestUnseenMsgId { room, result } => {
Self::get_oldest_unseen_msg_id(conn, room, result) Self::get_oldest_unseen_msg_id(conn, room, result)
} }
EuphRequest::GetNewestUnseenMsgId { room, result } => { Self::GetNewestUnseenMsgId { room, result } => {
Self::get_newest_unseen_msg_id(conn, room, result) Self::get_newest_unseen_msg_id(conn, room, result)
} }
EuphRequest::GetOlderUnseenMsgId { room, id, result } => { Self::GetOlderUnseenMsgId { room, id, result } => {
Self::get_older_unseen_msg_id(conn, room, id, result) Self::get_older_unseen_msg_id(conn, room, id, result)
} }
EuphRequest::GetNewerUnseenMsgId { room, id, result } => { Self::GetNewerUnseenMsgId { room, id, result } => {
Self::get_newer_unseen_msg_id(conn, room, id, result) Self::get_newer_unseen_msg_id(conn, room, id, result)
} }
EuphRequest::GetUnseenMsgsCount { room, result } => { Self::GetUnseenMsgsCount { room, result } => {
Self::get_unseen_msgs_count(conn, room, result) Self::get_unseen_msgs_count(conn, room, result)
} }
EuphRequest::SetSeen { room, id, seen } => Self::set_seen(conn, room, id, seen), Self::SetSeen { room, id, seen } => Self::set_seen(conn, room, id, seen),
EuphRequest::SetOlderSeen { room, id, seen } => { Self::SetOlderSeen { room, id, seen } => Self::set_older_seen(conn, room, id, seen),
Self::set_older_seen(conn, room, id, seen) Self::GetChunkAtOffset {
}
EuphRequest::GetChunkAtOffset {
room, room,
amount, amount,
offset, offset,