From 975c4165d0d534c42c567c1d1051186bfe8a5792 Mon Sep 17 00:00:00 2001 From: Florian Dehau Date: Sat, 22 May 2021 15:44:19 +0200 Subject: [PATCH] chore: fix clippy warnings --- src/backend/rustbox.rs | 16 ++++++++-------- src/widgets/gauge.rs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/rustbox.rs b/src/backend/rustbox.rs index 95a9128..3854ed1 100644 --- a/src/backend/rustbox.rs +++ b/src/backend/rustbox.rs @@ -88,9 +88,9 @@ fn rgb_to_byte(r: u8, g: u8, b: u8) -> u16 { u16::from((r & 0xC0) + ((g & 0xE0) >> 2) + ((b & 0xE0) >> 5)) } -impl Into for Color { - fn into(self) -> rustbox::Color { - match self { +impl From for rustbox::Color { + fn from(color: Color) -> rustbox::Color { + match color { Color::Reset => rustbox::Color::Default, Color::Black | Color::Gray | Color::DarkGray => rustbox::Color::Black, Color::Red | Color::LightRed => rustbox::Color::Red, @@ -106,16 +106,16 @@ impl Into for Color { } } -impl Into for Modifier { - fn into(self) -> rustbox::Style { +impl From for rustbox::Style { + fn from(modifier: Modifier) -> rustbox::Style { let mut result = rustbox::Style::empty(); - if self.contains(Modifier::BOLD) { + if modifier.contains(Modifier::BOLD) { result.insert(rustbox::RB_BOLD); } - if self.contains(Modifier::UNDERLINED) { + if modifier.contains(Modifier::UNDERLINED) { result.insert(rustbox::RB_UNDERLINE); } - if self.contains(Modifier::REVERSED) { + if modifier.contains(Modifier::REVERSED) { result.insert(rustbox::RB_REVERSE); } result diff --git a/src/widgets/gauge.rs b/src/widgets/gauge.rs index 521e44f..ebff188 100644 --- a/src/widgets/gauge.rs +++ b/src/widgets/gauge.rs @@ -60,7 +60,7 @@ impl<'a> Gauge<'a> { /// Sets ratio ([0.0, 1.0]) directly. pub fn ratio(mut self, ratio: f64) -> Gauge<'a> { assert!( - ratio <= 1.0 && ratio >= 0.0, + (0.0..=1.0).contains(&ratio), "Ratio should be between 0 and 1 inclusively." ); self.ratio = ratio; @@ -213,7 +213,7 @@ impl<'a> LineGauge<'a> { pub fn ratio(mut self, ratio: f64) -> Self { assert!( - ratio <= 1.0 && ratio >= 0.0, + (0.0..=1.0).contains(&ratio), "Ratio should be between 0 and 1 inclusively." ); self.ratio = ratio;