Merge pull request #69 from orxfun/SplitVec-implements-Collection-and-CollectionMut

SplitVec implements Collection and CollectionMut

Author: orxfun

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "orx-split-vec"
-version = "3.11.1"
+version = "3.12.0"
 edition = "2021"
 authors = ["orxfun <orx.ugur.arikan@gmail.com>"]
 description = "An efficient dynamic capacity vector with pinned element guarantees."
@@ -10,8 +10,9 @@ keywords = ["vec", "array", "split", "fragments", "pinned"]
 categories = ["data-structures", "rust-patterns", "no-std"]
 
 [dependencies]
+orx-iterable = { version = "1.1.1", default-features = false }
+orx-pinned-vec = "3.12"
 orx-pseudo-default = { version = "1.4", default-features = false }
-orx-pinned-vec = "3.11"
 
 [[bench]]
 name = "serial_access"

src/common_traits/iterator/iter.rs

@@ -1,7 +1,16 @@
 use super::reductions;
-use crate::fragment::fragment_struct::Fragment;
+use crate::{fragment::fragment_struct::Fragment, Growth, SplitVec};
 use core::iter::FusedIterator;
 
+impl<'a, T, G: Growth> IntoIterator for &'a SplitVec<T, G> {
+    type Item = &'a T;
+    type IntoIter = Iter<'a, T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Self::IntoIter::new(&self.fragments)
+    }
+}
+
 /// Iterator over the `SplitVec`.
 ///
 /// This struct is created by `SplitVec::iter()` method.

src/common_traits/iterator/iter_mut.rs

@@ -1,6 +1,15 @@
-use crate::fragment::fragment_struct::Fragment;
+use crate::{fragment::fragment_struct::Fragment, Growth, SplitVec};
 use core::iter::FusedIterator;
 
+impl<'a, T, G: Growth> IntoIterator for &'a mut SplitVec<T, G> {
+    type Item = &'a mut T;
+    type IntoIter = IterMut<'a, T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Self::IntoIter::new(&mut self.fragments)
+    }
+}
+
 /// Mutable iterator over the `SplitVec`.
 ///
 /// This struct is created by `SplitVec::iter_mut()` method.

src/common_traits/iterator/tests/into_iter.rs

@@ -1,6 +1,6 @@
 use crate::{test_all_growth_types, Growth, SplitVec};
 use alloc::vec::Vec;
-use orx_pinned_vec::PinnedVec;
+use orx_pinned_vec::*;
 
 #[test]
 fn iter() {

src/common_traits/iterator/tests/iter.rs

@@ -1,6 +1,6 @@
 use crate::{test_all_growth_types, Growth, SplitVec};
 use alloc::vec::Vec;
-use orx_pinned_vec::PinnedVec;
+use orx_pinned_vec::*;
 
 #[test]
 fn iter() {

src/common_traits/iterator/tests/iter_mut.rs

@@ -1,6 +1,6 @@
 use crate::{test_all_growth_types, Growth, SplitVec};
 use alloc::vec::Vec;
-use orx_pinned_vec::PinnedVec;
+use orx_pinned_vec::*;
 
 #[test]
 fn iter_mut() {

src/common_traits/iterator/tests/iter_mut_rev.rs

@@ -1,6 +1,6 @@
 use crate::{test_all_growth_types, Growth, SplitVec};
 use alloc::vec::Vec;
-use orx_pinned_vec::PinnedVec;
+use orx_pinned_vec::*;
 
 #[test]
 fn iter_mut() {

src/common_traits/iterator/tests/iter_rev.rs

@@ -1,6 +1,6 @@
 use crate::{test_all_growth_types, Growth, SplitVec};
 use alloc::vec::Vec;
-use orx_pinned_vec::PinnedVec;
+use orx_pinned_vec::*;
 
 #[test]
 fn iter() {

src/lib.rs

@@ -49,6 +49,7 @@ pub use growth::{
     linear::Linear,
     recursive::Recursive,
 };
+pub use orx_iterable::{Collection, CollectionMut, Iterable};
 pub use orx_pinned_vec::{
     ConcurrentPinnedVec, IntoConcurrentPinnedVec, PinnedVec, PinnedVecGrowthError,
 };

src/pinned_vec.rs

@@ -6,6 +6,7 @@ use crate::{algorithms, Fragment, Growth, SplitVec};
 use alloc::vec::Vec;
 use core::cmp::Ordering;
 use core::ops::RangeBounds;
+use orx_iterable::Collection;
 use orx_pinned_vec::utils::slice;
 use orx_pinned_vec::{CapacityState, PinnedVec};
 use orx_pseudo_default::PseudoDefault;
@@ -20,16 +21,6 @@ impl<T, G: Growth> PseudoDefault for SplitVec<T, G> {
 }
 
 impl<T, G: Growth> PinnedVec<T> for SplitVec<T, G> {
-    type Iter<'a>
-        = crate::common_traits::iterator::iter::Iter<'a, T>
-    where
-        T: 'a,
-        Self: 'a;
-    type IterMut<'a>
-        = crate::common_traits::iterator::iter_mut::IterMut<'a, T>
-    where
-        T: 'a,
-        Self: 'a;
     type IterRev<'a>
         = crate::common_traits::iterator::iter_rev::IterRev<'a, T>
     where
@@ -625,14 +616,6 @@ impl<T, G: Growth> PinnedVec<T> for SplitVec<T, G> {
         }
     }
 
-    fn iter(&self) -> Self::Iter<'_> {
-        Self::Iter::new(&self.fragments)
-    }
-
-    fn iter_mut(&mut self) -> Self::IterMut<'_> {
-        Self::IterMut::new(&mut self.fragments)
-    }
-
     fn iter_rev(&self) -> Self::IterRev<'_> {
         Self::IterRev::new(&self.fragments)
     }