diff --git a/fastfield_codecs/src/main.rs b/fastfield_codecs/src/main.rs index 71107333e..38a24b51d 100644 --- a/fastfield_codecs/src/main.rs +++ b/fastfield_codecs/src/main.rs @@ -30,7 +30,7 @@ fn main() { //.unwrap(); let best_compression_ratio_codec = results .iter() - .min_by(|res1, res2| res1.partial_cmp(&res2).unwrap()) + .min_by(|res1, res2| res1.partial_cmp(res2).unwrap()) .cloned() .unwrap(); @@ -41,6 +41,7 @@ fn main() { } else { (est.to_string(), comp.to_string()) }; + #[allow(clippy::all)] let style = if comp == best_compression_ratio_codec.1 { "Fb" } else { @@ -96,23 +97,25 @@ pub fn get_codec_test_data_sets() -> Vec<(Vec, &'static str)> { pub fn serialize_with_codec( data: &[u64], ) -> (bool, f32, f32, &'static str) { - let is_applicable = S::is_applicable(&data, stats_from_vec(&data)); + let is_applicable = S::is_applicable(&data, stats_from_vec(data)); if !is_applicable { return (false, 0.0, 0.0, S::NAME); } - let estimation = S::estimate(&data, stats_from_vec(&data)); + let estimation = S::estimate(&data, stats_from_vec(data)); let mut out = vec![]; - S::serialize( + match S::serialize( &mut out, &data, - stats_from_vec(&data), + stats_from_vec(data), data.iter().cloned(), data.iter().cloned(), - ) - .unwrap(); + ) { + Ok(it) => it, + _ => unreachable!(), + }; let actual_compression = out.len() as f32 / (data.len() * 8) as f32; - return (true, estimation, actual_compression, S::NAME); + (true, estimation, actual_compression, S::NAME) } pub fn stats_from_vec(data: &[u64]) -> FastFieldStats { diff --git a/fastfield_codecs/src/multilinearinterpol.rs b/fastfield_codecs/src/multilinearinterpol.rs index 45dfde5c2..2a612375a 100644 --- a/fastfield_codecs/src/multilinearinterpol.rs +++ b/fastfield_codecs/src/multilinearinterpol.rs @@ -368,7 +368,7 @@ mod tests { crate::tests::create_and_validate::< MultiLinearInterpolFastFieldSerializer, MultiLinearInterpolFastFieldReader, - >(&data, name); + >(data, name); } #[test] diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs index c4e6b8b6d..594588cf4 100644 --- a/src/fastfield/mod.rs +++ b/src/fastfield/mod.rs @@ -267,8 +267,8 @@ mod tests { .unwrap(); serializer.close().unwrap(); } - let file = directory.open_read(&path).unwrap(); - assert_eq!(file.len(), 37 as usize); + let file = directory.open_read(path).unwrap(); + assert_eq!(file.len(), 37); let composite_file = CompositeFile::open(&file)?; let file = composite_file.open_read(*FIELD).unwrap(); let fast_field_reader = DynamicFastFieldReader::::open(file)?; @@ -298,8 +298,8 @@ mod tests { fast_field_writers.serialize(&mut serializer, &HashMap::new(), None)?; serializer.close()?; } - let file = directory.open_read(&path)?; - assert_eq!(file.len(), 62 as usize); + let file = directory.open_read(path)?; + assert_eq!(file.len(), 62); { let fast_fields_composite = CompositeFile::open(&file)?; let data = fast_fields_composite.open_read(*FIELD).unwrap(); @@ -334,8 +334,8 @@ mod tests { .unwrap(); serializer.close().unwrap(); } - let file = directory.open_read(&path).unwrap(); - assert_eq!(file.len(), 35 as usize); + let file = directory.open_read(path).unwrap(); + assert_eq!(file.len(), 35); { let fast_fields_composite = CompositeFile::open(&file).unwrap(); let data = fast_fields_composite.open_read(*FIELD).unwrap(); @@ -366,8 +366,8 @@ mod tests { .unwrap(); serializer.close().unwrap(); } - let file = directory.open_read(&path).unwrap(); - assert_eq!(file.len(), 80043 as usize); + let file = directory.open_read(path).unwrap(); + assert_eq!(file.len(), 80043); { let fast_fields_composite = CompositeFile::open(&file)?; let data = fast_fields_composite.open_read(*FIELD).unwrap(); diff --git a/src/indexer/index_writer.rs b/src/indexer/index_writer.rs index 63487c160..7da5493f2 100644 --- a/src/indexer/index_writer.rs +++ b/src/indexer/index_writer.rs @@ -1545,9 +1545,9 @@ mod tests { .facet_from_ord(facet_ords[0], &mut facet) .unwrap(); let id = ff_reader.get(doc_id); - let facet = Facet::from(&("/cola/".to_string() + &id.to_string())); + let facet_expected = Facet::from(&("/cola/".to_string() + &id.to_string())); - assert_eq!(facet, facet); + assert_eq!(facet, facet_expected); } } Ok(()) diff --git a/src/postings/compression/mod.rs b/src/postings/compression/mod.rs index b05edad49..407d8ca8e 100644 --- a/src/postings/compression/mod.rs +++ b/src/postings/compression/mod.rs @@ -85,13 +85,13 @@ impl BlockDecoder { ) -> usize { self.output_len = COMPRESSION_BLOCK_SIZE; self.bitpacker - .decompress_sorted(offset, &compressed_data, &mut self.output.0, num_bits) + .decompress_sorted(offset, compressed_data, &mut self.output.0, num_bits) } pub fn uncompress_block_unsorted(&mut self, compressed_data: &[u8], num_bits: u8) -> usize { self.output_len = COMPRESSION_BLOCK_SIZE; self.bitpacker - .decompress(&compressed_data, &mut self.output.0, num_bits) + .decompress(compressed_data, &mut self.output.0, num_bits) } #[inline] diff --git a/src/reader/pool.rs b/src/reader/pool.rs index 516ef766c..ef70dcf8c 100644 --- a/src/reader/pool.rs +++ b/src/reader/pool.rs @@ -253,7 +253,7 @@ mod tests { threads.push(thread::spawn(move || { assert_eq!(start_1_recv.recv(), Ok("start")); - let _leased_searcher = &pool1.acquire(); + let _leased_searcher = pool1.acquire(); assert!(event_send1.send("1 acquired").is_ok()); assert_eq!(start_1_recv.recv(), Ok("stop")); assert!(event_send1.send("1 stopped").is_ok()); @@ -262,7 +262,7 @@ mod tests { threads.push(thread::spawn(move || { assert_eq!(start_2_recv.recv(), Ok("start")); - let _leased_searcher = &pool2.acquire(); + let _leased_searcher = pool2.acquire(); assert!(event_send2.send("2 acquired").is_ok()); assert_eq!(start_2_recv.recv(), Ok("stop")); mem::drop(_leased_searcher); @@ -271,7 +271,7 @@ mod tests { threads.push(thread::spawn(move || { assert_eq!(start_3_recv.recv(), Ok("start")); - let _leased_searcher = &pool3.acquire(); + let _leased_searcher = pool3.acquire(); assert!(event_send3.send("3 acquired").is_ok()); assert_eq!(start_3_recv.recv(), Ok("stop")); mem::drop(_leased_searcher); diff --git a/src/snippet/mod.rs b/src/snippet/mod.rs index 708cc82ae..da753cd4d 100644 --- a/src/snippet/mod.rs +++ b/src/snippet/mod.rs @@ -303,7 +303,7 @@ mod tests { use std::collections::BTreeMap; use std::iter::Iterator; - const TEST_TEXT: &'static str = r#"Rust is a systems programming language sponsored by + const TEST_TEXT: &str = r#"Rust is a systems programming language sponsored by Mozilla which describes it as a "safe, concurrent, practical language", supporting functional and imperative-procedural paradigms. Rust is syntactically similar to C++[according to whom?], but its designers intend it to provide better memory safety while still maintaining @@ -330,7 +330,7 @@ Survey in 2016, 2017, and 2018."#; assert_eq!(first.score, 1.9); assert_eq!(first.stop_offset, 89); } - let snippet = select_best_fragment_combination(&fragments[..], &TEST_TEXT); + let snippet = select_best_fragment_combination(&fragments[..], TEST_TEXT); assert_eq!( snippet.fragments, "Rust is a systems programming language sponsored by\n\ @@ -356,7 +356,7 @@ Survey in 2016, 2017, and 2018."#; assert_eq!(first.score, 1.0); assert_eq!(first.stop_offset, 17); } - let snippet = select_best_fragment_combination(&fragments[..], &TEST_TEXT); + let snippet = select_best_fragment_combination(&fragments[..], TEST_TEXT); assert_eq!(snippet.to_html(), "Rust is a systems") } { @@ -371,7 +371,7 @@ Survey in 2016, 2017, and 2018."#; assert_eq!(first.score, 0.9); assert_eq!(first.stop_offset, 17); } - let snippet = select_best_fragment_combination(&fragments[..], &TEST_TEXT); + let snippet = select_best_fragment_combination(&fragments[..], TEST_TEXT); assert_eq!(snippet.to_html(), "programming language") } } @@ -383,7 +383,7 @@ Survey in 2016, 2017, and 2018."#; let mut terms = BTreeMap::new(); terms.insert(String::from("c"), 1.0); - let fragments = search_fragments(&From::from(SimpleTokenizer), &text, &terms, 3); + let fragments = search_fragments(&From::from(SimpleTokenizer), text, &terms, 3); assert_eq!(fragments.len(), 1); { @@ -393,7 +393,7 @@ Survey in 2016, 2017, and 2018."#; assert_eq!(first.stop_offset, 7); } - let snippet = select_best_fragment_combination(&fragments[..], &text); + let snippet = select_best_fragment_combination(&fragments[..], text); assert_eq!(snippet.fragments, "c d"); assert_eq!(snippet.to_html(), "c d"); } @@ -405,7 +405,7 @@ Survey in 2016, 2017, and 2018."#; let mut terms = BTreeMap::new(); terms.insert(String::from("f"), 1.0); - let fragments = search_fragments(&From::from(SimpleTokenizer), &text, &terms, 3); + let fragments = search_fragments(&From::from(SimpleTokenizer), text, &terms, 3); assert_eq!(fragments.len(), 2); { @@ -415,7 +415,7 @@ Survey in 2016, 2017, and 2018."#; assert_eq!(first.start_offset, 8); } - let snippet = select_best_fragment_combination(&fragments[..], &text); + let snippet = select_best_fragment_combination(&fragments[..], text); assert_eq!(snippet.fragments, "e f"); assert_eq!(snippet.to_html(), "e f"); } @@ -428,7 +428,7 @@ Survey in 2016, 2017, and 2018."#; terms.insert(String::from("f"), 1.0); terms.insert(String::from("a"), 0.9); - let fragments = search_fragments(&From::from(SimpleTokenizer), &text, &terms, 7); + let fragments = search_fragments(&From::from(SimpleTokenizer), text, &terms, 7); assert_eq!(fragments.len(), 2); { @@ -438,7 +438,7 @@ Survey in 2016, 2017, and 2018."#; assert_eq!(first.start_offset, 0); } - let snippet = select_best_fragment_combination(&fragments[..], &text); + let snippet = select_best_fragment_combination(&fragments[..], text); assert_eq!(snippet.fragments, "e f g"); assert_eq!(snippet.to_html(), "e f g"); } @@ -450,11 +450,11 @@ Survey in 2016, 2017, and 2018."#; let mut terms = BTreeMap::new(); terms.insert(String::from("z"), 1.0); - let fragments = search_fragments(&From::from(SimpleTokenizer), &text, &terms, 3); + let fragments = search_fragments(&From::from(SimpleTokenizer), text, &terms, 3); assert_eq!(fragments.len(), 0); - let snippet = select_best_fragment_combination(&fragments[..], &text); + let snippet = select_best_fragment_combination(&fragments[..], text); assert_eq!(snippet.fragments, ""); assert_eq!(snippet.to_html(), ""); } @@ -464,10 +464,10 @@ Survey in 2016, 2017, and 2018."#; let text = "a b c d"; let terms = BTreeMap::new(); - let fragments = search_fragments(&From::from(SimpleTokenizer), &text, &terms, 3); + let fragments = search_fragments(&From::from(SimpleTokenizer), text, &terms, 3); assert_eq!(fragments.len(), 0); - let snippet = select_best_fragment_combination(&fragments[..], &text); + let snippet = select_best_fragment_combination(&fragments[..], text); assert_eq!(snippet.fragments, ""); assert_eq!(snippet.to_html(), ""); }