From c594597a01422087a66e78bdfddd32d5abc99ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Sun, 6 Jan 2019 11:29:43 +0100 Subject: [PATCH] feat: Introduce multiple Iterator impl for Matches --- src/rank/mod.rs | 60 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/src/rank/mod.rs b/src/rank/mod.rs index 5416ca882..2023cb266 100644 --- a/src/rank/mod.rs +++ b/src/rank/mod.rs @@ -2,6 +2,7 @@ pub mod criterion; mod query_builder; mod distinct_map; +use std::iter::FusedIterator; use std::slice::Windows; use sdset::SetBuf; @@ -82,9 +83,10 @@ pub struct QueryIndexGroups<'a, 'b> { windows: Windows<'b, usize>, } -impl<'a, 'b> Iterator for QueryIndexGroups<'a, 'b> { +impl<'a> Iterator for QueryIndexGroups<'a, '_> { type Item = &'a [Match]; + #[inline] fn next(&mut self) -> Option { self.windows.next().map(|range| { match *range { @@ -93,10 +95,56 @@ impl<'a, 'b> Iterator for QueryIndexGroups<'a, 'b> { } }) } + + #[inline] + fn size_hint(&self) -> (usize, Option) { + self.windows.size_hint() + } + + #[inline] + fn count(self) -> usize { + self.len() + } + + #[inline] + fn nth(&mut self, n: usize) -> Option { + self.windows.nth(n).map(|range| { + match *range { + [left, right] => &self.matches[left..right], + _ => unreachable!(), + } + }) + } + + #[inline] + fn last(self) -> Option { + let (matches, windows) = (self.matches, self.windows); + windows.last().map(|range| { + match *range { + [left, right] => &matches[left..right], + _ => unreachable!(), + } + }) + } } -// impl ExactSizeIterator for QueryIndexGroups<'_, '_> { -// fn len(&self) -> usize { -// self.windows.len() // FIXME (+1) ? -// } -// } +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.windows.next_back().map(|range| { + match *range { + [left, right] => &self.matches[left..right], + _ => unreachable!(), + } + }) + } +}