From 64f8b3a4ee75f33cec726baae6706475a901cd9f Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 8 Jan 2021 13:21:26 -0500 Subject: Clippy (#496) --- src/options/rewrite.rs | 2 +- src/style.rs | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/options/rewrite.rs b/src/options/rewrite.rs index 12597756..1c4759e6 100644 --- a/src/options/rewrite.rs +++ b/src/options/rewrite.rs @@ -109,7 +109,7 @@ fn rewrite_options_to_implement_deprecated_hunk_style_option(opt: &mut cli::Opt) } match opt.deprecated_hunk_style.as_deref().map(str::to_lowercase) { Some(attr) if attr == "plain" => opt.hunk_header_decoration_style = "".to_string(), - Some(attr) if attr == "" => {} + Some(attr) if attr.is_empty() => {} Some(attr) => opt.hunk_header_decoration_style = attr, None => {} } diff --git a/src/style.rs b/src/style.rs index 350023ca..32f2f716 100644 --- a/src/style.rs +++ b/src/style.rs @@ -166,17 +166,17 @@ fn ansi_term_color_equality(a: Option, b: Option bool { - match (a, b) { - (ansi_term::Color::Fixed(0), ansi_term::Color::Black) => true, - (ansi_term::Color::Fixed(1), ansi_term::Color::Red) => true, - (ansi_term::Color::Fixed(2), ansi_term::Color::Green) => true, - (ansi_term::Color::Fixed(3), ansi_term::Color::Yellow) => true, - (ansi_term::Color::Fixed(4), ansi_term::Color::Blue) => true, - (ansi_term::Color::Fixed(5), ansi_term::Color::Purple) => true, - (ansi_term::Color::Fixed(6), ansi_term::Color::Cyan) => true, - (ansi_term::Color::Fixed(7), ansi_term::Color::White) => true, - _ => false, - } + matches!( + (a, b), + (ansi_term::Color::Fixed(0), ansi_term::Color::Black) + | (ansi_term::Color::Fixed(1), ansi_term::Color::Red) + | (ansi_term::Color::Fixed(2), ansi_term::Color::Green) + | (ansi_term::Color::Fixed(3), ansi_term::Color::Yellow) + | (ansi_term::Color::Fixed(4), ansi_term::Color::Blue) + | (ansi_term::Color::Fixed(5), ansi_term::Color::Purple) + | (ansi_term::Color::Fixed(6), ansi_term::Color::Cyan) + | (ansi_term::Color::Fixed(7), ansi_term::Color::White) + ) } lazy_static! { -- cgit v1.2.3