NOBUG intellij misc lint

This commit is contained in:
Paul Masurel
2017-12-14 18:23:35 +09:00
parent 2589be3984
commit f24e5f405e
70 changed files with 259 additions and 264 deletions

View File

@@ -27,14 +27,14 @@ impl fmt::Debug for LogicalAST {
match *self {
LogicalAST::Clause(ref clause) => {
if clause.is_empty() {
try!(write!(formatter, "<emptyclause>"));
write!(formatter, "<emptyclause>")?;
} else {
let (ref occur, ref subquery) = clause[0];
try!(write!(formatter, "({}{:?}", occur_letter(*occur), subquery));
write!(formatter, "({}{:?}", occur_letter(*occur), subquery)?;
for &(ref occur, ref subquery) in &clause[1..] {
try!(write!(formatter, " {}{:?}", occur_letter(*occur), subquery));
write!(formatter, " {}{:?}", occur_letter(*occur), subquery)?;
}
try!(formatter.write_str(")"));
formatter.write_str(")")?;
}
Ok(())
}

View File

@@ -26,13 +26,13 @@ where
let term_query = (field, char(':'), term_val_with_field).map(|(field_name, _, phrase)| {
UserInputLiteral {
field_name: Some(field_name),
phrase: phrase,
phrase,
}
});
let term_default_field = term_val().map(|phrase| {
UserInputLiteral {
field_name: None,
phrase: phrase,
phrase,
}
});
try(term_query)

View File

@@ -93,7 +93,7 @@ impl QueryParser {
QueryParser {
schema,
default_fields,
tokenizer_manager: tokenizer_manager,
tokenizer_manager,
conjunction_by_default: false,
}
}

View File

@@ -37,8 +37,8 @@ impl<TailTokenStream> StemmerTokenStream<TailTokenStream>
fn wrap(stemmer: Arc<stemmer::Stemmer>, tail: TailTokenStream) -> StemmerTokenStream<TailTokenStream> {
StemmerTokenStream {
tail: tail,
stemmer: stemmer,
tail,
stemmer,
}
}
}

View File

@@ -33,11 +33,11 @@ impl fmt::Debug for UserInputAST {
UserInputAST::Must(ref subquery) => write!(formatter, "+({:?})", subquery),
UserInputAST::Clause(ref subqueries) => {
if subqueries.is_empty() {
try!(write!(formatter, "<emptyclause>"));
write!(formatter, "<emptyclause>")?;
} else {
try!(write!(formatter, "{:?}", &subqueries[0]));
write!(formatter, "{:?}", &subqueries[0])?;
for subquery in &subqueries[1..] {
try!(write!(formatter, " {:?}", subquery));
write!(formatter, " {:?}", subquery)?;
}
}
Ok(())