From 22dd315c47c599bc53d14e98ac66fc4796631abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <tmladek@protonmail.ch>
Date: Wed, 17 Feb 2021 21:45:20 +0100
Subject: [PATCH] cargo clippy fixes

---
 src/database.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/database.rs b/src/database.rs
index 4926cff..b2e3195 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -340,7 +340,7 @@ impl Query {
                         let (cons_vec, _) = value.clone().into_vec();
                         let sub_expressions = &cons_vec[1..];
                         let values: Result<Vec<Box<Query>>> = sub_expressions
-                            .into_iter()
+                            .iter()
                             .map(|value| Ok(Box::new(Query::from_sexp(value)?)))
                             .collect();
 
@@ -383,7 +383,7 @@ impl Query {
                             let (cons_vec, _) = cons.clone().into_vec();
                             if let Some(split) = cons_vec.split_first() {
                                 let args = split.1;
-                                let values: Result<Vec<T>, _> = args.into_iter().map(|value| {
+                                let values: Result<Vec<T>, _> = args.iter().map(|value| {
                                     if let lexpr::Value::String(str) = value {
                                         if let Ok(value) = T::from_str(str.borrow()) {
                                             Ok(value)
@@ -485,7 +485,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
                     }
                     QueryComponent::In(q_targets) => {
                         let targets: Result<Vec<_>, _> =
-                            q_targets.into_iter().map(|t| t.encode()).collect();
+                            q_targets.iter().map(|t| t.encode()).collect();
                         subqueries.push(Box::new(data::target.eq_any(targets?)))
                     }
                     QueryComponent::Contains(_) => {
@@ -513,7 +513,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
                     }
                     QueryComponent::In(q_values) => {
                         let values: Result<Vec<_>, _> =
-                            q_values.into_iter().map(|v| v.to_str()).collect();
+                            q_values.iter().map(|v| v.to_str()).collect();
                         subqueries.push(Box::new(data::value.eq_any(values?)))
                     }
                     QueryComponent::Contains(q_value) => {
@@ -528,7 +528,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
                     _ => {
                         let mut result: Box<And<Box<Predicate>, Box<Predicate>>> =
                             Box::new(And::new(subqueries.remove(0), subqueries.remove(0)));
-                        while subqueries.len() > 0 {
+                        while !subqueries.is_empty() {
                             result = Box::new(And::new(result, subqueries.remove(0)));
                         }
                         Ok(Box::new(result))
@@ -548,7 +548,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
                     QueryQualifier::AND => {
                         let mut result: Box<And<Box<Predicate>, Box<Predicate>>> =
                             Box::new(And::new(subqueries.remove(0), subqueries.remove(0)));
-                        while subqueries.len() > 0 {
+                        while !subqueries.is_empty() {
                             result = Box::new(And::new(result, subqueries.remove(0)));
                         }
                         Ok(Box::new(result))
@@ -556,7 +556,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
                     QueryQualifier::OR => {
                         let mut result: Box<Or<Box<Predicate>, Box<Predicate>>> =
                             Box::new(Or::new(subqueries.remove(0), subqueries.remove(0)));
-                        while subqueries.len() > 0 {
+                        while !subqueries.is_empty() {
                             result = Box::new(Or::new(result, subqueries.remove(0)));
                         }
                         Ok(Box::new(result))