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

---
 src/atrule.rs      | 4 ++--
 src/css.rs         | 2 +-
 src/lexer.rs       | 2 +-
 src/lib.rs         | 8 ++++----
 src/mixin.rs       | 4 ++--
 src/selector.rs    | 4 ++--
 src/style.rs       | 2 +-
 src/utils.rs       | 8 ++++----
 src/value/parse.rs | 6 +++---
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/atrule.rs b/src/atrule.rs
index 0a51beb..fc0614b 100644
--- a/src/atrule.rs
+++ b/src/atrule.rs
@@ -269,8 +269,8 @@ 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::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
+            Expr::Style(s) => stmts.push(Stmt::Style(s)),
+            Expr::Styles(s) => stmts.extend(s.into_iter().map(Box::new).map(Stmt::Style)),
             Expr::Include(s) => stmts.extend(s),
             Expr::MixinDecl(..) | Expr::FunctionDecl(..) | Expr::Debug(..) | Expr::Warn(..) => {
                 todo!()
diff --git a/src/css.rs b/src/css.rs
index a45c096..8bd9386 100644
--- a/src/css.rs
+++ b/src/css.rs
@@ -79,7 +79,7 @@ impl Css {
                         Stmt::Style(s) => vals
                             .get_mut(0)
                             .expect("expected block to exist")
-                            .push_style(s),
+                            .push_style(*s),
                         Stmt::MultilineComment(s) => vals
                             .get_mut(0)
                             .expect("expected block to exist")
diff --git a/src/lexer.rs b/src/lexer.rs
index 33eedee..92ef571 100644
--- a/src/lexer.rs
+++ b/src/lexer.rs
@@ -139,7 +139,7 @@ impl<'a> Iterator for Lexer<'a> {
                 if !v.is_ascii() {
                     IS_UTF8.store(true, Ordering::Relaxed);
                 }
-                TokenKind::Unknown(v.clone())
+                TokenKind::Unknown(v)
             }
         };
         self.pos.next_char();
diff --git a/src/lib.rs b/src/lib.rs
index 3f6e040..3b65f94 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -200,7 +200,7 @@ pub struct StyleSheet(Vec<Stmt>);
 #[derive(Clone, Debug)]
 pub(crate) enum Stmt {
     /// A [`Style`](/grass/style/struct.Style)
-    Style(Style),
+    Style(Box<Style>),
     /// A  [`RuleSet`](/grass/struct.RuleSet.html)
     RuleSet(RuleSet),
     /// A multiline comment: `/* foo bar */`
@@ -228,7 +228,7 @@ pub(crate) struct RuleSet {
 }
 
 impl RuleSet {
-    pub(crate) fn new() -> RuleSet {
+    pub(crate) const fn new() -> RuleSet {
         RuleSet {
             selector: Selector::new(),
             rules: Vec::new(),
@@ -497,12 +497,12 @@ 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(a) => match a {
                     AtRule::For(s) => stmts.extend(s),
                     r => stmts.push(Stmt::AtRule(r)),
                 },
-                Expr::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
+                Expr::Styles(s) => stmts.extend(s.into_iter().map(Box::new).map(Stmt::Style)),
                 Expr::MixinDecl(name, mixin) => {
                     scope.insert_mixin(&name, *mixin);
                 }
diff --git a/src/mixin.rs b/src/mixin.rs
index 23b6c43..94fa44c 100644
--- a/src/mixin.rs
+++ b/src/mixin.rs
@@ -95,8 +95,8 @@ 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::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
+                Expr::Style(s) => stmts.push(Stmt::Style(s)),
+                Expr::Styles(s) => stmts.extend(s.into_iter().map(Box::new).map(Stmt::Style)),
                 Expr::Include(s) => stmts.extend(s),
                 Expr::FunctionDecl(..) => {
                     return Err("Mixins may not contain function declarations.".into())
diff --git a/src/selector.rs b/src/selector.rs
index fe8148c..12fbccb 100644
--- a/src/selector.rs
+++ b/src/selector.rs
@@ -375,7 +375,7 @@ impl Attribute {
                 }
                 q @ TokenKind::Symbol(Symbol::DoubleQuote)
                 | q @ TokenKind::Symbol(Symbol::SingleQuote) => {
-                    parse_quoted_string(toks, scope, q)?.to_string()
+                    parse_quoted_string(toks, scope, &q)?.to_string()
                 }
                 _ => return Err("Expected identifier.".into()),
             }
@@ -437,7 +437,7 @@ impl Attribute {
                 }
                 q @ TokenKind::Symbol(Symbol::DoubleQuote)
                 | q @ TokenKind::Symbol(Symbol::SingleQuote) => {
-                    parse_quoted_string(toks, scope, q)?.to_string()
+                    parse_quoted_string(toks, scope, &q)?.to_string()
                 }
                 _ => return Err("Expected identifier.".into()),
             }
diff --git a/src/style.rs b/src/style.rs
index c934ccf..456f819 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -88,7 +88,7 @@ impl<'a> StyleParser<'a> {
                 | ref q @ TokenKind::Symbol(Symbol::SingleQuote) => {
                     let q = q.clone();
                     toks.next();
-                    let (s, q) = if let Value::Ident(s, q) = parse_quoted_string(toks, scope, q)? {
+                    let (s, q) = if let Value::Ident(s, q) = parse_quoted_string(toks, scope, &q)? {
                         (s, q)
                     } else {
                         unreachable!()
diff --git a/src/utils.rs b/src/utils.rs
index 673628c..ff48813 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -54,7 +54,7 @@ pub(crate) fn parse_interpolation<I: Iterator<Item = Token>>(
             }
             q @ TokenKind::Symbol(Symbol::DoubleQuote)
             | q @ TokenKind::Symbol(Symbol::SingleQuote) => {
-                val.push_str(&parse_quoted_string(tokens, scope, q)?.to_string())
+                val.push_str(&parse_quoted_string(tokens, scope, &q)?.to_string())
             }
             TokenKind::Variable(ref v) => {
                 val.push_str(&scope.get_var(v)?.clone().unquote().to_string())
@@ -159,7 +159,7 @@ pub(crate) fn flatten_ident<I: Iterator<Item = Token>>(
 pub(crate) fn parse_quoted_string<I: Iterator<Item = Token>>(
     toks: &mut Peekable<I>,
     scope: &Scope,
-    q: TokenKind,
+    q: &TokenKind,
 ) -> SassResult<Value> {
     let mut s = String::new();
     let mut is_escaped = false;
@@ -167,7 +167,7 @@ pub(crate) fn parse_quoted_string<I: Iterator<Item = Token>>(
     while let Some(tok) = toks.next() {
         match tok.kind {
             TokenKind::Symbol(Symbol::DoubleQuote)
-                if !is_escaped && q == TokenKind::Symbol(Symbol::DoubleQuote) =>
+                if !is_escaped && q == &TokenKind::Symbol(Symbol::DoubleQuote) =>
             {
                 break
             }
@@ -177,7 +177,7 @@ pub(crate) fn parse_quoted_string<I: Iterator<Item = Token>>(
                 continue;
             }
             TokenKind::Symbol(Symbol::SingleQuote)
-                if !is_escaped && q == TokenKind::Symbol(Symbol::SingleQuote) =>
+                if !is_escaped && q == &TokenKind::Symbol(Symbol::SingleQuote) =>
             {
                 break
             }
diff --git a/src/value/parse.rs b/src/value/parse.rs
index 32bf0b3..d1e4dea 100644
--- a/src/value/parse.rs
+++ b/src/value/parse.rs
@@ -17,7 +17,7 @@ use crate::{Token, TokenKind};
 
 use super::number::Number;
 
-fn parse_hex(s: String) -> Value {
+fn parse_hex(s: &str) -> Value {
     match s.len() {
         3 => {
             let v = match u16::from_str_radix(&s, 16) {
@@ -213,7 +213,7 @@ impl Value {
             TokenKind::Symbol(Symbol::BitAnd) => {
                 Ok(Value::Ident(String::from("&"), QuoteKind::None))
             }
-            TokenKind::Symbol(Symbol::Hash) => Ok(parse_hex(flatten_ident(toks, scope)?)),
+            TokenKind::Symbol(Symbol::Hash) => Ok(parse_hex(&flatten_ident(toks, scope)?)),
             // TokenKind::Interpolation => {
             //     Ok(Value::Ident(
             //         parse_interpolation(toks, scope)
@@ -283,7 +283,7 @@ impl Value {
                 }
             }
             q @ TokenKind::Symbol(Symbol::DoubleQuote)
-            | q @ TokenKind::Symbol(Symbol::SingleQuote) => parse_quoted_string(toks, scope, q),
+            | q @ TokenKind::Symbol(Symbol::SingleQuote) => parse_quoted_string(toks, scope, &q),
             TokenKind::Variable(ref v) => Ok(scope.get_var(v)?.clone()),
             TokenKind::Interpolation => {
                 let mut s = parse_interpolation(toks, scope)?