test_tools : rid of cyclic dependcy wip

Wandalen · Wandalen · commit 821daf124e1d · 2024-11-05T18:54:48.000+02:00
diff --git a/module/core/collection_tools/src/collection.rs b/module/core/collection_tools/src/collection.rs
@@ -43,9 +43,6 @@ pub mod own
 {
   use super::*;
 
-  #[ doc( inline ) ]
-  pub use super::super::collection;
-
   pub use super::super::collection::
   {
     btree_map,
@@ -83,19 +80,8 @@ pub mod exposed
   #[ doc( inline ) ]
   pub use prelude::*;
 
-  // #[ doc( inline ) ]
-  // #[ cfg( any( feature = "use_alloc", all( feature = "collection_constructors", not( feature = "no_std" ) ) ) ) ]
-  // pub use crate::
-  // {
-  //   vec as dlist,
-  // };
-
-  // #[ doc( inline ) ]
-  // #[ cfg( any( feature = "use_alloc", all( feature = "collection_into_constructors", not( feature = "no_std" ) ) ) ) ]
-  // pub use crate::
-  // {
-  //   into_vec as into_dlist,
-  // };
+  #[ doc( inline ) ]
+  pub use super::super::collection;
 
   #[ doc( inline ) ]
   #[ cfg( any( feature = "use_alloc", all( feature = "collection_constructors", not( feature = "no_std" ) ) ) ) ]
diff --git a/module/core/collection_tools/tests/inc/mod.rs b/module/core/collection_tools/tests/inc/mod.rs
@@ -9,7 +9,7 @@ mod llist;
 mod vec;
 mod deque;
 
-mod basic;
+mod namespace_test;
 mod components;
 
 // qqq : make subdirectory for each container -- done
diff --git a/module/core/collection_tools/tests/inc/namespace_test.rs b/module/core/collection_tools/tests/inc/namespace_test.rs
@@ -1,13 +1,12 @@
-#[ allow( unused_imports ) ]
 use super::*;
 
 #[ test ]
-fn basic()
+fn exposed_main_namespace()
 {
 
-  use the_module::own::*;
-  let _v : Vec< u32 > = collection::Vec::new();
   let _v : Vec< u32 > = the_module::collection::Vec::new();
-  let _v : Vec< u32 > = the_module::own::collection::Vec::new();
+  let _v : Vec< u32 > = the_module::exposed::collection::Vec::new();
+  use the_module::exposed::*;
+  let _v : Vec< u32 > = collection::Vec::new();
 
 }
diff --git a/module/core/collection_tools/tests/tests.rs b/module/core/collection_tools/tests/tests.rs
@@ -1,4 +1,4 @@
-// usual tests
+#![ allow( unused_imports ) ]
 
 #[ path="../../../../module/step/meta/src/module/aggregating.rs" ]
 mod aggregating;
diff --git a/module/core/error_tools/src/error/mod.rs b/module/core/error_tools/src/error/mod.rs
@@ -286,6 +286,9 @@ pub mod exposed
   #[ doc( inline ) ]
   pub use prelude::*;
 
+  // Expose itself.
+  pub use super::super::error;
+
   #[ doc( inline ) ]
   pub use private::
   {
diff --git a/module/core/error_tools/tests/inc/basic_test.rs b/module/core/error_tools/tests/inc/basic_test.rs
@@ -1,5 +1,5 @@
 #![ allow( deprecated ) ]
-#![ allow( unused_imports ) ]
+// #![ allow( unused_imports ) ]
 use super::*;
 
 //
diff --git a/module/core/error_tools/tests/inc/mod.rs b/module/core/error_tools/tests/inc/mod.rs
@@ -1,8 +1,10 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
-mod assert_test;
 mod basic_test;
+mod namespace_test;
+
+mod assert_test;
 #[ cfg( not( feature = "no_std" ) ) ]
 mod err_with_test;
 mod untyped_test;
diff --git a/module/core/error_tools/tests/inc/namespace_test.rs b/module/core/error_tools/tests/inc/namespace_test.rs
@@ -0,0 +1,12 @@
+use super::*;
+
+#[ test ]
+fn exposed_main_namespace()
+{
+
+  the_module::error::debug_assert_id!( 1, 1 );
+  the_module::exposed::error::debug_assert_id!( 1, 1 );
+  use the_module::exposed::*;
+  error::debug_assert_id!( 1, 1 );
+
+}
diff --git a/module/core/error_tools/tests/tests.rs b/module/core/error_tools/tests/tests.rs
@@ -1,7 +1,6 @@
+#![ allow( unused_imports ) ]
 
-#[ allow( unused_imports ) ]
 use error_tools as the_module;
-#[ allow( unused_imports ) ]
 use test_tools::exposed::*;
 
 mod inc;
diff --git a/module/core/test_tools/src/lib.rs b/module/core/test_tools/src/lib.rs
@@ -128,11 +128,11 @@ pub mod own
   pub use
   {
     error_tools::orphan::*,
+    collection_tools::orphan::*,
     // meta_tools::orphan::*,
     mem_tools::orphan::*,
     typing_tools::orphan::*,
     diagnostics_tools::orphan::*,
-    collection_tools::orphan::*,
   };
 
 }
@@ -169,11 +169,11 @@ pub mod exposed
   pub use
   {
     error_tools::exposed::*,
+    collection_tools::exposed::*,
     // meta_tools::exposed::*,
     mem_tools::exposed::*,
     typing_tools::exposed::*,
     diagnostics_tools::exposed::*,
-    collection_tools::exposed::*,
   };
 
 }
@@ -192,11 +192,11 @@ pub mod prelude
   pub use
   {
     error_tools::prelude::*,
+    collection_tools::prelude::*,
     // meta_tools::prelude::*,
     mem_tools::prelude::*,
     typing_tools::prelude::*,
     diagnostics_tools::prelude::*,
-    collection_tools::prelude::*,
   };
 
 }
diff --git a/module/move/wca/src/ca/tool/mod.rs b/module/move/wca/src/ca/tool/mod.rs
@@ -7,7 +7,10 @@ crate::mod_interface!
   layer table;
 
   orphan use super::super::tool;
-  orphan use ::error_tools as error;
+
+  // orphan use ::error_tools as error;
+  use ::error_tools;
+
   orphan use ::iter_tools;
 
   // use ::strs_tools as string; // xxx : check
diff --git a/module/move/willbe/src/tool/collection.rs b/module/move/willbe/src/tool/collection.rs
diff --git a/module/move/willbe/src/tool/error.rs b/module/move/willbe/src/tool/error.rs
diff --git a/module/move/willbe/src/tool/mod.rs b/module/move/willbe/src/tool/mod.rs
@@ -8,12 +8,15 @@ crate::mod_interface!
   orphan use super::cargo;
 
   /// Function and structures to work with collections.
-  layer collection;
-  orphan use super::collection;
+  // layer collection;
+  // orphan use super::collection;
+  use ::collection_tools;
+  // own use ::collection_tools::own::*;
 
   /// Errors handling.
-  layer error;
-  orphan use super::error;
+  // layer error;
+  // orphan use super::error;
+  use ::error_tools;
 
   /// Operate over files.
   layer files;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// usual tests`
	`1`	`+#![ allow( unused_imports ) ]`
`2`	`2`
`3`	`3`	`#[ path="../../../../module/step/meta/src/module/aggregating.rs" ]`
`4`	`4`	`mod aggregating;`
Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,9 @@ pub mod exposed`
`286`	`286`	`#[ doc( inline ) ]`
`287`	`287`	`pub use prelude::*;`
`288`	`288`
	`289`	`+ // Expose itself.`
	`290`	`+ pub use super::super::error;`
	`291`	`+`
`289`	`292`	`#[ doc( inline ) ]`
`290`	`293`	`pub use private::`
`291`	`294`	`{`
Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,11 @@ pub mod own`
`128`	`128`	`pub use`
`129`	`129`	`{`
`130`	`130`	`error_tools::orphan::*,`
	`131`	`+ collection_tools::orphan::*,`
`131`	`132`	`// meta_tools::orphan::*,`
`132`	`133`	`mem_tools::orphan::*,`
`133`	`134`	`typing_tools::orphan::*,`
`134`	`135`	`diagnostics_tools::orphan::*,`
`135`		`- collection_tools::orphan::*,`
`136`	`136`	`};`
`137`	`137`
`138`	`138`	`}`
`@@ -169,11 +169,11 @@ pub mod exposed`
`169`	`169`	`pub use`
`170`	`170`	`{`
`171`	`171`	`error_tools::exposed::*,`
	`172`	`+ collection_tools::exposed::*,`
`172`	`173`	`// meta_tools::exposed::*,`
`173`	`174`	`mem_tools::exposed::*,`
`174`	`175`	`typing_tools::exposed::*,`
`175`	`176`	`diagnostics_tools::exposed::*,`
`176`		`- collection_tools::exposed::*,`
`177`	`177`	`};`
`178`	`178`
`179`	`179`	`}`
`@@ -192,11 +192,11 @@ pub mod prelude`
`192`	`192`	`pub use`
`193`	`193`	`{`
`194`	`194`	`error_tools::prelude::*,`
	`195`	`+ collection_tools::prelude::*,`
`195`	`196`	`// meta_tools::prelude::*,`
`196`	`197`	`mem_tools::prelude::*,`
`197`	`198`	`typing_tools::prelude::*,`
`198`	`199`	`diagnostics_tools::prelude::*,`
`199`		`- collection_tools::prelude::*,`
`200`	`200`	`};`
`201`	`201`
`202`	`202`	`}`