thm
/
upend
1
0
Fork 0
Code Issues 75 Pull Requests Packages Projects Releases 6 Wiki Activity

cargo clippy fixes

feat/vaults
Tomáš Mládek 2021-02-17 21:45:20 +01:00
parent 1bbcc00d65
commit 22dd315c47
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/database.rs
View File

@ -340,7 +340,7 @@ impl Query {
let (cons_vec, _) = value.clone().into_vec(); let (cons_vec, _) = value.clone().into_vec();
let sub_expressions = &cons_vec[1..]; let sub_expressions = &cons_vec[1..];
let values: Result<Vec<Box<Query>>> = sub_expressions let values: Result<Vec<Box<Query>>> = sub_expressions
.into_iter() .iter()
.map(|value| Ok(Box::new(Query::from_sexp(value)?))) .map(|value| Ok(Box::new(Query::from_sexp(value)?)))
.collect(); .collect();
@ -383,7 +383,7 @@ impl Query {
let (cons_vec, _) = cons.clone().into_vec(); let (cons_vec, _) = cons.clone().into_vec();
if let Some(split) = cons_vec.split_first() { if let Some(split) = cons_vec.split_first() {
let args = split.1; 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 lexpr::Value::String(str) = value {
if let Ok(value) = T::from_str(str.borrow()) { if let Ok(value) = T::from_str(str.borrow()) {
Ok(value) Ok(value)
@ -485,7 +485,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
} }
QueryComponent::In(q_targets) => { QueryComponent::In(q_targets) => {
let targets: Result<Vec<_>, _> = 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?))) subqueries.push(Box::new(data::target.eq_any(targets?)))
} }
QueryComponent::Contains(_) => { QueryComponent::Contains(_) => {
@ -513,7 +513,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
} }
QueryComponent::In(q_values) => { QueryComponent::In(q_values) => {
let values: Result<Vec<_>, _> = 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?))) subqueries.push(Box::new(data::value.eq_any(values?)))
} }
QueryComponent::Contains(q_value) => { 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>>> = let mut result: Box<And<Box<Predicate>, Box<Predicate>>> =
Box::new(And::new(subqueries.remove(0), subqueries.remove(0))); 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))); result = Box::new(And::new(result, subqueries.remove(0)));
} }
Ok(Box::new(result)) Ok(Box::new(result))
@ -548,7 +548,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
QueryQualifier::AND => { QueryQualifier::AND => {
let mut result: Box<And<Box<Predicate>, Box<Predicate>>> = let mut result: Box<And<Box<Predicate>, Box<Predicate>>> =
Box::new(And::new(subqueries.remove(0), subqueries.remove(0))); 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))); result = Box::new(And::new(result, subqueries.remove(0)));
} }
Ok(Box::new(result)) Ok(Box::new(result))
@ -556,7 +556,7 @@ fn query_to_sqlite(query: &Query) -> Result<Box<Predicate>> {
QueryQualifier::OR => { QueryQualifier::OR => {
let mut result: Box<Or<Box<Predicate>, Box<Predicate>>> = let mut result: Box<Or<Box<Predicate>, Box<Predicate>>> =
Box::new(Or::new(subqueries.remove(0), subqueries.remove(0))); 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))); result = Box::new(Or::new(result, subqueries.remove(0)));
} }
Ok(Box::new(result)) Ok(Box::new(result))