diff --git a/fastfield_codecs/src/lib.rs b/fastfield_codecs/src/lib.rs index a8d907ed6..0a3f24d12 100644 --- a/fastfield_codecs/src/lib.rs +++ b/fastfield_codecs/src/lib.rs @@ -94,15 +94,15 @@ mod tests { data: &[u64], name: &str, ) -> (f32, f32) { - if !S::is_applicable(&data, crate::tests::stats_from_vec(&data)) { + if !S::is_applicable(&data, crate::tests::stats_from_vec(data)) { return (f32::MAX, 0.0); } - let estimation = S::estimate(&data, crate::tests::stats_from_vec(&data)); + let estimation = S::estimate(&data, crate::tests::stats_from_vec(data)); let mut out = vec![]; S::serialize( &mut out, &data, - crate::tests::stats_from_vec(&data), + crate::tests::stats_from_vec(data), data.iter().cloned(), data.iter().cloned(), ) @@ -119,7 +119,7 @@ mod tests { } } let actual_compression = data.len() as f32 / out.len() as f32; - return (estimation, actual_compression); + (estimation, actual_compression) } pub fn get_codec_test_data_sets() -> Vec<(Vec, &'static str)> { let mut data_and_names = vec![]; diff --git a/src/collector/facet_collector.rs b/src/collector/facet_collector.rs index 79b764400..24200b7de 100644 --- a/src/collector/facet_collector.rs +++ b/src/collector/facet_collector.rs @@ -297,10 +297,8 @@ impl Collector for FacetCollector { if depth == collapse_depth + 1 { collapsed_id = collapse_facet_ords.len(); collapse_facet_ords.push(facet_streamer.term_ord()); - collapse_mapping.push(collapsed_id); - } else { - collapse_mapping.push(collapsed_id); } + collapse_mapping.push(collapsed_id); } break; } diff --git a/src/lib.rs b/src/lib.rs index 2d30bb4b3..8afda7f11 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,13 @@ #![doc(html_logo_url = "http://fulmicoton.com/tantivy-logo/tantivy-logo.png")] #![cfg_attr(all(feature = "unstable", test), feature(test))] -#![cfg_attr(feature = "cargo-clippy", allow(clippy::module_inception))] +#![cfg_attr( + feature = "cargo-clippy", + allow( + clippy::module_inception, + clippy::needless_range_loop, + clippy::bool_assert_comparison + ) +)] #![doc(test(attr(allow(unused_variables), deny(warnings))))] #![warn(missing_docs)] diff --git a/src/query/phrase_query/phrase_weight.rs b/src/query/phrase_query/phrase_weight.rs index 273fff777..4263bcdbd 100644 --- a/src/query/phrase_query/phrase_weight.rs +++ b/src/query/phrase_query/phrase_weight.rs @@ -48,8 +48,8 @@ impl PhraseWeight { ) -> crate::Result>> { let similarity_weight = self.similarity_weight.boost_by(boost); let fieldnorm_reader = self.fieldnorm_reader(reader)?; + let mut term_postings_list = Vec::new(); if reader.has_deletes() { - let mut term_postings_list = Vec::new(); for &(offset, ref term) in &self.phrase_terms { if let Some(postings) = reader .inverted_index(term.field())? @@ -60,14 +60,7 @@ impl PhraseWeight { return Ok(None); } } - Ok(Some(PhraseScorer::new( - term_postings_list, - similarity_weight, - fieldnorm_reader, - self.scoring_enabled, - ))) } else { - let mut term_postings_list = Vec::new(); for &(offset, ref term) in &self.phrase_terms { if let Some(postings) = reader .inverted_index(term.field())? @@ -78,13 +71,13 @@ impl PhraseWeight { return Ok(None); } } - Ok(Some(PhraseScorer::new( - term_postings_list, - similarity_weight, - fieldnorm_reader, - self.scoring_enabled, - ))) } + Ok(Some(PhraseScorer::new( + term_postings_list, + similarity_weight, + fieldnorm_reader, + self.scoring_enabled, + ))) } } diff --git a/src/query/term_query/term_scorer.rs b/src/query/term_query/term_scorer.rs index c1afd39b8..27220a10a 100644 --- a/src/query/term_query/term_scorer.rs +++ b/src/query/term_query/term_scorer.rs @@ -194,8 +194,8 @@ mod tests { .collect(); let mut fieldnorms: Vec = vec![]; - for i in 0..term_doc_freq { - let (tf, num_extra_terms) = term_freqs_fieldnorms[i]; + for item in term_freqs_fieldnorms.iter().take(term_doc_freq) { + let (tf, num_extra_terms) = item; fieldnorms.push(tf + num_extra_terms); } let average_fieldnorm = fieldnorms