dumbgoy/soulseek-rs-modded
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix clippy collapsible match warnings

Browse Source
This commit is contained in:
michel
2026-04-26 12:18:00 +02:00
parent 41d129c6bc
commit e1ee3ac493
1 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soulseek-rs/src/ui/main_tui.rs
+50 -60
View File
@@ -465,25 +465,25 @@ impl MainTui {
fn handle_searches_input(&mut self, key: KeyEvent) -> Result<()> { fn handle_searches_input(&mut self, key: KeyEvent) -> Result<()> {
match key.code { match key.code {
KeyCode::Up | KeyCode::Char('k') => { KeyCode::Up | KeyCode::Char('k')
if !self.state.searches.is_empty() { if !self.state.searches.is_empty() =>
let current = {
self.state.searches_table_state.selected().unwrap_or(0); let current =
let new = if current == 0 { self.state.searches_table_state.selected().unwrap_or(0);
self.state.searches.len() - 1 let new = if current == 0 {
} else { self.state.searches.len() - 1
current - 1 } else {
}; current - 1
self.state.searches_table_state.select(Some(new)); };
} self.state.searches_table_state.select(Some(new));
} }
KeyCode::Down | KeyCode::Char('j') => { KeyCode::Down | KeyCode::Char('j')
if !self.state.searches.is_empty() { if !self.state.searches.is_empty() =>
let current = {
self.state.searches_table_state.selected().unwrap_or(0); let current =
let new = (current + 1) % self.state.searches.len(); self.state.searches_table_state.selected().unwrap_or(0);
self.state.searches_table_state.select(Some(new)); let new = (current + 1) % self.state.searches.len();
} self.state.searches_table_state.select(Some(new));
} }
KeyCode::Enter => { KeyCode::Enter => {
if let Some(selected) = if let Some(selected) =
@@ -525,25 +525,21 @@ impl MainTui {
}; };
match key.code { match key.code {
KeyCode::Up | KeyCode::Char('k') => { KeyCode::Up | KeyCode::Char('k') if items_count > 0 => {
if items_count > 0 { let current =
let current = self.state.results_table_state.selected().unwrap_or(0);
self.state.results_table_state.selected().unwrap_or(0); let new = if current == 0 {
let new = if current == 0 { items_count - 1
items_count - 1 } else {
} else { current - 1
current - 1 };
}; self.state.results_table_state.select(Some(new));
self.state.results_table_state.select(Some(new));
}
} }
KeyCode::Down | KeyCode::Char('j') => { KeyCode::Down | KeyCode::Char('j') if items_count > 0 => {
if items_count > 0 { let current =
let current = self.state.results_table_state.selected().unwrap_or(0);
self.state.results_table_state.selected().unwrap_or(0); let new = (current + 1) % items_count;
let new = (current + 1) % items_count; self.state.results_table_state.select(Some(new));
self.state.results_table_state.select(Some(new));
}
} }
KeyCode::Char(' ') => { KeyCode::Char(' ') => {
if let Some(current) = self.state.results_table_state.selected() if let Some(current) = self.state.results_table_state.selected()
@@ -596,31 +592,25 @@ impl MainTui {
fn handle_downloads_input(&mut self, key: KeyEvent) -> Result<()> { fn handle_downloads_input(&mut self, key: KeyEvent) -> Result<()> {
match key.code { match key.code {
KeyCode::Up | KeyCode::Char('k') => { KeyCode::Up | KeyCode::Char('k')
if !self.state.downloads.is_empty() { if !self.state.downloads.is_empty() =>
let current = self {
.state let current =
.downloads_table_state self.state.downloads_table_state.selected().unwrap_or(0);
.selected() let new = if current == 0 {
.unwrap_or(0); self.state.downloads.len() - 1
let new = if current == 0 { } else {
self.state.downloads.len() - 1 current - 1
} else { };
current - 1 self.state.downloads_table_state.select(Some(new));
};
self.state.downloads_table_state.select(Some(new));
}
} }
KeyCode::Down | KeyCode::Char('j') => { KeyCode::Down | KeyCode::Char('j')
if !self.state.downloads.is_empty() { if !self.state.downloads.is_empty() =>
let current = self {
.state let current =
.downloads_table_state self.state.downloads_table_state.selected().unwrap_or(0);
.selected() let new = (current + 1) % self.state.downloads.len();
.unwrap_or(0); self.state.downloads_table_state.select(Some(new));
let new = (current + 1) % self.state.downloads.len();
self.state.downloads_table_state.select(Some(new));
}
} }
KeyCode::Char('p') => { KeyCode::Char('p') => {
self.toggle_selected_download_pause(); self.toggle_selected_download_pause();