Skip to content

Commit

Permalink
Fix clippy warnings after new Rust release (Rigellute#697)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rigellute authored and lanej committed Jul 13, 2021
1 parent 9304939 commit 8502489
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 21 deletions.
25 changes: 5 additions & 20 deletions src/handlers/search_results.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,46 +350,31 @@ fn handle_enter_event_on_selected_block(app: &mut App) {
fn handle_enter_event_on_hovered_block(app: &mut App) {
match app.search_results.hovered_block {
SearchResultBlock::AlbumSearch => {
let next_index = match app.search_results.selected_album_index {
Some(index) => index,
None => 0,
};
let next_index = app.search_results.selected_album_index.unwrap_or(0);

app.search_results.selected_album_index = Some(next_index);
app.search_results.selected_block = SearchResultBlock::AlbumSearch;
}
SearchResultBlock::SongSearch => {
let next_index = match app.search_results.selected_tracks_index {
Some(index) => index,
None => 0,
};
let next_index = app.search_results.selected_tracks_index.unwrap_or(0);

app.search_results.selected_tracks_index = Some(next_index);
app.search_results.selected_block = SearchResultBlock::SongSearch;
}
SearchResultBlock::ArtistSearch => {
let next_index = match app.search_results.selected_artists_index {
Some(index) => index,
None => 0,
};
let next_index = app.search_results.selected_artists_index.unwrap_or(0);

app.search_results.selected_artists_index = Some(next_index);
app.search_results.selected_block = SearchResultBlock::ArtistSearch;
}
SearchResultBlock::PlaylistSearch => {
let next_index = match app.search_results.selected_playlists_index {
Some(index) => index,
None => 0,
};
let next_index = app.search_results.selected_playlists_index.unwrap_or(0);

app.search_results.selected_playlists_index = Some(next_index);
app.search_results.selected_block = SearchResultBlock::PlaylistSearch;
}
SearchResultBlock::ShowSearch => {
let next_index = match app.search_results.selected_shows_index {
Some(index) => index,
None => 0,
};
let next_index = app.search_results.selected_shows_index.unwrap_or(0);

app.search_results.selected_shows_index = Some(next_index);
app.search_results.selected_block = SearchResultBlock::ShowSearch;
Expand Down
2 changes: 1 addition & 1 deletion src/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ impl<'a> Network<'a> {
Some(self.large_search_limit),
Some(0),
);
let artist_name = if input_artist_name == "" {
let artist_name = if input_artist_name.is_empty() {
self
.spotify
.artist(&artist_id)
Expand Down

0 comments on commit 8502489

Please sign in to comment.