diff options
author | Manos Pitsidianakis <el13635@mail.ntua.gr> | 2019-07-06 12:47:27 +0300 |
---|---|---|
committer | Manos Pitsidianakis <el13635@mail.ntua.gr> | 2019-07-06 12:47:27 +0300 |
commit | 74be47ec5ac59d31c80bf3801ead1ea47ad13bd3 (patch) | |
tree | 289bd793a55761013a78707e6b4cdaae889472bd | |
parent | a655a85b5fed4bb483044d09214e20186f343b9b (diff) |
ui: fix some lints
-rw-r--r-- | ui/src/components/mail/compose.rs | 2 | ||||
-rw-r--r-- | ui/src/components/mail/listing/compact.rs | 4 | ||||
-rw-r--r-- | ui/src/components/mail/view/list_management.rs | 4 | ||||
-rw-r--r-- | ui/src/components/utilities.rs | 8 | ||||
-rw-r--r-- | ui/src/conf/accounts.rs | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/ui/src/components/mail/compose.rs b/ui/src/components/mail/compose.rs index 41742166..1b7eab6c 100644 --- a/ui/src/components/mail/compose.rs +++ b/ui/src/components/mail/compose.rs @@ -699,5 +699,5 @@ pub fn send_draft(context: &mut Context, account_cursor: usize, draft: Draft) -> ), )); } - return !failure; + !failure } diff --git a/ui/src/components/mail/listing/compact.rs b/ui/src/components/mail/listing/compact.rs index 6bd5cb27..69fbdf11 100644 --- a/ui/src/components/mail/listing/compact.rs +++ b/ui/src/components/mail/listing/compact.rs @@ -123,9 +123,7 @@ impl ListingTrait for CompactListing { } else { Color::Default }; - let bg_color = if self.cursor_pos.2 == idx && self.selection[&i] { - Color::Byte(246 | 210) - } else if self.cursor_pos.2 == idx { + let bg_color = if self.cursor_pos.2 == idx { Color::Byte(246) } else if self.selection[&i] { Color::Byte(210) diff --git a/ui/src/components/mail/view/list_management.rs b/ui/src/components/mail/view/list_management.rs index 72cd4227..a969c9f0 100644 --- a/ui/src/components/mail/view/list_management.rs +++ b/ui/src/components/mail/view/list_management.rs @@ -55,8 +55,8 @@ impl<'a> Default for UnsubscribeOption<'a> { impl<'a> Clone for UnsubscribeOption<'a> { fn clone(&self) -> Self { match self { - UnsubscribeOption::Url(a) => UnsubscribeOption::Url(a.clone()), - UnsubscribeOption::Email(a) => UnsubscribeOption::Email(a.clone()), + UnsubscribeOption::Url(a) => UnsubscribeOption::Url(<&[u8]>::clone(a)), + UnsubscribeOption::Email(a) => UnsubscribeOption::Email(<&[u8]>::clone(a)), } } } diff --git a/ui/src/components/utilities.rs b/ui/src/components/utilities.rs index ce56a4a6..6837d5f5 100644 --- a/ui/src/components/utilities.rs +++ b/ui/src/components/utilities.rs @@ -899,12 +899,10 @@ impl Component for StatusBar { if parse_command(&self.ex_buffer.as_str().as_bytes()) .to_full_result() .is_ok() - { - if self.cmd_history.last().map(String::as_str) + && self.cmd_history.last().map(String::as_str) != Some(self.ex_buffer.as_str()) - { - self.cmd_history.push(self.ex_buffer.as_str().to_string()); - } + { + self.cmd_history.push(self.ex_buffer.as_str().to_string()); } self.ex_buffer.clear(); } diff --git a/ui/src/conf/accounts.rs b/ui/src/conf/accounts.rs index 52cc9a24..589bb09c 100644 --- a/ui/src/conf/accounts.rs +++ b/ui/src/conf/accounts.rs @@ -137,7 +137,7 @@ impl<'a> Iterator for MailboxIterator<'a> { if let Some(Err(_)) = self.folders[&fh] { return Some(None); } - return Some(Some(self.folders[&fh].as_ref().unwrap().as_ref().unwrap())); + Some(Some(self.folders[&fh].as_ref().unwrap().as_ref().unwrap())) } } |