diff --git a/src/core/segment_reader.rs b/src/core/segment_reader.rs index e2ce45291..49e1deecb 100644 --- a/src/core/segment_reader.rs +++ b/src/core/segment_reader.rs @@ -310,7 +310,7 @@ impl SegmentReader { } /// Returns an iterator that will iterate over the alive document ids - pub fn doc_ids_alive<'a>(&'a self) -> impl Iterator + 'a { + pub fn doc_ids_alive(&self) -> impl Iterator + '_ { (0u32..self.max_doc).filter(move |doc| !self.is_deleted(*doc)) } diff --git a/src/indexer/segment_writer.rs b/src/indexer/segment_writer.rs index 77be6aff0..80da2ce3e 100644 --- a/src/indexer/segment_writer.rs +++ b/src/indexer/segment_writer.rs @@ -11,7 +11,7 @@ use crate::schema::Schema; use crate::schema::Term; use crate::schema::Value; use crate::schema::{Field, FieldEntry}; -use crate::tokenizer::{BoxTokenStream, PreTokenizedStream}; +use crate::tokenizer::PreTokenizedStream; use crate::tokenizer::{FacetTokenizer, TextAnalyzer}; use crate::tokenizer::{TokenStreamChain, Tokenizer}; use crate::Opstamp; @@ -141,13 +141,13 @@ impl SegmentWriter { } let (term_buffer, multifield_postings) = (&mut self.term_buffer, &mut self.multifield_postings); - match *field_entry.field_type() { + match field_entry.field_type() { FieldType::HierarchicalFacet => { term_buffer.set_field(field); let facets = field_values .iter() - .flat_map(|field_value| match *field_value.value() { + .flat_map(|field_value| match field_value.value() { Value::Facet(ref facet) => Some(facet.encoded_str()), _ => { panic!("Expected hierarchical facet"); diff --git a/src/positions/reader.rs b/src/positions/reader.rs index 37fdae396..eded0c613 100644 --- a/src/positions/reader.rs +++ b/src/positions/reader.rs @@ -132,7 +132,7 @@ impl PositionReader { "offset arguments should be increasing." ); let delta_to_block_offset = offset as i64 - self.block_offset as i64; - if delta_to_block_offset < 0 || delta_to_block_offset >= 128 { + if !(0..128).contains(&delta_to_block_offset) { // The first position is not within the first block. // We need to decompress the first block. let delta_to_anchor_offset = offset - self.anchor_offset; diff --git a/src/postings/block_search.rs b/src/postings/block_search.rs index 08cd55379..2d4b7a3e6 100644 --- a/src/postings/block_search.rs +++ b/src/postings/block_search.rs @@ -109,9 +109,9 @@ impl BlockSearcher { /// The results should be equivalent to /// ```compile_fail /// block[..] - // .iter() - // .take_while(|&&val| val < target) - // .count() + /// .iter() + /// .take_while(|&&val| val < target) + /// .count() /// ``` /// /// The `start` argument is just used to hint that the response is diff --git a/src/store/index/skip_index.rs b/src/store/index/skip_index.rs index 43816c2b0..690355d18 100644 --- a/src/store/index/skip_index.rs +++ b/src/store/index/skip_index.rs @@ -35,11 +35,11 @@ struct Layer { } impl Layer { - fn cursor<'a>(&'a self) -> impl Iterator + 'a { + fn cursor(&self) -> impl Iterator + '_ { self.cursor_at_offset(0u64) } - fn cursor_at_offset<'a>(&'a self, start_offset: u64) -> impl Iterator + 'a { + fn cursor_at_offset(&self, start_offset: u64) -> impl Iterator + '_ { let data = &self.data.as_slice(); LayerCursor { remaining: &data[start_offset as usize..], @@ -59,7 +59,7 @@ pub struct SkipIndex { } impl SkipIndex { - pub(crate) fn checkpoints<'a>(&'a self) -> impl Iterator + 'a { + pub(crate) fn checkpoints(&self) -> impl Iterator + '_ { self.layers .last() .into_iter() diff --git a/src/store/reader.rs b/src/store/reader.rs index fa62a3257..af325e30e 100644 --- a/src/store/reader.rs +++ b/src/store/reader.rs @@ -46,7 +46,7 @@ impl StoreReader { }) } - pub(crate) fn block_checkpoints<'a>(&'a self) -> impl Iterator + 'a { + pub(crate) fn block_checkpoints(&self) -> impl Iterator + '_ { self.skip_index.checkpoints() }