i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-12 04:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(clippy): 修复 collapsible_match 和 unnecessary_sort_by 警告

Browse Source
This commit is contained in:
fawney19
2026-04-17 01:12:43 +08:00
parent 05ab09c469
commit 6730e821b2
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-proxy/src/setup/tui.rs
+18 -24
View File
@@ -514,10 +514,10 @@ impl App {
KeyCode::Up | KeyCode::Char('k') => { KeyCode::Up | KeyCode::Char('k') => {
self.selected = self.selected.saturating_sub(1); self.selected = self.selected.saturating_sub(1);
} }
KeyCode::Down | KeyCode::Char('j') => { KeyCode::Down | KeyCode::Char('j')
if self.selected + 1 < self.total_field_count() { if self.selected + 1 < self.total_field_count() =>
self.selected += 1; {
} self.selected += 1;
} }
KeyCode::Home => self.selected = 0, KeyCode::Home => self.selected = 0,
KeyCode::End => self.selected = self.total_field_count() - 1, KeyCode::End => self.selected = self.total_field_count() - 1,
@@ -553,21 +553,17 @@ impl App {
} }
} }
// -- Tab navigation -- // -- Tab navigation --
KeyCode::Tab | KeyCode::Right => { KeyCode::Tab | KeyCode::Right if self.server_tabs.len() > 1 => {
if self.server_tabs.len() > 1 { self.active_tab = (self.active_tab + 1) % self.server_tabs.len();
self.active_tab = (self.active_tab + 1) % self.server_tabs.len(); self.clamp_selection();
self.clamp_selection();
}
} }
KeyCode::BackTab | KeyCode::Left => { KeyCode::BackTab | KeyCode::Left if self.server_tabs.len() > 1 => {
if self.server_tabs.len() > 1 { self.active_tab = if self.active_tab == 0 {
self.active_tab = if self.active_tab == 0 { self.server_tabs.len() - 1
self.server_tabs.len() - 1 } else {
} else { self.active_tab - 1
self.active_tab - 1 };
}; self.clamp_selection();
self.clamp_selection();
}
} }
KeyCode::Char(c @ '1'..='9') if !key.modifiers.contains(KeyModifiers::CONTROL) => { KeyCode::Char(c @ '1'..='9') if !key.modifiers.contains(KeyModifiers::CONTROL) => {
let idx = (c as usize) - ('1' as usize); let idx = (c as usize) - ('1' as usize);
@@ -623,12 +619,10 @@ impl App {
KeyCode::Enter => { KeyCode::Enter => {
self.commit_edit_buffer(); self.commit_edit_buffer();
} }
KeyCode::Backspace => { KeyCode::Backspace if self.edit_cursor > 0 => {
if self.edit_cursor > 0 { self.edit_cursor -= 1;
self.edit_cursor -= 1; let byte = self.char_byte_pos(self.edit_cursor);
let byte = self.char_byte_pos(self.edit_cursor); self.edit_buffer.remove(byte);
self.edit_buffer.remove(byte);
}
} }
KeyCode::Delete => { KeyCode::Delete => {
if self.edit_cursor < self.edit_buffer.chars().count() { if self.edit_cursor < self.edit_buffer.chars().count() {
crates/aether-data/src/repository/candidates/memory.rs
+3 -3
View File
@@ -68,7 +68,7 @@ impl RequestCandidateReadRepository for InMemoryRequestCandidateRepository {
.values() .values()
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
rows.sort_by(|left, right| right.created_at_unix_ms.cmp(&left.created_at_unix_ms)); rows.sort_by_key(|right| std::cmp::Reverse(right.created_at_unix_ms));
rows.truncate(limit); rows.truncate(limit);
Ok(rows) Ok(rows)
} }
@@ -90,7 +90,7 @@ impl RequestCandidateReadRepository for InMemoryRequestCandidateRepository {
.filter(|row| row.provider_id.as_deref() == Some(provider_id)) .filter(|row| row.provider_id.as_deref() == Some(provider_id))
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
rows.sort_by(|left, right| right.created_at_unix_ms.cmp(&left.created_at_unix_ms)); rows.sort_by_key(|right| std::cmp::Reverse(right.created_at_unix_ms));
rows.truncate(limit); rows.truncate(limit);
Ok(rows) Ok(rows)
} }
@@ -125,7 +125,7 @@ impl RequestCandidateReadRepository for InMemoryRequestCandidateRepository {
}) })
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
rows.sort_by(|left, right| right.created_at_unix_ms.cmp(&left.created_at_unix_ms)); rows.sort_by_key(|right| std::cmp::Reverse(right.created_at_unix_ms));
rows.truncate(limit); rows.truncate(limit);
Ok(rows) Ok(rows)
} }
crates/aether-data/src/repository/video_tasks/memory.rs
+1 -1
View File
@@ -117,7 +117,7 @@ impl VideoTaskReadRepository for InMemoryVideoTaskRepository {
.filter(|task| task.status.is_active()) .filter(|task| task.status.is_active())
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
tasks.sort_by(|left, right| right.updated_at_unix_secs.cmp(&left.updated_at_unix_secs)); tasks.sort_by_key(|right| std::cmp::Reverse(right.updated_at_unix_secs));
tasks.truncate(limit); tasks.truncate(limit);
Ok(tasks) Ok(tasks)
} }