From ebdbb6bd2ee79751c3e99d252e3d01dfa0cf757c Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Fri, 10 Dec 2021 16:47:59 +0900 Subject: [PATCH] Fixing compilation warnings & clippy comments. --- src/collector/facet_collector.rs | 2 +- src/indexer/merger_sorted_index_test.rs | 2 +- src/postings/mod.rs | 2 +- src/store/compression_brotli.rs | 6 ++++-- src/store/compression_snap.rs | 2 +- src/store/mod.rs | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/collector/facet_collector.rs b/src/collector/facet_collector.rs index 01701b995..f87d644f0 100644 --- a/src/collector/facet_collector.rs +++ b/src/collector/facet_collector.rs @@ -727,7 +727,7 @@ mod bench { let mut index_writer = index.writer_for_tests().unwrap(); for doc in docs { - index_writer.add_document(doc); + index_writer.add_document(doc).unwrap(); } index_writer.commit().unwrap(); let reader = index.reader().unwrap(); diff --git a/src/indexer/merger_sorted_index_test.rs b/src/indexer/merger_sorted_index_test.rs index 2f6921565..42a5fd0e3 100644 --- a/src/indexer/merger_sorted_index_test.rs +++ b/src/indexer/merger_sorted_index_test.rs @@ -516,7 +516,7 @@ mod bench_sorted_index_merge { let index_doc = |index_writer: &mut IndexWriter, val: u64| { let mut doc = Document::default(); doc.add_u64(int_field, val); - index_writer.add_document(doc); + index_writer.add_document(doc).unwrap(); }; // 3 segments with 10_000 values in the fast fields for _ in 0..3 { diff --git a/src/postings/mod.rs b/src/postings/mod.rs index 69ecda7a9..a115ca438 100644 --- a/src/postings/mod.rs +++ b/src/postings/mod.rs @@ -617,7 +617,7 @@ mod bench { doc.add_text(text_field, "c"); } doc.add_text(text_field, "d"); - index_writer.add_document(doc); + index_writer.add_document(doc).unwrap(); } assert!(index_writer.commit().is_ok()); } diff --git a/src/store/compression_brotli.rs b/src/store/compression_brotli.rs index faf26f866..33d97815d 100644 --- a/src/store/compression_brotli.rs +++ b/src/store/compression_brotli.rs @@ -2,8 +2,10 @@ use std::io; #[inline] pub fn compress(mut uncompressed: &[u8], compressed: &mut Vec) -> io::Result<()> { - let mut params = brotli::enc::BrotliEncoderParams::default(); - params.quality = 5; + let params = brotli::enc::BrotliEncoderParams { + quality: 5, + ..Default::default() + }; compressed.clear(); brotli::BrotliCompress(&mut uncompressed, compressed, ¶ms)?; Ok(()) diff --git a/src/store/compression_snap.rs b/src/store/compression_snap.rs index a3bd044ee..4524d1e24 100644 --- a/src/store/compression_snap.rs +++ b/src/store/compression_snap.rs @@ -4,7 +4,7 @@ use std::io::{self, Read, Write}; pub fn compress(uncompressed: &[u8], compressed: &mut Vec) -> io::Result<()> { compressed.clear(); let mut encoder = snap::write::FrameEncoder::new(compressed); - encoder.write_all(&uncompressed)?; + encoder.write_all(uncompressed)?; encoder.flush()?; Ok(()) } diff --git a/src/store/mod.rs b/src/store/mod.rs index 50b642fc3..19c2aba2a 100644 --- a/src/store/mod.rs +++ b/src/store/mod.rs @@ -259,11 +259,11 @@ pub mod tests { let mut index_writer = index.writer_for_tests().unwrap(); // put enough data create enough blocks in the doc store to be considered for stacking for _ in 0..200 { - index_writer.add_document(doc!(text_field=> LOREM)); + index_writer.add_document(doc!(text_field=> LOREM))?; } assert!(index_writer.commit().is_ok()); for _ in 0..200 { - index_writer.add_document(doc!(text_field=> LOREM)); + index_writer.add_document(doc!(text_field=> LOREM))?; } assert!(index_writer.commit().is_ok()); }