From 53861ccb0d11eb5524f3bd61d2988e6d41d0abca Mon Sep 17 00:00:00 2001
From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com>
Date: Sat, 22 Feb 2020 17:57:13 -0500
Subject: [PATCH] clippy

---
 src/args.rs         |  4 ++--
 src/atrule.rs       |  2 +-
 src/builtin/math.rs | 20 ++++++++++----------
 src/color/mod.rs    |  2 +-
 src/lib.rs          | 10 +++++-----
 src/mixin.rs        |  2 +-
 src/selector.rs     |  2 +-
 src/style.rs        | 10 +++++-----
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/args.rs b/src/args.rs
index 92acd84..b19fb86 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -163,7 +163,7 @@ pub(crate) fn eat_call_args<I: Iterator<Item = Token>>(
                 TokenKind::Symbol(Symbol::CloseParen) => {
                     args.insert(
                         name,
-                        Value::from_tokens(&mut val.clone().into_iter().peekable(), scope)?,
+                        Value::from_tokens(&mut val.into_iter().peekable(), scope)?,
                     );
                     return Ok(CallArgs(args));
                 }
@@ -192,7 +192,7 @@ pub(crate) fn eat_call_args<I: Iterator<Item = Token>>(
 fn read_until_close_paren<I: Iterator<Item = Token>>(toks: &mut Peekable<I>) -> Vec<Token> {
     let mut v = Vec::new();
     let mut scope = 0;
-    while let Some(tok) = toks.next() {
+    for tok in toks {
         match tok.kind {
             TokenKind::Symbol(Symbol::CloseParen) => {
                 if scope <= 1 {
diff --git a/src/atrule.rs b/src/atrule.rs
index effdd2e..e99566c 100644
--- a/src/atrule.rs
+++ b/src/atrule.rs
@@ -157,7 +157,7 @@ fn eat_unknown_atrule_body<I: Iterator<Item = Token>>(
     while let Some(expr) = eat_expr(toks, scope, super_selector)? {
         match expr {
             Expr::AtRule(a) => stmts.push(Stmt::AtRule(a)),
-            Expr::Style(s) => stmts.push(Stmt::Style(s)),
+            Expr::Style(s) => stmts.push(Stmt::Style(*s)),
             Expr::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
             Expr::Include(s) => stmts.extend(s),
             Expr::MixinDecl(..) | Expr::FunctionDecl(..) | Expr::Debug(..) | Expr::Warn(..) => {
diff --git a/src/builtin/math.rs b/src/builtin/math.rs
index fc9d47b..1f6e6cf 100644
--- a/src/builtin/math.rs
+++ b/src/builtin/math.rs
@@ -12,34 +12,34 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
             v @ Value::Dimension(..) => return Err(format!("$number: Expected {} to have no units.", v).into()),
             v => return Err(format!("$number: {} is not a number.", v).into()),
         };
-        Ok(Value::Dimension(num, Unit::Percent))
+     Ok(Value::Dimension(num, Unit::Percent))
     });
     decl!(f "round", |args, _| {
         max_args!(args, 1);
         match arg!(args, 0, "number") {
-            Value::Dimension(n, u) =>  Ok(Value::Dimension(n.round(), u)),
-            v => return Err(format!("$number: {} is not a number.", v).into()),
+            Value::Dimension(n, u) => Ok(Value::Dimension(n.round(), u)),
+            v => Err(format!("$number: {} is not a number.", v).into()),
         }
     });
     decl!(f "ceil", |args, _| {
         max_args!(args, 1);
         match arg!(args, 0, "number") {
-            Value::Dimension(n, u) =>  Ok(Value::Dimension(n.ceil(), u)),
-            v => return Err(format!("$number: {} is not a number.", v).into()),
+            Value::Dimension(n, u) => Ok(Value::Dimension(n.ceil(), u)),
+            v => Err(format!("$number: {} is not a number.", v).into()),
         }
     });
     decl!(f "floor", |args, _| {
         max_args!(args, 1);
         match arg!(args, 0, "number") {
-            Value::Dimension(n, u) =>  Ok(Value::Dimension(n.floor(), u)),
-            v => return Err(format!("$number: {} is not a number.", v).into()),
+            Value::Dimension(n, u) => Ok(Value::Dimension(n.floor(), u)),
+            v => Err(format!("$number: {} is not a number.", v).into()),
         }
     });
     decl!(f "abs", |args, _| {
         max_args!(args, 1);
         match arg!(args, 0, "number") {
-            Value::Dimension(n, u) =>  Ok(Value::Dimension(n.abs(), u)),
-            v => return Err(format!("$number: {} is not a number.", v).into()),
+            Value::Dimension(n, u) => Ok(Value::Dimension(n.abs(), u)),
+            v => Err(format!("$number: {} is not a number.", v).into()),
         }
     });
     decl!(f "comparable", |args, _| {
@@ -53,6 +53,6 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
             v => return Err(format!("$number2: {} is not a number.", v).into()),
         };
 
-        Ok(Value::bool(unit1.comparable(&unit2)))
+     Ok(Value::bool(unit1.comparable(&unit2)))
     });
 }
diff --git a/src/color/mod.rs b/src/color/mod.rs
index 0b8e128..bdc8b93 100644
--- a/src/color/mod.rs
+++ b/src/color/mod.rs
@@ -28,7 +28,7 @@ pub(crate) struct Color {
 }
 
 impl Color {
-    pub fn new_rgba(
+    pub const fn new_rgba(
         red: Number,
         green: Number,
         blue: Number,
diff --git a/src/lib.rs b/src/lib.rs
index c4b8324..2d276f2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -228,7 +228,7 @@ impl RuleSet {
 #[derive(Clone, Debug)]
 enum Expr {
     /// A style: `color: red`
-    Style(Style),
+    Style(Box<Style>),
     /// Several styles
     Styles(Vec<Style>),
     /// A collection of styles, from a mixin or function
@@ -486,7 +486,7 @@ impl<'a> StyleSheetParser<'a> {
         let mut stmts = Vec::new();
         while let Some(expr) = eat_expr(&mut self.lexer, scope, super_selector)? {
             match expr {
-                Expr::Style(s) => stmts.push(Stmt::Style(s)),
+                Expr::Style(s) => stmts.push(Stmt::Style(*s)),
                 Expr::AtRule(s) => stmts.push(Stmt::AtRule(s)),
                 Expr::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
                 Expr::MixinDecl(name, mixin) => {
@@ -556,7 +556,7 @@ pub(crate) fn eat_expr<I: Iterator<Item = Token>>(
                 let mut v = values.into_iter().peekable();
                 let property = Style::parse_property(&mut v, scope, super_selector, String::new())?;
                 let value = Style::parse_value(&mut v, scope, super_selector)?;
-                return Ok(Some(Expr::Style(Style { property, value })));
+                return Ok(Some(Expr::Style(Box::new(Style { property, value }))));
             }
             TokenKind::Symbol(Symbol::CloseCurlyBrace) => {
                 if values.is_empty() {
@@ -571,7 +571,7 @@ pub(crate) fn eat_expr<I: Iterator<Item = Token>>(
                     let property =
                         Style::parse_property(&mut v, scope, super_selector, String::new())?;
                     let value = Style::parse_value(&mut v, scope, super_selector)?;
-                    return Ok(Some(Expr::Style(Style { property, value })));
+                    return Ok(Some(Expr::Style(Box::new(Style { property, value }))));
                 }
             }
             TokenKind::Symbol(Symbol::OpenCurlyBrace) => {
@@ -634,7 +634,7 @@ pub(crate) fn eat_expr<I: Iterator<Item = Token>>(
                     pos,
                 }) = toks.next()
                 {
-                    return match AtRule::from_tokens(rule, pos, toks, scope, &super_selector)? {
+                    return match AtRule::from_tokens(rule, pos, toks, scope, super_selector)? {
                         AtRule::Mixin(name, mixin) => Ok(Some(Expr::MixinDecl(name, mixin))),
                         AtRule::Function(name, func) => Ok(Some(Expr::FunctionDecl(name, func))),
                         AtRule::Charset(_) => todo!("@charset as expr"),
diff --git a/src/mixin.rs b/src/mixin.rs
index 44abdc4..f62fce4 100644
--- a/src/mixin.rs
+++ b/src/mixin.rs
@@ -95,7 +95,7 @@ impl Mixin {
         while let Some(expr) = eat_expr(&mut self.body, &self.scope, super_selector)? {
             match expr {
                 Expr::AtRule(a) => stmts.push(Stmt::AtRule(a)),
-                Expr::Style(s) => stmts.push(Stmt::Style(s)),
+                Expr::Style(s) => stmts.push(Stmt::Style(*s)),
                 Expr::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
                 Expr::Include(s) => stmts.extend(s),
                 Expr::MixinDecl(..) | Expr::FunctionDecl(..) | Expr::Debug(..) | Expr::Warn(..) => {
diff --git a/src/selector.rs b/src/selector.rs
index 9854efb..c320696 100644
--- a/src/selector.rs
+++ b/src/selector.rs
@@ -13,7 +13,7 @@ use std::vec::IntoIter;
 pub(crate) struct Selector(pub Vec<SelectorKind>);
 
 impl Selector {
-    pub fn new() -> Selector {
+    pub const fn new() -> Selector {
         Selector(Vec::new())
     }
 }
diff --git a/src/style.rs b/src/style.rs
index d6464a6..1e98c7e 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -118,7 +118,7 @@ impl<'a> StyleParser<'a> {
                             if tok.equals_symbol(Symbol::OpenCurlyBrace) {
                                 match self.eat_style_group(toks, property)? {
                                     Expr::Styles(s) => styles.extend(s),
-                                    Expr::Style(s) => styles.push(s),
+                                    Expr::Style(s) => styles.push(*s),
                                     _ => unreachable!(),
                                 }
                                 devour_whitespace(toks);
@@ -150,7 +150,7 @@ impl<'a> StyleParser<'a> {
                                     value,
                                 });
                                 match self.eat_style_group(toks, property)? {
-                                    Expr::Style(s) => styles.push(s),
+                                    Expr::Style(s) => styles.push(*s),
                                     Expr::Styles(s) => styles.extend(s),
                                     _ => unreachable!(),
                                 }
@@ -186,7 +186,7 @@ impl<'a> StyleParser<'a> {
                                 value: val,
                             }];
                             match self.eat_style_group(toks, super_property)? {
-                                Expr::Style(s) => v.push(s),
+                                Expr::Style(s) => v.push(*s),
                                 Expr::Styles(s) => v.extend(s),
                                 _ => unreachable!(),
                             }
@@ -194,10 +194,10 @@ impl<'a> StyleParser<'a> {
                         }
                         _ => {}
                     }
-                    return Ok(Expr::Style(Style {
+                    return Ok(Expr::Style(Box::new(Style {
                         property: super_property,
                         value: val,
-                    }));
+                    })));
                 }
             }
         }