Skip to content

Add values_as_slice() to DenseSlotMap #81

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

Open
Jasper-Bekkers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add values_as_slice() to DenseSlotMap #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 22 additions & 17 deletions src/dense.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@ impl<K: Key, V> DenseSlotMap<K, V> {
.map_or(false, |slot| slot.version == kd.version.get())
}

/// Return a (unordered) slice of the values
pub fn values_as_slice(&self) -> &[V] {
&self.values
}

/// Inserts a value into the slot map. Returns a unique key that can be used
/// to access this value.
///
Expand Down Expand Up @@ -759,8 +764,8 @@ impl<K: Key, V> DenseSlotMap<K, V> {
/// let check: HashSet<_> = vec![&10, &20, &30].into_iter().collect();
/// assert_eq!(values, check);
/// ```
pub fn values(&self) -> Values<K, V> {
Values { inner: self.iter() }
pub fn values(&self) -> Values<V> {
Values { inner: self.values.iter() }
}

/// An iterator visiting all values mutably in arbitrary order. The iterator
Expand All @@ -780,9 +785,9 @@ impl<K: Key, V> DenseSlotMap<K, V> {
/// let check: HashSet<_> = vec![3, 6, 9].into_iter().collect();
/// assert_eq!(values, check);
/// ```
pub fn values_mut(&mut self) -> ValuesMut<K, V> {
pub fn values_mut(&mut self) -> ValuesMut<V> {
ValuesMut {
inner: self.iter_mut(),
inner: self.values.iter_mut(),
}
}
}
Expand Down Expand Up @@ -900,11 +905,11 @@ impl<'a, K: 'a + Key, V: 'a> Clone for Keys<'a, K, V> {
///
/// This iterator is created by [`DenseSlotMap::values`].
#[derive(Debug)]
pub struct Values<'a, K: 'a + Key, V> {
inner: Iter<'a, K, V>,
pub struct Values<'a, V> {
inner: core::slice::Iter<'a, V>,
}

impl<'a, K: 'a + Key, V: 'a> Clone for Values<'a, K, V> {
impl<'a, V: 'a> Clone for Values<'a, V> {
fn clone(&self) -> Self {
Values {
inner: self.inner.clone(),
Expand All @@ -916,8 +921,8 @@ impl<'a, K: 'a + Key, V: 'a> Clone for Values<'a, K, V> {
///
/// This iterator is created by [`DenseSlotMap::values_mut`].
#[derive(Debug)]
pub struct ValuesMut<'a, K: 'a + Key, V: 'a> {
inner: IterMut<'a, K, V>,
pub struct ValuesMut<'a, V: 'a> {
inner: core::slice::IterMut<'a, V>,
}

impl<'a, K: Key, V> Iterator for Drain<'a, K, V> {
Expand Down Expand Up @@ -1017,23 +1022,23 @@ impl<'a, K: 'a + Key, V> Iterator for Keys<'a, K, V> {
}
}

impl<'a, K: 'a + Key, V> Iterator for Values<'a, K, V> {
impl<'a, V> Iterator for Values<'a, V> {
type Item = &'a V;

fn next(&mut self) -> Option<&'a V> {
self.inner.next().map(|(_, value)| value)
self.inner.next()
}

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

impl<'a, K: 'a + Key, V> Iterator for ValuesMut<'a, K, V> {
impl<'a, V> Iterator for ValuesMut<'a, V> {
type Item = &'a mut V;

fn next(&mut self) -> Option<&'a mut V> {
self.inner.next().map(|(_, value)| value)
self.inner.next()
}

fn size_hint(&self) -> (usize, Option<usize>) {
Expand Down Expand Up @@ -1074,16 +1079,16 @@ impl<K: Key, V> IntoIterator for DenseSlotMap<K, V> {
impl<'a, K: 'a + Key, V> FusedIterator for Iter<'a, K, V> {}
impl<'a, K: 'a + Key, V> FusedIterator for IterMut<'a, K, V> {}
impl<'a, K: 'a + Key, V> FusedIterator for Keys<'a, K, V> {}
impl<'a, K: 'a + Key, V> FusedIterator for Values<'a, K, V> {}
impl<'a, K: 'a + Key, V> FusedIterator for ValuesMut<'a, K, V> {}
impl<'a, V> FusedIterator for Values<'a, V> {}
impl<'a, V> FusedIterator for ValuesMut<'a, V> {}
impl<'a, K: 'a + Key, V> FusedIterator for Drain<'a, K, V> {}
impl<K: Key, V> FusedIterator for IntoIter<K, V> {}

impl<'a, K: 'a + Key, V> ExactSizeIterator for Iter<'a, K, V> {}
impl<'a, K: 'a + Key, V> ExactSizeIterator for IterMut<'a, K, V> {}
impl<'a, K: 'a + Key, V> ExactSizeIterator for Keys<'a, K, V> {}
impl<'a, K: 'a + Key, V> ExactSizeIterator for Values<'a, K, V> {}
impl<'a, K: 'a + Key, V> ExactSizeIterator for ValuesMut<'a, K, V> {}
impl<'a, V> ExactSizeIterator for Values<'a, V> {}
impl<'a, V> ExactSizeIterator for ValuesMut<'a, V> {}
impl<'a, K: 'a + Key, V> ExactSizeIterator for Drain<'a, K, V> {}
impl<K: Key, V> ExactSizeIterator for IntoIter<K, V> {}

Expand Down