diff --git a/columnar/src/column_index/merge/stacked.rs b/columnar/src/column_index/merge/stacked.rs index 9ef294b60..ba91b8d64 100644 --- a/columnar/src/column_index/merge/stacked.rs +++ b/columnar/src/column_index/merge/stacked.rs @@ -111,10 +111,7 @@ fn stack_multivalued_indexes<'a>( let mut last_row_id = 0; let mut current_it = multivalued_indexes.next(); Box::new(std::iter::from_fn(move || loop { - let Some(multivalued_index) = current_it.as_mut() else { - return None; - }; - if let Some(row_id) = multivalued_index.next() { + if let Some(row_id) = current_it.as_mut()?.next() { last_row_id = offset + row_id; return Some(last_row_id); } diff --git a/src/core/tests.rs b/src/core/tests.rs index e215c31f4..30c7dd801 100644 --- a/src/core/tests.rs +++ b/src/core/tests.rs @@ -424,7 +424,7 @@ fn test_non_text_json_term_freq() { json_term_writer.set_fast_value(75u64); let postings = inv_idx .read_postings( - &json_term_writer.term(), + json_term_writer.term(), IndexRecordOption::WithFreqsAndPositions, ) .unwrap() @@ -462,7 +462,7 @@ fn test_non_text_json_term_freq_bitpacked() { json_term_writer.set_fast_value(75u64); let mut postings = inv_idx .read_postings( - &json_term_writer.term(), + json_term_writer.term(), IndexRecordOption::WithFreqsAndPositions, ) .unwrap() diff --git a/src/directory/ram_directory.rs b/src/directory/ram_directory.rs index a7a29b15c..cfd447c22 100644 --- a/src/directory/ram_directory.rs +++ b/src/directory/ram_directory.rs @@ -85,7 +85,7 @@ impl InnerDirectory { self.fs .get(path) .ok_or_else(|| OpenReadError::FileDoesNotExist(PathBuf::from(path))) - .map(Clone::clone) + .cloned() } fn delete(&mut self, path: &Path) -> result::Result<(), DeleteError> { diff --git a/src/snippet/mod.rs b/src/snippet/mod.rs index 6542df5a3..16edac043 100644 --- a/src/snippet/mod.rs +++ b/src/snippet/mod.rs @@ -743,11 +743,12 @@ Survey in 2016, 2017, and 2018."#; #[test] fn test_collapse_overlapped_ranges() { - assert_eq!(&collapse_overlapped_ranges(&[0..1, 2..3,]), &[0..1, 2..3]); - assert_eq!(&collapse_overlapped_ranges(&[0..1, 1..2,]), &[0..1, 1..2]); - assert_eq!(&collapse_overlapped_ranges(&[0..2, 1..2,]), &[0..2]); - assert_eq!(&collapse_overlapped_ranges(&[0..2, 1..3,]), &[0..3]); - assert_eq!(&collapse_overlapped_ranges(&[0..3, 1..2,]), &[0..3]); + #![allow(clippy::single_range_in_vec_init)] + assert_eq!(&collapse_overlapped_ranges(&[0..1, 2..3]), &[0..1, 2..3]); + assert_eq!(&collapse_overlapped_ranges(&[0..1, 1..2]), &[0..1, 1..2]); + assert_eq!(&collapse_overlapped_ranges(&[0..2, 1..2]), &[0..2]); + assert_eq!(&collapse_overlapped_ranges(&[0..2, 1..3]), &[0..3]); + assert_eq!(&collapse_overlapped_ranges(&[0..3, 1..2]), &[0..3]); } #[test] diff --git a/src/store/mod.rs b/src/store/mod.rs index 7fbd8c1e5..1cb1a1101 100644 --- a/src/store/mod.rs +++ b/src/store/mod.rs @@ -129,10 +129,7 @@ pub mod tests { ); } - for (_, doc) in store - .iter::(Some(&alive_bitset)) - .enumerate() - { + for doc in store.iter::(Some(&alive_bitset)) { let doc = doc?; let title_content = doc.get_first(field_title).unwrap().as_str().unwrap(); if !title_content.starts_with("Doc ") {