test_tools : rid off cyclic dependcy wip

Wandalen · Wandalen · commit eaa0cd1afb26 · 2024-11-05T18:31:53.000+02:00
diff --git a/module/core/collection_tools/tests/inc/bmap.rs b/module/core/collection_tools/tests/inc/bmap.rs
@@ -68,7 +68,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = ( i32, i32 );
-    type IntoIter = the_module::bmap::IntoIter< i32, i32 >;
+    type IntoIter = the_module::btree_map::IntoIter< i32, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -79,7 +79,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = ( &'a i32, &'a i32 );
-    type IntoIter = the_module::bmap::Iter< 'a, i32, i32 >;
+    type IntoIter = the_module::btree_map::Iter< 'a, i32, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/bset.rs b/module/core/collection_tools/tests/inc/bset.rs
@@ -67,7 +67,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = i32;
-    type IntoIter = the_module::bset::IntoIter< i32 >;
+    type IntoIter = the_module::btree_set::IntoIter< i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -78,7 +78,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = &'a i32;
-    type IntoIter = the_module::bset::Iter< 'a, i32 >;
+    type IntoIter = the_module::btree_set::Iter< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/deque.rs b/module/core/collection_tools/tests/inc/deque.rs
@@ -66,7 +66,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = i32;
-    type IntoIter = the_module::deque::IntoIter< i32 >;
+    type IntoIter = the_module::vec_deque::IntoIter< i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -77,7 +77,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = &'a i32;
-    type IntoIter = the_module::deque::Iter< 'a, i32 >;
+    type IntoIter = the_module::vec_deque::Iter< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -88,7 +88,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a mut MyContainer
   {
     type Item = &'a mut i32;
-    type IntoIter = the_module::deque::IterMut< 'a, i32 >;
+    type IntoIter = the_module::vec_deque::IterMut< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/heap.rs b/module/core/collection_tools/tests/inc/heap.rs
@@ -62,7 +62,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = i32;
-    type IntoIter = the_module::heap::IntoIter< i32 >;
+    type IntoIter = the_module::binary_heap::IntoIter< i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -73,7 +73,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = &'a i32;
-    type IntoIter = the_module::heap::Iter< 'a, i32 >;
+    type IntoIter = the_module::binary_heap::Iter< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/hmap.rs b/module/core/collection_tools/tests/inc/hmap.rs
@@ -77,7 +77,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = ( i32, i32 );
-    type IntoIter = the_module::hmap::IntoIter< i32, i32 >;
+    type IntoIter = the_module::hash_map::IntoIter< i32, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -88,7 +88,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = ( &'a i32, &'a i32 );
-    type IntoIter = the_module::hmap::Iter< 'a, i32, i32 >;
+    type IntoIter = the_module::hash_map::Iter< 'a, i32, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -99,7 +99,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a mut MyContainer
   {
     type Item = ( &'a i32, &'a mut i32 );
-    type IntoIter = the_module::hmap::IterMut< 'a, i32, i32 >;
+    type IntoIter = the_module::hash_map::IterMut< 'a, i32, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/hset.rs b/module/core/collection_tools/tests/inc/hset.rs
@@ -74,7 +74,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = i32;
-    type IntoIter = the_module::hset::IntoIter< i32 >;
+    type IntoIter = the_module::hash_set::IntoIter< i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -85,7 +85,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = &'a i32;
-    type IntoIter = the_module::hset::Iter< 'a, i32 >;
+    type IntoIter = the_module::hash_set::Iter< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/llist.rs b/module/core/collection_tools/tests/inc/llist.rs
@@ -67,7 +67,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = i32;
-    type IntoIter = the_module::llist::IntoIter< i32 >;
+    type IntoIter = the_module::linked_list::IntoIter< i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -78,7 +78,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = &'a i32;
-    type IntoIter = the_module::llist::Iter< 'a, i32 >;
+    type IntoIter = the_module::linked_list::Iter< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -89,7 +89,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a mut MyContainer
   {
     type Item = &'a mut i32;
-    type IntoIter = the_module::llist::IterMut< 'a, i32 >;
+    type IntoIter = the_module::linked_list::IterMut< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
diff --git a/module/core/collection_tools/tests/inc/vec.rs b/module/core/collection_tools/tests/inc/vec.rs
@@ -86,7 +86,7 @@ fn iters()
   impl IntoIterator for MyContainer
   {
     type Item = i32;
-    type IntoIter = the_module::vec::IntoIter< i32 >;
+    type IntoIter = the_module::vector::IntoIter< i32 >;
     // qqq : should work -- works
 
     fn into_iter( self ) -> Self::IntoIter
@@ -98,7 +98,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a MyContainer
   {
     type Item = &'a i32;
-    type IntoIter = the_module::vec::Iter< 'a, i32 >;
+    type IntoIter = the_module::vector::Iter< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {
@@ -109,7 +109,7 @@ fn iters()
   impl< 'a > IntoIterator for &'a mut MyContainer
   {
     type Item = &'a mut i32;
-    type IntoIter = the_module::vec::IterMut< 'a, i32 >;
+    type IntoIter = the_module::vector::IterMut< 'a, i32 >;
 
     fn into_iter( self ) -> Self::IntoIter
     {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ fn iters()`
`68`	`68`	`impl IntoIterator for MyContainer`
`69`	`69`	`{`
`70`	`70`	`type Item = ( i32, i32 );`
`71`		`- type IntoIter = the_module::bmap::IntoIter< i32, i32 >;`
	`71`	`+ type IntoIter = the_module::btree_map::IntoIter< i32, i32 >;`
`72`	`72`
`73`	`73`	`fn into_iter( self ) -> Self::IntoIter`
`74`	`74`	`{`
`@@ -79,7 +79,7 @@ fn iters()`
`79`	`79`	`impl< 'a > IntoIterator for &'a MyContainer`
`80`	`80`	`{`
`81`	`81`	`type Item = ( &'a i32, &'a i32 );`
`82`		`- type IntoIter = the_module::bmap::Iter< 'a, i32, i32 >;`
	`82`	`+ type IntoIter = the_module::btree_map::Iter< 'a, i32, i32 >;`
`83`	`83`
`84`	`84`	`fn into_iter( self ) -> Self::IntoIter`
`85`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ fn iters()`
`67`	`67`	`impl IntoIterator for MyContainer`
`68`	`68`	`{`
`69`	`69`	`type Item = i32;`
`70`		`- type IntoIter = the_module::bset::IntoIter< i32 >;`
	`70`	`+ type IntoIter = the_module::btree_set::IntoIter< i32 >;`
`71`	`71`
`72`	`72`	`fn into_iter( self ) -> Self::IntoIter`
`73`	`73`	`{`
`@@ -78,7 +78,7 @@ fn iters()`
`78`	`78`	`impl< 'a > IntoIterator for &'a MyContainer`
`79`	`79`	`{`
`80`	`80`	`type Item = &'a i32;`
`81`		`- type IntoIter = the_module::bset::Iter< 'a, i32 >;`
	`81`	`+ type IntoIter = the_module::btree_set::Iter< 'a, i32 >;`
`82`	`82`
`83`	`83`	`fn into_iter( self ) -> Self::IntoIter`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ fn iters()`
`66`	`66`	`impl IntoIterator for MyContainer`
`67`	`67`	`{`
`68`	`68`	`type Item = i32;`
`69`		`- type IntoIter = the_module::deque::IntoIter< i32 >;`
	`69`	`+ type IntoIter = the_module::vec_deque::IntoIter< i32 >;`
`70`	`70`
`71`	`71`	`fn into_iter( self ) -> Self::IntoIter`
`72`	`72`	`{`
`@@ -77,7 +77,7 @@ fn iters()`
`77`	`77`	`impl< 'a > IntoIterator for &'a MyContainer`
`78`	`78`	`{`
`79`	`79`	`type Item = &'a i32;`
`80`		`- type IntoIter = the_module::deque::Iter< 'a, i32 >;`
	`80`	`+ type IntoIter = the_module::vec_deque::Iter< 'a, i32 >;`
`81`	`81`
`82`	`82`	`fn into_iter( self ) -> Self::IntoIter`
`83`	`83`	`{`
`@@ -88,7 +88,7 @@ fn iters()`
`88`	`88`	`impl< 'a > IntoIterator for &'a mut MyContainer`
`89`	`89`	`{`
`90`	`90`	`type Item = &'a mut i32;`
`91`		`- type IntoIter = the_module::deque::IterMut< 'a, i32 >;`
	`91`	`+ type IntoIter = the_module::vec_deque::IterMut< 'a, i32 >;`
`92`	`92`
`93`	`93`	`fn into_iter( self ) -> Self::IntoIter`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ fn iters()`
`62`	`62`	`impl IntoIterator for MyContainer`
`63`	`63`	`{`
`64`	`64`	`type Item = i32;`
`65`		`- type IntoIter = the_module::heap::IntoIter< i32 >;`
	`65`	`+ type IntoIter = the_module::binary_heap::IntoIter< i32 >;`
`66`	`66`
`67`	`67`	`fn into_iter( self ) -> Self::IntoIter`
`68`	`68`	`{`
`@@ -73,7 +73,7 @@ fn iters()`
`73`	`73`	`impl< 'a > IntoIterator for &'a MyContainer`
`74`	`74`	`{`
`75`	`75`	`type Item = &'a i32;`
`76`		`- type IntoIter = the_module::heap::Iter< 'a, i32 >;`
	`76`	`+ type IntoIter = the_module::binary_heap::Iter< 'a, i32 >;`
`77`	`77`
`78`	`78`	`fn into_iter( self ) -> Self::IntoIter`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ fn iters()`
`74`	`74`	`impl IntoIterator for MyContainer`
`75`	`75`	`{`
`76`	`76`	`type Item = i32;`
`77`		`- type IntoIter = the_module::hset::IntoIter< i32 >;`
	`77`	`+ type IntoIter = the_module::hash_set::IntoIter< i32 >;`
`78`	`78`
`79`	`79`	`fn into_iter( self ) -> Self::IntoIter`
`80`	`80`	`{`
`@@ -85,7 +85,7 @@ fn iters()`
`85`	`85`	`impl< 'a > IntoIterator for &'a MyContainer`
`86`	`86`	`{`
`87`	`87`	`type Item = &'a i32;`
`88`		`- type IntoIter = the_module::hset::Iter< 'a, i32 >;`
	`88`	`+ type IntoIter = the_module::hash_set::Iter< 'a, i32 >;`
`89`	`89`
`90`	`90`	`fn into_iter( self ) -> Self::IntoIter`
`91`	`91`	`{`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ fn iters()`
`86`	`86`	`impl IntoIterator for MyContainer`
`87`	`87`	`{`
`88`	`88`	`type Item = i32;`
`89`		`- type IntoIter = the_module::vec::IntoIter< i32 >;`
	`89`	`+ type IntoIter = the_module::vector::IntoIter< i32 >;`
`90`	`90`	`// qqq : should work -- works`
`91`	`91`
`92`	`92`	`fn into_iter( self ) -> Self::IntoIter`
`@@ -98,7 +98,7 @@ fn iters()`
`98`	`98`	`impl< 'a > IntoIterator for &'a MyContainer`
`99`	`99`	`{`
`100`	`100`	`type Item = &'a i32;`
`101`		`- type IntoIter = the_module::vec::Iter< 'a, i32 >;`
	`101`	`+ type IntoIter = the_module::vector::Iter< 'a, i32 >;`
`102`	`102`
`103`	`103`	`fn into_iter( self ) -> Self::IntoIter`
`104`	`104`	`{`
`@@ -109,7 +109,7 @@ fn iters()`
`109`	`109`	`impl< 'a > IntoIterator for &'a mut MyContainer`
`110`	`110`	`{`
`111`	`111`	`type Item = &'a mut i32;`
`112`		`- type IntoIter = the_module::vec::IterMut< 'a, i32 >;`
	`112`	`+ type IntoIter = the_module::vector::IterMut< 'a, i32 >;`
`113`	`113`
`114`	`114`	`fn into_iter( self ) -> Self::IntoIter`
`115`	`115`	`{`