snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Revert "feat: Introduce multiple Iterator impl for Matches"

Browse Source 
This reverts commit c594597a01.
This commit is contained in:
Clément Renault 2019-01-06 21:26:27 +01:00
parent 34d2850d28
commit 2cc5fbde1a
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
1 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/rank/mod.rs
View File

@ -2,7 +2,6 @@ pub mod criterion;
mod query_builder; mod query_builder;
mod distinct_map; mod distinct_map;
use std::iter::FusedIterator;
use std::slice::Windows; use std::slice::Windows;
use sdset::SetBuf; use sdset::SetBuf;
@ -83,10 +82,9 @@ pub struct QueryIndexGroups<'a, 'b> {
windows: Windows<'b, usize>, windows: Windows<'b, usize>,
} }
impl<'a> Iterator for QueryIndexGroups<'a, '_> { impl<'a, 'b> Iterator for QueryIndexGroups<'a, 'b> {
type Item = &'a [Match]; type Item = &'a [Match];
#[inline]
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
self.windows.next().map(|range| { self.windows.next().map(|range| {
match *range { match *range {
@ -95,56 +93,10 @@ impl<'a> Iterator for QueryIndexGroups<'a, '_> {
} }
}) })
} }
#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
self.windows.size_hint()
} }
#[inline] // impl ExactSizeIterator for QueryIndexGroups<'_, '_> {
fn count(self) -> usize { // fn len(&self) -> usize {
self.len() // self.windows.len() // FIXME (+1) ?
} // }
// }
#[inline]
fn nth(&mut self, n: usize) -> Option<Self::Item> {
self.windows.nth(n).map(|range| {
match *range {
[left, right] => &self.matches[left..right],
_ => unreachable!(),
}
})
}
#[inline]
fn last(self) -> Option<Self::Item> {
let (matches, windows) = (self.matches, self.windows);
windows.last().map(|range| {
match *range {
[left, right] => &matches[left..right],
_ => unreachable!(),
}
})
}
}
impl ExactSizeIterator for QueryIndexGroups<'_, '_> {
#[inline]
fn len(&self) -> usize {
self.windows.len()
}
}
impl FusedIterator for QueryIndexGroups<'_, '_> { }
impl DoubleEndedIterator for QueryIndexGroups<'_, '_> {
#[inline]
fn next_back(&mut self) -> Option<Self::Item> {
self.windows.next_back().map(|range| {
match *range {
[left, right] => &self.matches[left..right],
_ => unreachable!(),
}
})
}
}