Merge pull request #154 from orxfun/Use-of-Collection-constrained-PinnedVecs

Use of Collection constrained PinnedVecs

Author: orxfun

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "orx-tree"
-version = "1.0.2"
+version = "1.1.0"
 edition = "2021"
 authors = ["orxfun <[email protected]>"]
 description = "A beautiful tree 🌳 with convenient and efficient growth, mutation and traversal features."
@@ -10,16 +10,16 @@ keywords = ["tree", "data-structures", "traversal", "traverse", "binarytree"]
 categories = ["data-structures", "algorithms", "rust-patterns", "no-std"]
 
 [dependencies]
-orx-pinned-vec = "3.11"
-orx-split-vec = "3.11"
-orx-selfref-col = "2.4"
+orx-pinned-vec = "3.12"
+orx-split-vec = "3.12"
+orx-selfref-col = "2.5"
 orx-self-or = "1.0"
 orx-iterable = "1.1.1"
 serde = { version = "1.0.217", optional = true, default-features = false }
 
 [dev-dependencies]
 test-case = { version = "3.3.1", default-features = false }
-serde_json = { version = "1.0.137", default-features = false, features = [
+serde_json = { version = "1.0.138", default-features = false, features = [
     "std",
 ] }
 

src/common_traits/into_iterator.rs

@@ -1,6 +1,6 @@
 use crate::{aliases::N, pinned_storage::PinnedStorage, MemoryPolicy, Tree, TreeVariant};
 use core::iter::FusedIterator;
-use orx_pinned_vec::PinnedVec;
+use orx_iterable::{Collection, CollectionMut, Iterable};
 
 // owned
 
@@ -102,6 +102,9 @@ where
 
 // ref
 
+type PinnedVecIter<'a, V, P> =
+    <<<P as PinnedStorage>::PinnedVec<V> as Collection>::Iterable<'a> as Iterable>::Iter;
+
 impl<'a, V, M, P> IntoIterator for &'a Tree<V, M, P>
 where
     V: TreeVariant,
@@ -110,8 +113,7 @@ where
 {
     type Item = &'a V::Item;
 
-    type IntoIter =
-        TreeIter<'a, V, <<P as PinnedStorage>::PinnedVec<V> as PinnedVec<N<V>>>::Iter<'a>>;
+    type IntoIter = TreeIter<'a, V, PinnedVecIter<'a, V, P>>;
 
     /// Creates an iterator over references to the data of the nodes of the tree in
     /// a deterministic but an arbitrary order.
@@ -203,6 +205,9 @@ where
 
 // mut
 
+type PinnedVecIterMut<'a, V, P> =
+    <<P as PinnedStorage>::PinnedVec<V> as CollectionMut>::IterMut<'a>;
+
 impl<'a, V, M, P> IntoIterator for &'a mut Tree<V, M, P>
 where
     V: TreeVariant,
@@ -211,8 +216,7 @@ where
 {
     type Item = &'a mut V::Item;
 
-    type IntoIter =
-        TreeIterMut<'a, V, <<P as PinnedStorage>::PinnedVec<V> as PinnedVec<N<V>>>::IterMut<'a>>;
+    type IntoIter = TreeIterMut<'a, V, PinnedVecIterMut<'a, V, P>>;
 
     /// Creates a mutable iterator over references to the data of the nodes of the tree in
     /// a deterministic but an arbitrary order.