From d4f67b5ed9c0756ce37e0821d98dd3205c21c631 Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sat, 16 May 2020 18:38:37 -0400 Subject: [PATCH] clippy --- src/args.rs | 4 ++-- src/atrule/mixin.rs | 4 ++-- src/color/mod.rs | 30 ++++++++++++++---------------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/args.rs b/src/args.rs index 6d518dd..51be667 100644 --- a/src/args.rs +++ b/src/args.rs @@ -135,8 +135,8 @@ impl CallArgs { super_selector: &Selector, ) -> Option>> { match self.get_named(name, scope, super_selector) { - Some(v) => return Some(v), - None => return self.get_positional(position, scope, super_selector), + Some(v) => Some(v), + None => self.get_positional(position, scope, super_selector), } } diff --git a/src/atrule/mixin.rs b/src/atrule/mixin.rs index f80abb3..76d34b4 100644 --- a/src/atrule/mixin.rs +++ b/src/atrule/mixin.rs @@ -74,12 +74,12 @@ impl Mixin { )?; break; } - let val = match args.get(idx, arg.name.clone(), &scope, super_selector) { + let val = match args.get(idx, arg.name.clone(), scope, super_selector) { Some(v) => v?, None => match arg.default.as_mut() { Some(v) => Value::from_tokens( &mut std::mem::take(v).into_iter().peekmore(), - &scope, + scope, super_selector, )?, None => { diff --git a/src/color/mod.rs b/src/color/mod.rs index 4beacd0..57f82d5 100644 --- a/src/color/mod.rs +++ b/src/color/mod.rs @@ -482,28 +482,26 @@ impl Color { /// Get the proper representation from RGBA values fn repr(red: &Number, green: &Number, blue: &Number, alpha: &Number) -> String { - macro_rules! into_u8 { - ($channel:ident) => { - let $channel = if $channel > &Number::from(255) { - 255_u8 - } else if $channel.is_negative() { - 0_u8 - } else { - $channel.clone().round().to_integer().to_u8().unwrap() - }; - }; + fn into_u8(channel: &Number) -> u8 { + if channel > &Number::from(255) { + 255_u8 + } else if channel.is_negative() { + 0_u8 + } else { + channel.round().to_integer().to_u8().unwrap() + } } - into_u8!(red); - into_u8!(green); - into_u8!(blue); + let red_u8 = into_u8(red); + let green_u8 = into_u8(green); + let blue_u8 = into_u8(blue); if alpha < &Number::one() { - format!("rgba({}, {}, {}, {})", red, green, blue, alpha) - } else if let Some(c) = NAMED_COLORS.get_by_right(&[red, green, blue, 0xFF]) { + format!("rgba({}, {}, {}, {})", red_u8, green_u8, blue_u8, alpha) + } else if let Some(c) = NAMED_COLORS.get_by_right(&[red_u8, green_u8, blue_u8, 0xFF]) { (*c).to_string() } else { - format!("#{:0>2x}{:0>2x}{:0>2x}", red, green, blue) + format!("#{:0>2x}{:0>2x}{:0>2x}", red_u8, green_u8, blue_u8) } }