Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement SkipTo for iter::Iter #287

Closed
wants to merge 16 commits into from
Closed

Implement SkipTo for iter::Iter #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6d11209
Implement SkipTo for iter::Iter
grelner Aug 6, 2024
df0b3cd
Fix panic when calling skip_to on iterator from empty bitmap
grelner Aug 6, 2024
c7f02c6
Make it compile on rust 1.66
grelner Aug 6, 2024
e8c57e0
Fix clippy warnings
grelner Aug 13, 2024
bb2a249
Implement advance_to and iter_from
grelner Aug 22, 2024
025d489
Merge in workspace pr
grelner Aug 22, 2024
d25a8fe
Fix advance_to when coming from an iterator with an iter_back
grelner Aug 22, 2024
d3f9cdb
Make it compile on 1.66
grelner Aug 22, 2024
2699703
Remove Empty variant in bitmap::store::Iter
grelner Sep 25, 2024
65b5330
Revert change in imports
grelner Sep 25, 2024
9a325bc
Refactor iterators
grelner Sep 25, 2024
feca297
Fix performance regression in iterators
grelner Sep 26, 2024
de80748
Remove dangling comment
grelner Oct 2, 2024
32a3695
Simplify store::Iter::peek
grelner Oct 2, 2024
522e945
Fix size_hint() when using advance_to
grelner Oct 2, 2024
3c86fd9
Fix nightly clippy errors
grelner Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion roaring/src/bitmap/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,15 @@ impl IntoIterator for Container {
}
}

impl<'a> Iterator for Iter<'a> {
impl Iterator for Iter<'_> {
type Item = u32;
fn next(&mut self) -> Option<u32> {
self.inner.next().map(|i| util::join(self.key, i))
}

fn size_hint(&self) -> (usize, Option<usize>) {
self.inner.size_hint()
}
}

impl DoubleEndedIterator for Iter<'_> {
Expand All @@ -313,3 +317,20 @@ impl fmt::Debug for Container {
format!("Container<{:?} @ {:?}>", self.len(), self.key).fmt(formatter)
}
}

impl Iter<'_> {
pub fn empty() -> Self {
Self { key: 0, inner: store::Iter::empty() }
}

#[inline]
pub fn peek(&mut self) -> Option<u32> {
self.inner.peek().map(|i| util::join(self.key, i))
}
}

impl AsRef<Container> for Container {
fn as_ref(&self) -> &Container {
self
}
}
Loading
Loading