From a718f6f8fbaf48c72690fd5cb6561b81c3decb75 Mon Sep 17 00:00:00 2001 From: Thomas Eppers Date: Sat, 23 Oct 2021 13:14:50 +0200 Subject: [PATCH] started fixing clippy issues --- src/repo.rs | 2 +- src/ui/default.rs | 2 +- src/widget/service_switcher.rs | 16 +++++----------- src/widget/tag_list.rs | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/repo.rs b/src/repo.rs index 15bd816..ab96332 100644 --- a/src/repo.rs +++ b/src/repo.rs @@ -69,7 +69,7 @@ pub fn split_tag_from_repo(input: &str) -> Result<(&str, &str), Error> { pub fn split_repo_without_tag(repo: &str) -> Result { let repo = repo.trim(); - let split_repo: Vec<&str> = repo.split("/").collect(); + let split_repo: Vec<&str> = repo.split('/').collect(); match split_repo.len() { 1 => { let regex = regex::Regex::new(r"[a-z0-9]+").unwrap(); diff --git a/src/ui/default.rs b/src/ui/default.rs index 6636f00..a76800e 100644 --- a/src/ui/default.rs +++ b/src/ui/default.rs @@ -129,7 +129,7 @@ impl Ui { } Ok(tag) => tag, }; - repo.push_str(":"); + repo.push(':'); repo.push_str(&tag); ui.services.change_current_line(repo); } diff --git a/src/widget/service_switcher.rs b/src/widget/service_switcher.rs index fa9776e..3946c73 100644 --- a/src/widget/service_switcher.rs +++ b/src/widget/service_switcher.rs @@ -104,10 +104,7 @@ impl ServiceSwitcher { /// finds the next image tag in given file pub fn find_next_match(&mut self) -> bool { - let current_line: usize = match self.state.selected() { - None => 0, - Some(i) => i, - }; + let current_line: usize = self.state.selected().unwrap_or(0); let mut i = (current_line + 1) % self.list.len(); loop { @@ -131,10 +128,7 @@ impl ServiceSwitcher { /// finds the previous image tag in given file pub fn find_previous_match(&mut self) -> bool { - let current_line: usize = match self.state.selected() { - None => 0, - Some(i) => i, - }; + let current_line: usize = self.state.selected().unwrap_or(0); let mut i: usize = if current_line == 0 { self.list.len() - 1 @@ -165,10 +159,10 @@ impl ServiceSwitcher { /// return the repository from currently selected row pub fn extract_repo(&self) -> Result { match self.state.selected() { - None => return Err(Error::NoneSelected), + None => Err(Error::NoneSelected), Some(i) => match repo::match_yaml_image(&self.list[i]) { - Err(_) => return Err(Error::Parsing(String::from("Nothing found"))), - Ok((_, repo)) => return Ok(repo.to_string()), + Err(_) => Err(Error::Parsing(String::from("Nothing found"))), + Ok((_, repo)) => Ok(repo.to_string()), }, } } diff --git a/src/widget/tag_list.rs b/src/widget/tag_list.rs index 34eed1c..c022411 100644 --- a/src/widget/tag_list.rs +++ b/src/widget/tag_list.rs @@ -163,7 +163,7 @@ impl TagList { /// select next tag fn next(&mut self) { match self.state.selected() { - None if self.lines.len() > 0 => self.state.select(Some(0)), + None if !self.lines.is_empty() => self.state.select(Some(0)), None => (), Some(i) if i == self.lines.len() - 1 => self.state.select(Some(0)), Some(i) => self.state.select(Some(i + 1)), @@ -173,7 +173,7 @@ impl TagList { /// select previous tag fn previous(&mut self) { match self.state.selected() { - None if self.lines.len() > 0 => self.state.select(Some(self.lines.len())), + None if !self.lines.is_empty() => self.state.select(Some(self.lines.len())), None => (), Some(i) if i == 0 => self.state.select(Some(self.lines.len() - 1)), Some(i) => self.state.select(Some(i - 1)),