Skip to content

IArray and IMap iterators now yields references #66

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

Merged
cecton merged 3 commits into from
Mar 5, 2025
Merged

IArray and IMap iterators now yields references #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60b0649
IArray and IMap iterators now yields references
cecton Mar 3, 2025
d50416c
Implement into_iter for IArray
cecton Mar 5, 2025
637c46e
Try removing IArrayIter
kirillsemyonkin Mar 5, 2025
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
67 changes: 27 additions & 40 deletions src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,74 +110,54 @@ impl<T: ImplicitClone + 'static, const N: usize> From<[T; N]> for IArray<T> {
}
}

/// An iterator over the elements of an `IArray`.
/// An iterator over the cloned elements of an `IArray`.
#[derive(Debug)]
pub struct Iter<T: ImplicitClone + 'static> {
pub struct IArrayIntoIter<T: ImplicitClone + 'static> {
array: IArray<T>,
left: usize,
right: usize,
}

impl<T: ImplicitClone + 'static> Iter<T> {
fn new(array: IArray<T>) -> Self {
Self {
impl<T: ImplicitClone + 'static> IntoIterator for IArray<T> {
type Item = T;
type IntoIter = IArrayIntoIter<T>;

fn into_iter(self) -> <Self as IntoIterator>::IntoIter {
IArrayIntoIter {
left: 0,
right: array.len(),
array,
right: self.len(),
array: self,
}
}
}

impl<T: ImplicitClone + 'static> Iterator for Iter<T> {
impl<T: ImplicitClone + 'static> Iterator for IArrayIntoIter<T> {
type Item = T;

fn next(&mut self) -> Option<Self::Item> {
if self.left >= self.right {
return None;
}
let item = self.array.get(self.left);
let item = &self.array[self.left];
self.left += 1;
item
Some(item.clone())
}
}

impl<T: ImplicitClone + 'static> DoubleEndedIterator for Iter<T> {
impl<T: ImplicitClone + 'static> DoubleEndedIterator for IArrayIntoIter<T> {
fn next_back(&mut self) -> Option<Self::Item> {
if self.left >= self.right {
return None;
}
self.right -= 1;
self.array.get(self.right)
Some(self.array[self.right].clone())
}
}

impl<T: ImplicitClone + 'static> IArray<T> {
/// An empty array without allocation.
pub const EMPTY: Self = Self::Static(&[]);

/// Returns a double-ended iterator over the array.
///
/// # Examples
///
/// ```
/// # use implicit_clone::unsync::*;
/// let x = IArray::<u8>::Static(&[1, 2, 3, 4, 5, 6]);
/// let mut iter = x.iter();
///
/// assert_eq!(Some(1), iter.next());
/// assert_eq!(Some(6), iter.next_back());
/// assert_eq!(Some(5), iter.next_back());
/// assert_eq!(Some(2), iter.next());
/// assert_eq!(Some(3), iter.next());
/// assert_eq!(Some(4), iter.next());
/// assert_eq!(None, iter.next());
/// assert_eq!(None, iter.next_back());
/// ```
#[inline]
pub fn iter(&self) -> Iter<T> {
Iter::new(self.clone())
}

/// Returns the number of elements in the vector, also referred to
/// as its 'length'.
///
Expand Down Expand Up @@ -236,21 +216,21 @@ impl<T: ImplicitClone + 'static> IArray<T> {
}
}

/// Returns a clone of an element at a position or `None` if out of bounds.
/// Returns a reference of an element at a position or `None` if out of bounds.
///
/// # Examples
///
/// ```
/// # use implicit_clone::unsync::*;
/// let v = IArray::<u8>::Static(&[10, 40, 30]);
/// assert_eq!(Some(40), v.get(1));
/// assert_eq!(Some(&40), v.get(1));
/// assert_eq!(None, v.get(3));
/// ```
#[inline]
pub fn get(&self, index: usize) -> Option<T> {
pub fn get(&self, index: usize) -> Option<&T> {
match self {
Self::Static(a) => a.get(index).cloned(),
Self::Rc(a) => a.get(index).cloned(),
Self::Static(a) => a.get(index),
Self::Rc(a) => a.get(index),
}
}

Expand Down Expand Up @@ -508,4 +488,11 @@ mod test_array {

impl ImplicitClone for _Node {}
}

#[test]
fn into_iter() {
let array = IArray::Static(&[1, 2, 3]);
assert_eq!(array.iter().next().unwrap(), &1);
assert_eq!(array.into_iter().next().unwrap(), 1);
}
}
63 changes: 48 additions & 15 deletions src/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,12 +298,23 @@ pub enum IMapIter<'a, K, V> {
impl<'a, K: Eq + Hash + ImplicitClone + 'static, V: PartialEq + ImplicitClone + 'static> Iterator
for IMapIter<'a, K, V>
{
type Item = (K, V);
type Item = (&'a K, &'a V);

fn next(&mut self) -> Option<Self::Item> {
match self {
Self::Slice(it) => it.next().map(|(k, v)| (k.clone(), v.clone())),
Self::Map(it) => it.next().map(|(k, v)| (k.clone(), v.clone())),
Self::Slice(it) => it.next().map(|(k, v)| (k, v)),
Self::Map(it) => it.next(),
}
}
}

impl<'a, K: Eq + Hash + ImplicitClone + 'static, V: PartialEq + ImplicitClone + 'static>
DoubleEndedIterator for IMapIter<'a, K, V>
{
fn next_back(&mut self) -> Option<Self::Item> {
match self {
Self::Slice(it) => it.next_back().map(|(k, v)| (k, v)),
Self::Map(it) => it.next_back(),
}
}
}
Expand All @@ -317,12 +328,23 @@ pub enum IMapKeys<'a, K, V> {
impl<'a, K: Eq + Hash + ImplicitClone + 'static, V: PartialEq + ImplicitClone + 'static> Iterator
for IMapKeys<'a, K, V>
{
type Item = K;
type Item = &'a K;

fn next(&mut self) -> Option<Self::Item> {
match self {
Self::Slice(it) => it.next().map(|(k, _)| k.clone()),
Self::Map(it) => it.next().cloned(),
Self::Slice(it) => it.next().map(|(k, _)| k),
Self::Map(it) => it.next(),
}
}
}

impl<'a, K: Eq + Hash + ImplicitClone + 'static, V: PartialEq + ImplicitClone + 'static>
DoubleEndedIterator for IMapKeys<'a, K, V>
{
fn next_back(&mut self) -> Option<Self::Item> {
match self {
Self::Slice(it) => it.next_back().map(|(k, _)| k),
Self::Map(it) => it.next_back(),
}
}
}
Expand All @@ -336,12 +358,23 @@ pub enum IMapValues<'a, K, V> {
impl<'a, K: Eq + Hash + ImplicitClone + 'static, V: PartialEq + ImplicitClone + 'static> Iterator
for IMapValues<'a, K, V>
{
type Item = V;
type Item = &'a V;

fn next(&mut self) -> Option<Self::Item> {
match self {
Self::Slice(it) => it.next().map(|(_, v)| v.clone()),
Self::Map(it) => it.next().cloned(),
Self::Slice(it) => it.next().map(|(_, v)| v),
Self::Map(it) => it.next(),
}
}
}

impl<'a, K: Eq + Hash + ImplicitClone + 'static, V: PartialEq + ImplicitClone + 'static>
DoubleEndedIterator for IMapValues<'a, K, V>
{
fn next_back(&mut self) -> Option<Self::Item> {
match self {
Self::Slice(it) => it.next_back().map(|(_, v)| v),
Self::Map(it) => it.next_back(),
}
}
}
Expand Down Expand Up @@ -413,12 +446,12 @@ mod test_map {
assert_eq!(
flattened_vec,
[
(IString::from("foo1"), 1),
(IString::from("bar1"), 2),
(IString::from("baz1"), 3),
(IString::from("foo2"), 4),
(IString::from("bar2"), 5),
(IString::from("baz2"), 6),
(&IString::from("foo1"), &1),
(&IString::from("bar1"), &2),
(&IString::from("baz1"), &3),
(&IString::from("foo2"), &4),
(&IString::from("bar2"), &5),
(&IString::from("baz2"), &6),
]
);
}
Expand Down