diff --git a/module/alias/instance_of/src/typing/implements_lib.rs b/module/alias/instance_of/src/typing/implements_lib.rs index 3fec13bfdd..34edec9e37 100644 --- a/module/alias/instance_of/src/typing/implements_lib.rs +++ b/module/alias/instance_of/src/typing/implements_lib.rs @@ -67,26 +67,28 @@ pub( crate ) mod private pub use instance_of; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -96,16 +98,17 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { implements, instance_of, diff --git a/module/alias/instance_of/src/typing/inspect_type_lib.rs b/module/alias/instance_of/src/typing/inspect_type_lib.rs index 7dd148a9e4..35bf93a289 100644 --- a/module/alias/instance_of/src/typing/inspect_type_lib.rs +++ b/module/alias/instance_of/src/typing/inspect_type_lib.rs @@ -66,26 +66,28 @@ mod nightly #[ allow( unused_imports ) ] // pub use nightly::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -95,13 +97,14 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "nightly" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/alias/instance_of/src/typing/is_slice_lib.rs b/module/alias/instance_of/src/typing/is_slice_lib.rs index eb85441735..5bb9e0ef9a 100644 --- a/module/alias/instance_of/src/typing/is_slice_lib.rs +++ b/module/alias/instance_of/src/typing/is_slice_lib.rs @@ -71,26 +71,28 @@ pub( crate ) mod private pub use is_slice; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -100,16 +102,17 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { is_slice, }; diff --git a/module/alias/instance_of/src/typing/typing.rs b/module/alias/instance_of/src/typing/typing.rs index fb98cea12c..ce76751733 100644 --- a/module/alias/instance_of/src/typing/typing.rs +++ b/module/alias/instance_of/src/typing/typing.rs @@ -1,11 +1,12 @@ -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use ::inspect_type::orphan::*; @@ -19,15 +20,16 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -37,7 +39,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use ::inspect_type::exposed::*; @@ -53,6 +55,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use ::inspect_type::prelude::*; diff --git a/module/alias/wtest_basic/src/_blank/standard_lib.rs b/module/alias/wtest_basic/src/_blank/standard_lib.rs index 59747c5c12..a4245f4423 100644 --- a/module/alias/wtest_basic/src/_blank/standard_lib.rs +++ b/module/alias/wtest_basic/src/_blank/standard_lib.rs @@ -21,26 +21,28 @@ pub mod dependency { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -58,4 +60,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/alias/wtest_basic/src/test/wtest_basic_lib.rs b/module/alias/wtest_basic/src/test/wtest_basic_lib.rs index 3eb13b9abe..3ee84abaf5 100644 --- a/module/alias/wtest_basic/src/test/wtest_basic_lib.rs +++ b/module/alias/wtest_basic/src/test/wtest_basic_lib.rs @@ -61,8 +61,8 @@ mod_interface! use super::exposed::dt; use super::exposed::diagnostics; - protected use super::dependency; - protected use super::dependency::*; + own use super::dependency; + own use super::dependency::*; prelude use ::meta_tools as meta; prelude use ::mem_tools as mem; diff --git a/module/blank/wlang/src/standard_lib.rs b/module/blank/wlang/src/standard_lib.rs index 655d09b4e5..0547b56da5 100644 --- a/module/blank/wlang/src/standard_lib.rs +++ b/module/blank/wlang/src/standard_lib.rs @@ -17,24 +17,26 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -48,4 +50,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/clone_dyn/src/lib.rs b/module/core/clone_dyn/src/lib.rs index 70fe33ae2b..194a45c1c8 100644 --- a/module/core/clone_dyn/src/lib.rs +++ b/module/core/clone_dyn/src/lib.rs @@ -24,15 +24,16 @@ pub( crate ) mod private #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -40,9 +41,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -58,7 +60,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -66,6 +68,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/clone_dyn_types/src/lib.rs b/module/core/clone_dyn_types/src/lib.rs index 854aa58f05..14ba39fea1 100644 --- a/module/core/clone_dyn_types/src/lib.rs +++ b/module/core/clone_dyn_types/src/lib.rs @@ -214,15 +214,16 @@ pub( crate ) mod private #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -230,8 +231,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -241,7 +243,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -249,9 +251,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { CloneDyn, clone_into_box, diff --git a/module/core/collection_tools/src/lib.rs b/module/core/collection_tools/src/lib.rs index 3eac709b12..3dd0258b00 100644 --- a/module/core/collection_tools/src/lib.rs +++ b/module/core/collection_tools/src/lib.rs @@ -29,16 +29,17 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } @@ -47,8 +48,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -59,7 +61,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; // #[ cfg( feature = "reexports" ) ] #[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ] @@ -97,4 +99,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/data_type/src/dt.rs b/module/core/data_type/src/dt.rs index 9b87b8fc9f..b720f66635 100644 --- a/module/core/data_type/src/dt.rs +++ b/module/core/data_type/src/dt.rs @@ -5,22 +5,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -30,7 +32,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ cfg( feature = "either" ) ] #[ doc( inline ) ] @@ -58,6 +60,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; // #[ cfg( feature = "either" ) ] // pub use ::either::*; diff --git a/module/core/data_type/src/lib.rs b/module/core/data_type/src/lib.rs index 893cf8bef0..b3e29a54ff 100644 --- a/module/core/data_type/src/lib.rs +++ b/module/core/data_type/src/lib.rs @@ -27,14 +27,15 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::dt::orphan::*; @@ -44,8 +45,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -55,7 +57,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -77,6 +79,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/derive_tools/src/lib.rs b/module/core/derive_tools/src/lib.rs index 1be9d0ed7a..77018aa3af 100644 --- a/module/core/derive_tools/src/lib.rs +++ b/module/core/derive_tools/src/lib.rs @@ -116,15 +116,16 @@ pub mod dependency #[ doc( inline ) ] #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ cfg( feature = "derive_clone_dyn" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -143,8 +144,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -154,7 +156,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ cfg( all( feature = "derive_more" ) ) ] #[ doc( inline ) ] @@ -289,6 +291,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "derive_clone_dyn" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/diagnostics_tools/src/diag/cta.rs b/module/core/diagnostics_tools/src/diag/cta.rs index c7de6ebb6b..1fc02238d2 100644 --- a/module/core/diagnostics_tools/src/diag/cta.rs +++ b/module/core/diagnostics_tools/src/diag/cta.rs @@ -46,22 +46,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -70,16 +72,17 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { cta_true, }; diff --git a/module/core/diagnostics_tools/src/diag/layout.rs b/module/core/diagnostics_tools/src/diag/layout.rs index b2d34e7268..9337492fd3 100644 --- a/module/core/diagnostics_tools/src/diag/layout.rs +++ b/module/core/diagnostics_tools/src/diag/layout.rs @@ -84,24 +84,26 @@ pub( crate ) mod private pub use cta_mem_same_size; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -110,17 +112,18 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "diagnostics_compiletime_assertions" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { cta_type_same_size, cta_type_same_align, diff --git a/module/core/diagnostics_tools/src/diag/mod.rs b/module/core/diagnostics_tools/src/diag/mod.rs index 159aceda0f..ab548ef796 100644 --- a/module/core/diagnostics_tools/src/diag/mod.rs +++ b/module/core/diagnostics_tools/src/diag/mod.rs @@ -15,14 +15,15 @@ pub mod layout; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ cfg( feature = "diagnostics_runtime_assertions" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -41,8 +42,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -51,7 +53,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ cfg( feature = "diagnostics_runtime_assertions" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -70,6 +72,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "diagnostics_runtime_assertions" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/diagnostics_tools/src/diag/rta.rs b/module/core/diagnostics_tools/src/diag/rta.rs index d63f7f08b0..3dd57ad1d6 100644 --- a/module/core/diagnostics_tools/src/diag/rta.rs +++ b/module/core/diagnostics_tools/src/diag/rta.rs @@ -221,29 +221,30 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; + #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] - #[ allow( unused_imports ) ] - pub use super::private::a_id as assert_eq; + pub use private::a_id as assert_eq; #[ doc( inline ) ] - #[ allow( unused_imports ) ] - pub use super::private::a_not_id as assert_ne; + pub use private::a_not_id as assert_ne; } @@ -253,13 +254,14 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; // #[ doc( inline ) ] // #[ allow( unused_imports ) ] @@ -270,14 +272,14 @@ pub mod prelude #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::a_id; + pub use private::a_id; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::a_not_id; + pub use private::a_not_id; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { a_true, a_false, diff --git a/module/core/diagnostics_tools/src/lib.rs b/module/core/diagnostics_tools/src/lib.rs index 4453eb9c9b..a3415c710e 100644 --- a/module/core/diagnostics_tools/src/lib.rs +++ b/module/core/diagnostics_tools/src/lib.rs @@ -20,15 +20,16 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::diag::orphan::*; @@ -39,8 +40,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -50,7 +52,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::diag::exposed::*; @@ -61,6 +63,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::diag::prelude::*; diff --git a/module/core/error_tools/src/assert.rs b/module/core/error_tools/src/assert.rs index acfa88244f..dd604822b6 100644 --- a/module/core/error_tools/src/assert.rs +++ b/module/core/error_tools/src/assert.rs @@ -114,24 +114,26 @@ pub( crate ) mod private pub use debug_assert_not_identical; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -140,15 +142,16 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { - pub use super::private::debug_assert_id; - pub use super::private::debug_assert_identical; - pub use super::private::debug_assert_ni; - pub use super::private::debug_assert_not_identical; + use super::*; + pub use private::debug_assert_id; + pub use private::debug_assert_identical; + pub use private::debug_assert_ni; + pub use private::debug_assert_not_identical; } diff --git a/module/core/error_tools/src/error.rs b/module/core/error_tools/src/error.rs index 7e23f88150..142d9c2ce9 100644 --- a/module/core/error_tools/src/error.rs +++ b/module/core/error_tools/src/error.rs @@ -152,7 +152,8 @@ pub( crate ) mod private } - // xxx : deprecate maybe? + // zzz : review + /// baic implementation of generic BasicError #[ derive( core::fmt::Debug, core::clone::Clone, core::cmp::PartialEq, core::cmp::Eq ) ] @@ -209,22 +210,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -233,23 +236,30 @@ pub mod exposed { use super::*; - pub use private::ErrWith; - pub use private::ResultWithReport; + #[ doc( inline ) ] + pub use private:: + { + ErrWith, + ResultWithReport, + }; #[ doc( inline ) ] - pub use super::prelude::*; // xxx + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { - // xxx + use super::*; - pub use super::private::err; - pub use super::private::return_err; - pub use super::private::ErrorTrait; - pub use super::private::BasicError; + #[ doc( inline ) ] + pub use private:: + { + err, + return_err, + ErrorTrait, + BasicError, + }; } -// xxx : review \ No newline at end of file diff --git a/module/core/error_tools/src/lib.rs b/module/core/error_tools/src/lib.rs index 635ed84dc7..30a25af03b 100644 --- a/module/core/error_tools/src/lib.rs +++ b/module/core/error_tools/src/lib.rs @@ -43,13 +43,14 @@ pub mod untyped; #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ allow( unused_imports ) ] use super::*; @@ -79,9 +80,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } @@ -122,6 +124,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ allow( unused_imports ) ] use super::*; diff --git a/module/core/error_tools/src/result.rs b/module/core/error_tools/src/result.rs index 55717118bc..c95cb517ec 100644 --- a/module/core/error_tools/src/result.rs +++ b/module/core/error_tools/src/result.rs @@ -7,24 +7,24 @@ // pub type Result< T, E = BasicError > = std::result::Result< T, E >; // } // -// /// Protected namespace of the module. -// pub mod protected +// /// Own namespace of the module. +// pub mod own // { // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use super::orphan::*; +// pub use orphan::*; // } // // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use protected::*; +// pub use own::*; // // /// Shared with parent namespace of the module // pub mod orphan // { // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use super::exposed::*; +// pub use exposed::*; // } // // /// Exposed namespace of the module. @@ -32,12 +32,12 @@ // { // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use super::prelude::*; +// pub use prelude::*; // } // // /// Prelude to use essentials: `use my_module::prelude::*`. // pub mod prelude // { -// pub use super::private::Result; +// pub use private::Result; // } // diff --git a/module/core/error_tools/src/typed.rs b/module/core/error_tools/src/typed.rs index 9e000bc2b2..f3c5dd6330 100644 --- a/module/core/error_tools/src/typed.rs +++ b/module/core/error_tools/src/typed.rs @@ -6,30 +6,34 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; pub use super::super::typed; pub use super::super::typed as for_lib; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use ::thiserror::*; - // xxx : qqq : be specific + pub use ::thiserror:: + { + Error, + }; } @@ -40,11 +44,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; - - // #[ doc( inline ) ] - // #[ allow( unused_imports ) ] - // pub use ::thiserror::prelude::*; + pub use prelude::*; } @@ -52,6 +52,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/error_tools/src/untyped.rs b/module/core/error_tools/src/untyped.rs index 64e3fc2cd1..c6ca66c08d 100644 --- a/module/core/error_tools/src/untyped.rs +++ b/module/core/error_tools/src/untyped.rs @@ -6,14 +6,15 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] pub use ::anyhow:: @@ -31,16 +32,16 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; pub use super::super::untyped; pub use super::super::untyped as for_app; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] pub use ::anyhow:: { - anyhow, format_err, ensure, bail, @@ -55,7 +56,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -63,4 +64,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } \ No newline at end of file diff --git a/module/core/error_tools/tests/inc/untyped_test.rs b/module/core/error_tools/tests/inc/untyped_test.rs index 0705f598b5..f1db8e77a9 100644 --- a/module/core/error_tools/tests/inc/untyped_test.rs +++ b/module/core/error_tools/tests/inc/untyped_test.rs @@ -10,7 +10,7 @@ tests_impls! { // test.case( "from parse usize error" ); - let err = the_module::untyped::anyhow!( "err" ); + let err = the_module::untyped::format_err!( "err" ); a_id!( the_module::untyped::Error::is::< &str >( &err ), true ); a_id!( err.is::< &str >(), true ); a_id!( err.to_string(), "err" ); diff --git a/module/core/for_each/src/lib.rs b/module/core/for_each/src/lib.rs index 9957c88576..6d658ec0ef 100644 --- a/module/core/for_each/src/lib.rs +++ b/module/core/for_each/src/lib.rs @@ -472,15 +472,16 @@ pub( crate ) mod private #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -488,8 +489,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -499,7 +501,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -507,13 +509,14 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::for_each; + pub use private::for_each; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::braces_unwrap; + pub use private::braces_unwrap; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::identity; + pub use private::identity; } diff --git a/module/core/format_tools/src/format.rs b/module/core/format_tools/src/format.rs index d3ced99de3..7ebc24f779 100644 --- a/module/core/format_tools/src/format.rs +++ b/module/core/format_tools/src/format.rs @@ -19,12 +19,13 @@ pub mod table; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; // xxx : add features #[ doc( inline ) ] @@ -53,8 +54,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -89,6 +91,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/format_tools/src/format/as_table.rs b/module/core/format_tools/src/format/as_table.rs index 94353f8c41..f86de13941 100644 --- a/module/core/format_tools/src/format/as_table.rs +++ b/module/core/format_tools/src/format/as_table.rs @@ -185,22 +185,24 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -211,7 +213,7 @@ pub mod exposed #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { AsTable, }; @@ -222,4 +224,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/format_tools/src/format/print.rs b/module/core/format_tools/src/format/print.rs index 6db18a9992..c4716754b1 100644 --- a/module/core/format_tools/src/format/print.rs +++ b/module/core/format_tools/src/format/print.rs @@ -219,22 +219,24 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -245,7 +247,7 @@ pub mod exposed #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Styles, Context, @@ -259,4 +261,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/format_tools/src/format/table.rs b/module/core/format_tools/src/format/table.rs index fa815f651c..ac801468e4 100644 --- a/module/core/format_tools/src/format/table.rs +++ b/module/core/format_tools/src/format/table.rs @@ -165,22 +165,24 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -191,7 +193,7 @@ pub mod exposed #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { TableSize, TableRows, @@ -205,4 +207,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/format_tools/src/format/to_string.rs b/module/core/format_tools/src/format/to_string.rs index 6adcdac7cb..9bdc96e033 100644 --- a/module/core/format_tools/src/format/to_string.rs +++ b/module/core/format_tools/src/format/to_string.rs @@ -60,22 +60,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -85,7 +87,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { WithDebug, WithDisplay, @@ -98,4 +100,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/format_tools/src/format/to_string_with_fallback.rs b/module/core/format_tools/src/format/to_string_with_fallback.rs index fd53b8d042..d445271dc7 100644 --- a/module/core/format_tools/src/format/to_string_with_fallback.rs +++ b/module/core/format_tools/src/format/to_string_with_fallback.rs @@ -133,22 +133,24 @@ mod params; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -158,7 +160,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { ToStringWithFallbackRef, ToStringWithFallbackParams, @@ -173,4 +175,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/format_tools/src/format/wrapper.rs b/module/core/format_tools/src/format/wrapper.rs index fbd62c842d..288a561e25 100644 --- a/module/core/format_tools/src/format/wrapper.rs +++ b/module/core/format_tools/src/format/wrapper.rs @@ -12,22 +12,24 @@ mod maybe_as; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -50,4 +52,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/format_tools/src/lib.rs b/module/core/format_tools/src/lib.rs index 4dab8cbf10..673efb23d6 100644 --- a/module/core/format_tools/src/lib.rs +++ b/module/core/format_tools/src/lib.rs @@ -18,16 +18,17 @@ pub mod dependency #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -40,8 +41,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -52,7 +54,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -73,6 +75,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::format::prelude::*; diff --git a/module/core/former/src/lib.rs b/module/core/former/src/lib.rs index 7fc59d83b6..635a8e85e0 100644 --- a/module/core/former/src/lib.rs +++ b/module/core/former/src/lib.rs @@ -15,15 +15,16 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use former_meta as derive; @@ -34,8 +35,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -46,7 +48,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -63,6 +65,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/former_types/src/collection.rs b/module/core/former_types/src/collection.rs index 846d6333d1..93466999c6 100644 --- a/module/core/former_types/src/collection.rs +++ b/module/core/former_types/src/collection.rs @@ -515,22 +515,24 @@ mod vector_deque; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -540,11 +542,11 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { EntryToVal, @@ -578,4 +580,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/former_types/src/lib.rs b/module/core/former_types/src/lib.rs index 099a67e2d8..39196a30e7 100644 --- a/module/core/former_types/src/lib.rs +++ b/module/core/former_types/src/lib.rs @@ -42,15 +42,16 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Parented namespace of the module. @@ -58,8 +59,16 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; + + #[ doc( inline ) ] + pub use exposed::*; + #[ doc( inline ) ] - pub use super::exposed::*; + #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ] + #[ cfg( feature = "types_former" ) ] + pub use collection::orphan::*; + } /// Exposed namespace of the module. @@ -70,10 +79,9 @@ pub mod exposed use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] - #[ allow( unused_imports ) ] #[ cfg( feature = "types_former" ) ] pub use super:: { @@ -84,10 +92,9 @@ pub mod exposed }; #[ doc( inline ) ] - #[ allow( unused_imports ) ] #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ] #[ cfg( feature = "types_former" ) ] - pub use super::collection::*; + pub use collection::exposed::*; } @@ -96,8 +103,15 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; + #[ doc( inline ) ] - #[ allow( unused_imports ) ] #[ cfg( any( feature = "types_component_assign" ) ) ] - pub use super::component::*; + pub use component::*; + + #[ doc( inline ) ] + #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ] + #[ cfg( feature = "types_former" ) ] + pub use collection::prelude::*; + } diff --git a/module/core/fs_tools/src/fs/fs.rs b/module/core/fs_tools/src/fs/fs.rs index a039425652..adace8b2c2 100644 --- a/module/core/fs_tools/src/fs/fs.rs +++ b/module/core/fs_tools/src/fs/fs.rs @@ -51,24 +51,26 @@ pub( crate ) mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } @@ -78,7 +80,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; // use super::private::TempDir; } @@ -86,4 +88,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/fs_tools/src/fs/lib.rs b/module/core/fs_tools/src/fs/lib.rs index 69048a1d69..5dbf05e2f1 100644 --- a/module/core/fs_tools/src/fs/lib.rs +++ b/module/core/fs_tools/src/fs/lib.rs @@ -14,12 +14,13 @@ pub mod dependency { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::fs::orphan::*; @@ -27,14 +28,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -43,7 +45,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::fs::exposed::*; @@ -53,6 +55,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::fs::prelude::*; diff --git a/module/core/implements/src/lib.rs b/module/core/implements/src/lib.rs index e02f9fd871..616b65bcfa 100644 --- a/module/core/implements/src/lib.rs +++ b/module/core/implements/src/lib.rs @@ -72,15 +72,16 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -88,8 +89,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -99,7 +101,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -107,9 +109,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { implements, instance_of, diff --git a/module/core/impls_index/src/impls_index/func.rs b/module/core/impls_index/src/impls_index/func.rs index 79d9dc6642..cc5185e2da 100644 --- a/module/core/impls_index/src/impls_index/func.rs +++ b/module/core/impls_index/src/impls_index/func.rs @@ -238,24 +238,25 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::fn_rename; + pub use private::fn_rename; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::fn_name; + pub use private::fn_name; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::fns; + pub use private::fns; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::fns2; - // pub use super::private::ignore_macro; + pub use private::fns2; + // pub use private::ignore_macro; } diff --git a/module/core/impls_index/src/impls_index/impls.rs b/module/core/impls_index/src/impls_index/impls.rs index 2bc5699849..e9f44c6d0c 100644 --- a/module/core/impls_index/src/impls_index/impls.rs +++ b/module/core/impls_index/src/impls_index/impls.rs @@ -381,7 +381,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -389,9 +389,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { index, tests_index, diff --git a/module/core/impls_index/src/impls_index/mod.rs b/module/core/impls_index/src/impls_index/mod.rs index 23435c3aa3..c0795b3f3e 100644 --- a/module/core/impls_index/src/impls_index/mod.rs +++ b/module/core/impls_index/src/impls_index/mod.rs @@ -22,22 +22,24 @@ pub mod impls; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Shared with parent namespace of the module #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; // pub use super::dependency; } @@ -47,7 +49,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::impls::exposed::*; @@ -60,6 +62,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::impls::prelude::*; diff --git a/module/core/impls_index/src/lib.rs b/module/core/impls_index/src/lib.rs index 9539de6796..ec229443d8 100644 --- a/module/core/impls_index/src/lib.rs +++ b/module/core/impls_index/src/lib.rs @@ -19,15 +19,16 @@ pub mod dependency #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::impls_index::orphan::*; @@ -38,8 +39,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -49,7 +51,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::impls_index::exposed::*; @@ -60,6 +62,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::impls_index::prelude::*; diff --git a/module/core/include_md/src/_blank/standard_lib.rs b/module/core/include_md/src/_blank/standard_lib.rs index 839b7cd405..3569434028 100644 --- a/module/core/include_md/src/_blank/standard_lib.rs +++ b/module/core/include_md/src/_blank/standard_lib.rs @@ -21,24 +21,26 @@ pub mod dependency { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -53,4 +55,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/inspect_type/src/lib.rs b/module/core/inspect_type/src/lib.rs index 8b495f0de3..06c66bf3a8 100644 --- a/module/core/inspect_type/src/lib.rs +++ b/module/core/inspect_type/src/lib.rs @@ -65,22 +65,24 @@ mod nightly #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -89,13 +91,14 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; // #[ cfg( feature = "nightly" ) ] // #[ rustversion::nightly ] // #[ cfg( feature = "type_name_of_val" ) ] diff --git a/module/core/interval_adapter/src/lib.rs b/module/core/interval_adapter/src/lib.rs index 0057a2c2b0..be9655e0ff 100644 --- a/module/core/interval_adapter/src/lib.rs +++ b/module/core/interval_adapter/src/lib.rs @@ -589,15 +589,16 @@ pub( crate ) mod private #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] // #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Parented namespace of the module. @@ -605,8 +606,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -616,10 +618,10 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Bound, BoundExt, @@ -642,9 +644,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { IterableInterval, NonIterableInterval, diff --git a/module/core/is_slice/src/lib.rs b/module/core/is_slice/src/lib.rs index 7a587c5724..2c08dcbf90 100644 --- a/module/core/is_slice/src/lib.rs +++ b/module/core/is_slice/src/lib.rs @@ -74,15 +74,16 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -90,8 +91,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -101,7 +103,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ cfg( feature = "enabled" ) ] @@ -109,9 +111,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; // #[ doc( inline ) ] // #[ allow( unused_imports ) ] - // pub use super::private:: + // pub use private:: // { // }; @@ -122,7 +125,7 @@ pub mod prelude #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { is_slice, }; diff --git a/module/core/iter_tools/src/iter.rs b/module/core/iter_tools/src/iter.rs index 8077dd5a98..5ac6abe106 100644 --- a/module/core/iter_tools/src/iter.rs +++ b/module/core/iter_tools/src/iter.rs @@ -201,14 +201,15 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } @@ -216,9 +217,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] pub use ::itertools:: @@ -302,6 +304,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] pub use ::itertools:: @@ -319,6 +322,6 @@ pub mod prelude #[ doc( inline ) ] #[ cfg( feature = "iter_ext" ) ] #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ] - pub use super::private::IterExt; + pub use private::IterExt; } diff --git a/module/core/iter_tools/src/lib.rs b/module/core/iter_tools/src/lib.rs index ef7ab85906..caa22f5593 100644 --- a/module/core/iter_tools/src/lib.rs +++ b/module/core/iter_tools/src/lib.rs @@ -25,16 +25,17 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -47,8 +48,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -58,7 +60,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] pub use super::iter::exposed::*; } @@ -68,6 +70,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::iter::prelude::*; diff --git a/module/core/macro_tools/src/attr.rs b/module/core/macro_tools/src/attr.rs index 72fb107969..efbb02fa6f 100644 --- a/module/core/macro_tools/src/attr.rs +++ b/module/core/macro_tools/src/attr.rs @@ -434,17 +434,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { // equation, has_debug, @@ -456,8 +457,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -468,10 +470,10 @@ pub mod exposed pub use super::super::attr; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { AttributesInner, AttributesOuter, @@ -483,4 +485,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/attr_prop.rs b/module/core/macro_tools/src/attr_prop.rs index 57217f80f3..e0564499b4 100644 --- a/module/core/macro_tools/src/attr_prop.rs +++ b/module/core/macro_tools/src/attr_prop.rs @@ -145,17 +145,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -164,8 +165,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -175,10 +177,10 @@ pub mod exposed use super::*; pub use super::super::attr_prop; - // pub use super::protected as attr_prop; + // pub use super::own as attr_prop; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -209,4 +211,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/components.rs b/module/core/macro_tools/src/components.rs index 5cc3fa4055..0672fc77ec 100644 --- a/module/core/macro_tools/src/components.rs +++ b/module/core/macro_tools/src/components.rs @@ -9,30 +9,32 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use ::former_types::protected::*; + pub use ::former_types::own::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -43,7 +45,7 @@ pub mod exposed pub use super::super::components; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -51,7 +53,7 @@ pub mod exposed #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; @@ -61,6 +63,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/macro_tools/src/container_kind.rs b/module/core/macro_tools/src/container_kind.rs index 2b04a9e35c..81a924ef46 100644 --- a/module/core/macro_tools/src/container_kind.rs +++ b/module/core/macro_tools/src/container_kind.rs @@ -98,18 +98,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { ContainerKind, of_type, @@ -122,8 +123,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -133,14 +135,15 @@ pub mod exposed use super::*; pub use super::super::container_kind; - // pub use super::protected as container_kind; + // pub use super::own as container_kind; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/ct.rs b/module/core/macro_tools/src/ct.rs index 9b38a06b80..e70a1d7ced 100644 --- a/module/core/macro_tools/src/ct.rs +++ b/module/core/macro_tools/src/ct.rs @@ -13,16 +13,18 @@ pub mod str; /// Compile-time tools. #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; + #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] - pub use super::private:: + pub use private:: { }; #[ doc( inline ) ] @@ -33,8 +35,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -44,11 +47,11 @@ pub mod exposed use super::*; pub use super::super::ct; - // pub use super::protected as ct; + // pub use super::own as ct; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] - pub use super::private:: + pub use private:: { }; } @@ -57,4 +60,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/derive.rs b/module/core/macro_tools/src/derive.rs index 542862ce98..c0c3ac6fd0 100644 --- a/module/core/macro_tools/src/derive.rs +++ b/module/core/macro_tools/src/derive.rs @@ -48,18 +48,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { named_fields, }; @@ -70,8 +71,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -82,11 +84,11 @@ pub mod exposed pub use super::super::derive; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; @@ -96,10 +98,11 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; diff --git a/module/core/macro_tools/src/diag.rs b/module/core/macro_tools/src/diag.rs index 1cefe9ac38..adf786b021 100644 --- a/module/core/macro_tools/src/diag.rs +++ b/module/core/macro_tools/src/diag.rs @@ -378,15 +378,16 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } @@ -394,12 +395,13 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; // #[ doc( inline ) ] // #[ allow( unused_imports ) ] - // pub use super::private:: + // pub use private:: // { // Result, // }; @@ -414,11 +416,11 @@ pub mod exposed pub use super::super::diag; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { indentation, report_format, @@ -431,10 +433,11 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { tree_print, code_print, @@ -446,5 +449,5 @@ pub mod prelude }; // #[ doc( inline ) ] - // pub use super::private::Result; + // pub use private::Result; } diff --git a/module/core/macro_tools/src/equation.rs b/module/core/macro_tools/src/equation.rs index 986cf74372..f0db219a5e 100644 --- a/module/core/macro_tools/src/equation.rs +++ b/module/core/macro_tools/src/equation.rs @@ -115,17 +115,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { from_meta, }; @@ -135,8 +136,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -147,10 +149,10 @@ pub mod exposed pub use super::super::equation; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Equation, }; @@ -160,4 +162,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/generic_args.rs b/module/core/macro_tools/src/generic_args.rs index dcea837884..658370a650 100644 --- a/module/core/macro_tools/src/generic_args.rs +++ b/module/core/macro_tools/src/generic_args.rs @@ -142,22 +142,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - - //! - //! This module provides utilities to handle and manipulate generic arguments using the `syn` crate. It includes traits and functions for transforming, merging, and managing generic parameters within procedural macros, enabling seamless syntactic analysis and code generation. - //! + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { merge, }; @@ -167,11 +164,12 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { IntoGenericArgs, }; @@ -196,4 +194,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/generic_params.rs b/module/core/macro_tools/src/generic_params.rs index 70ba9bcee7..aacaa2c22b 100644 --- a/module/core/macro_tools/src/generic_params.rs +++ b/module/core/macro_tools/src/generic_params.rs @@ -506,21 +506,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; #[ allow( unused_imports ) ] -pub mod protected +/// Own namespace of the module. +pub mod own { - - //! - //! Functions and structures to handle and manipulate generic parameters using the `syn` crate. It's designed to support macro-driven code generation by simplifying, merging, extracting, and decomposing `syn::Generics`. - //! + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { merge, only_names, @@ -533,11 +531,12 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { GenericsWithWhere, }; @@ -562,4 +561,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/item.rs b/module/core/macro_tools/src/item.rs index cef093ce35..2f7469a8b6 100644 --- a/module/core/macro_tools/src/item.rs +++ b/module/core/macro_tools/src/item.rs @@ -84,17 +84,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { ensure_comma, }; @@ -104,11 +105,12 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -132,4 +134,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/item_struct.rs b/module/core/macro_tools/src/item_struct.rs index 81eceb908b..99f44340bf 100644 --- a/module/core/macro_tools/src/item_struct.rs +++ b/module/core/macro_tools/src/item_struct.rs @@ -78,17 +78,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { field_types, field_names, @@ -101,8 +102,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -113,11 +115,12 @@ pub mod exposed pub use super::super::item_struct; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/iter.rs b/module/core/macro_tools/src/iter.rs index 7fb710160f..e8cce795af 100644 --- a/module/core/macro_tools/src/iter.rs +++ b/module/core/macro_tools/src/iter.rs @@ -9,25 +9,27 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Tailoted iterator. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use iter_tools::protected::*; + pub use iter_tools::own::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -38,7 +40,7 @@ pub mod exposed // pub use super::super::iter; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -50,6 +52,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/macro_tools/src/kw.rs b/module/core/macro_tools/src/kw.rs index bb2384e922..62017bf02c 100644 --- a/module/core/macro_tools/src/kw.rs +++ b/module/core/macro_tools/src/kw.rs @@ -26,22 +26,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -52,10 +54,10 @@ pub mod exposed pub use super::super::kw; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { is, }; @@ -65,5 +67,6 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/lib.rs b/module/core/macro_tools/src/lib.rs index 80bf279add..23fa3143ce 100644 --- a/module/core/macro_tools/src/lib.rs +++ b/module/core/macro_tools/src/lib.rs @@ -85,15 +85,16 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; // qqq : put every file of the first level under feature -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + // use super::*; mod _all { @@ -162,6 +163,7 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; mod _all { @@ -243,6 +245,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; mod _all { diff --git a/module/core/macro_tools/src/name.rs b/module/core/macro_tools/src/name.rs index 2ffb4418fb..085899942c 100644 --- a/module/core/macro_tools/src/name.rs +++ b/module/core/macro_tools/src/name.rs @@ -226,22 +226,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -251,17 +253,18 @@ pub mod exposed use super::*; pub use super::super::name; - // pub use super::protected as name; + // pub use super::own as name; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::Name; + pub use private::Name; } diff --git a/module/core/macro_tools/src/phantom.rs b/module/core/macro_tools/src/phantom.rs index 8cc26d120d..44a8a602e1 100644 --- a/module/core/macro_tools/src/phantom.rs +++ b/module/core/macro_tools/src/phantom.rs @@ -192,23 +192,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; #[ allow( unused_imports ) ] -pub mod protected +/// Own namespace of the module. +pub mod own { - - //! - //! Responsible for generating marker `PhantomData` fields to avoid the rule requiring the usage of all generic parameters in a struct. This is often necessary to ensure that Rust's type system correctly tracks the ownership and lifetimes of these parameters without needing them to be explicitly used in the struct's fields. - //! - //! Functions and structures to handle and manipulate `PhantomData` fields in structs using the `syn` crate. These utilities ensure that generic parameters are correctly accounted for in type checking, even if they are not directly used in the struct's fields. - //! + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { add_to_item, tuple, @@ -219,11 +215,12 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -235,7 +232,7 @@ pub mod exposed use super::*; pub use super::super::phantom; - // pub use super::protected as phantom; + // pub use super::own as phantom; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -249,4 +246,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/punctuated.rs b/module/core/macro_tools/src/punctuated.rs index 8c0ec5f048..9939f5bcb3 100644 --- a/module/core/macro_tools/src/punctuated.rs +++ b/module/core/macro_tools/src/punctuated.rs @@ -22,22 +22,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; #[ allow( unused_imports ) ] -pub mod protected +/// Own namespace of the module. +pub mod own { - //! - //! Structures and functions for handling `syn::punctuated::Punctuated` collections. - //! - //! This module provides functionality to manipulate and ensure correct punctuation in `syn::punctuated::Punctuated` collections, commonly used in procedural macros to represent sequences of elements separated by punctuation marks, such as commas. - //! + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { ensure_trailing_comma, }; @@ -47,8 +44,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -58,7 +56,7 @@ pub mod exposed use super::*; pub use super::super::punctuated; - // pub use super::protected as punctuated; + // pub use super::own as punctuated; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -72,4 +70,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/quantifier.rs b/module/core/macro_tools/src/quantifier.rs index c475446d64..8b699a00c7 100644 --- a/module/core/macro_tools/src/quantifier.rs +++ b/module/core/macro_tools/src/quantifier.rs @@ -247,22 +247,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -272,13 +274,13 @@ pub mod exposed use super::*; pub use super::super::quantifier; - // pub use super::protected as quantifier; + // pub use super::own as quantifier; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { AsMuchAsPossibleNoDelimiter, Pair, @@ -290,9 +292,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } diff --git a/module/core/macro_tools/src/struct_like.rs b/module/core/macro_tools/src/struct_like.rs index d49b6293b1..f76e0adef4 100644 --- a/module/core/macro_tools/src/struct_like.rs +++ b/module/core/macro_tools/src/struct_like.rs @@ -437,17 +437,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { StructLike, FieldOrVariant, @@ -458,8 +459,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -470,11 +472,12 @@ pub mod exposed pub use super::super::struct_like; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/tokens.rs b/module/core/macro_tools/src/tokens.rs index 6e6e6720d8..53245f3bca 100644 --- a/module/core/macro_tools/src/tokens.rs +++ b/module/core/macro_tools/src/tokens.rs @@ -75,22 +75,24 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -100,13 +102,13 @@ pub mod exposed use super::*; pub use super::super::tokens; - // pub use super::protected as tokens; + // pub use super::own as tokens; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Tokens, }; @@ -116,5 +118,6 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/typ.rs b/module/core/macro_tools/src/typ.rs index edb82b97ea..935d7539f5 100644 --- a/module/core/macro_tools/src/typ.rs +++ b/module/core/macro_tools/src/typ.rs @@ -137,17 +137,18 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { type_rightmost, type_parameters, @@ -160,8 +161,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -172,15 +174,16 @@ pub mod exposed pub use super::super::typ; - // pub use super::protected as typ; + // pub use super::own as typ; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/macro_tools/src/typed.rs b/module/core/macro_tools/src/typed.rs index ee5c82bce1..50fdf6036d 100644 --- a/module/core/macro_tools/src/typed.rs +++ b/module/core/macro_tools/src/typed.rs @@ -11,18 +11,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] - pub use super::private:: + pub use private:: { }; @@ -34,8 +35,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -45,14 +47,15 @@ pub mod exposed use super::*; pub use super::super::typed; - // pub use super::protected as typ; + // pub use super::own as typ; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/mem_tools/src/lib.rs b/module/core/mem_tools/src/lib.rs index c2414b9057..03270e0a05 100644 --- a/module/core/mem_tools/src/lib.rs +++ b/module/core/mem_tools/src/lib.rs @@ -26,15 +26,16 @@ pub mod mem; #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::mem::orphan::*; @@ -45,8 +46,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -56,7 +58,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::mem::exposed::*; @@ -67,6 +69,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::mem::prelude::*; diff --git a/module/core/mem_tools/src/mem.rs b/module/core/mem_tools/src/mem.rs index 77a2ed6c8b..d56abd3dd6 100644 --- a/module/core/mem_tools/src/mem.rs +++ b/module/core/mem_tools/src/mem.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; /// /// Are two pointers points on the same data. @@ -64,10 +64,11 @@ pub( crate ) mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super:: @@ -78,12 +79,13 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super:: @@ -102,11 +104,12 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/mod_interface/Readme.md b/module/core/mod_interface/Readme.md index 2b110f839a..fcb4643b8f 100644 --- a/module/core/mod_interface/Readme.md +++ b/module/core/mod_interface/Readme.md @@ -73,46 +73,48 @@ pub mod inner pub fn inner_is() -> bool { true } } - /// Protected namespace of the module. - pub mod protected + /// Own namespace of the module. + pub mod own { - pub use super::orphan::*; + pub use orphan::*; } - pub use protected::*; + pub use own::*; /// Orphan namespace of the module. pub mod orphan { - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. pub mod exposed { - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. pub mod prelude { - pub use super::private::inner_is; + pub use private::inner_is; } } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; pub use super::inner::orphan::*; } -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -120,7 +122,7 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; pub use super::inner::exposed::*; } @@ -128,6 +130,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; pub use super::inner::prelude::*; } ``` diff --git a/module/core/mod_interface/src/lib.rs b/module/core/mod_interface/src/lib.rs index d5e2a49361..30c7731f89 100644 --- a/module/core/mod_interface/src/lib.rs +++ b/module/core/mod_interface/src/lib.rs @@ -15,15 +15,16 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -36,8 +37,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -47,7 +49,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -56,6 +58,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use mod_interface_meta::*; diff --git a/module/core/mod_interface/tests/inc/derive/attr_debug/layer_a.rs b/module/core/mod_interface/tests/inc/derive/attr_debug/layer_a.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/derive/attr_debug/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/attr_debug/layer_a.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/layer/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer/layer_a.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/derive/layer/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer/layer_a.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/layer/layer_b.rs b/module/core/mod_interface/tests/inc/derive/layer/layer_b.rs index 7c4b399355..1e15689f05 100644 --- a/module/core/mod_interface/tests/inc/derive/layer/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/layer/layer_b.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_b_protected - pub fn layer_b_protected() -> bool + pub use orphan::*; + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_b_orphan pub fn layer_b_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_b_exposed pub fn layer_b_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_b_prelude pub fn layer_b_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/layer_bad_vis/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_bad_vis/layer_a.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_bad_vis/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_bad_vis/layer_a.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_a.rs index 8ba8f1e9e6..dfffa8d8a8 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_a.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_a_protected - pub fn layer_a_protected() -> bool + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -38,13 +38,13 @@ mod_interface! // orphan use super::private:: // { - // protected where layer_a_protected as layer_a_protected2, + // protected where layer_a_own as layer_a_own2, // layer_a_orphan, // exposed where layer_a_exposed, // prelude where layer_a_prelude, // }; - protected use { layer_a_protected }; + own use { layer_a_own }; orphan use layer_a_orphan; exposed use layer_a_exposed; prelude use layer_a_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_b.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_b.rs index 5ee8e574aa..9f17f61637 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer/layer_b.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_b_protected - pub fn layer_b_protected() -> bool + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -42,7 +42,7 @@ pub struct SubStruct2 mod_interface! { - protected use layer_b_protected; + own use layer_b_own; orphan use { layer_b_orphan }; exposed use { layer_b_exposed }; prelude use layer_b_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_a.rs index 8ba8f1e9e6..dfffa8d8a8 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_a.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_a_protected - pub fn layer_a_protected() -> bool + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -38,13 +38,13 @@ mod_interface! // orphan use super::private:: // { - // protected where layer_a_protected as layer_a_protected2, + // protected where layer_a_own as layer_a_own2, // layer_a_orphan, // exposed where layer_a_exposed, // prelude where layer_a_prelude, // }; - protected use { layer_a_protected }; + own use { layer_a_own }; orphan use layer_a_orphan; exposed use layer_a_exposed; prelude use layer_a_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_b.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_b.rs index 5ee8e574aa..9f17f61637 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer_cfg/layer_b.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_b_protected - pub fn layer_b_protected() -> bool + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -42,7 +42,7 @@ pub struct SubStruct2 mod_interface! { - protected use layer_b_protected; + own use layer_b_own; orphan use { layer_b_orphan }; exposed use { layer_b_exposed }; prelude use layer_b_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_a.rs index b5b8b613f1..8d8d6b1faf 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_a.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_a_protected - pub fn layer_a_protected() -> bool + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -36,7 +36,7 @@ mod private mod_interface! { - protected use { layer_a_protected }; + own use { layer_a_own }; orphan use layer_a_orphan; exposed use layer_a_exposed; prelude use layer_a_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_b.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_b.rs index 5ee8e574aa..9f17f61637 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use/layer_b.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_b_protected - pub fn layer_b_protected() -> bool + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -42,7 +42,7 @@ pub struct SubStruct2 mod_interface! { - protected use layer_b_protected; + own use layer_b_own; orphan use { layer_b_orphan }; exposed use { layer_b_exposed }; prelude use layer_b_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_a.rs index b5b8b613f1..8d8d6b1faf 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_a.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_a_protected - pub fn layer_a_protected() -> bool + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -36,7 +36,7 @@ mod private mod_interface! { - protected use { layer_a_protected }; + own use { layer_a_own }; orphan use layer_a_orphan; exposed use layer_a_exposed; prelude use layer_a_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_b.rs b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_b.rs index 5ee8e574aa..9f17f61637 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_have_layer_separate_use_two/layer_b.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_b_protected - pub fn layer_b_protected() -> bool + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -42,7 +42,7 @@ pub struct SubStruct2 mod_interface! { - protected use layer_b_protected; + own use layer_b_own; orphan use { layer_b_orphan }; exposed use { layer_b_exposed }; prelude use layer_b_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_unknown_vis/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_unknown_vis/layer_a.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_unknown_vis/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_unknown_vis/layer_a.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_a.rs b/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_a.rs index 8ba8f1e9e6..dfffa8d8a8 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_a.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_a_protected - pub fn layer_a_protected() -> bool + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -38,13 +38,13 @@ mod_interface! // orphan use super::private:: // { - // protected where layer_a_protected as layer_a_protected2, + // protected where layer_a_own as layer_a_own2, // layer_a_orphan, // exposed where layer_a_exposed, // prelude where layer_a_prelude, // }; - protected use { layer_a_protected }; + own use { layer_a_own }; orphan use layer_a_orphan; exposed use layer_a_exposed; prelude use layer_a_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_b.rs b/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_b.rs index 5ee8e574aa..9f17f61637 100644 --- a/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/layer_use_cfg/layer_b.rs @@ -5,8 +5,8 @@ use super::tools::*; mod private { - /// layer_b_protected - pub fn layer_b_protected() -> bool + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -42,7 +42,7 @@ pub struct SubStruct2 mod_interface! { - protected use layer_b_protected; + own use layer_b_own; orphan use { layer_b_orphan }; exposed use { layer_b_exposed }; prelude use layer_b_prelude; diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules/mod.rs b/module/core/mod_interface/tests/inc/derive/micro_modules/mod.rs index 3e924ca630..09c94a139e 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules/mod.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules/mod.rs @@ -9,8 +9,8 @@ mod private mod_interface! { - /// mod_protected - protected mod mod_protected; + /// mod_own + own mod mod_own; /// mod_orphan orphan mod mod_orphan; /// mod_exposed diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules/mod_protected.rs b/module/core/mod_interface/tests/inc/derive/micro_modules/mod_protected.rs index 3bd5325a02..a6619cc0c4 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules/mod_protected.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules/mod_protected.rs @@ -1,5 +1,5 @@ -/// has_protected -pub fn has_protected() -> bool +/// has_own +pub fn has_own() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod.rs b/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod.rs index 3481dfdef2..9071caf2d1 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod.rs @@ -9,10 +9,10 @@ mod private mod_interface! { - /// mod_protected1 - protected mod mod_protected1; - /// mod_protected2 - protected mod mod_protected2; + /// mod_own1 + own mod mod_own1; + /// mod_own2 + own mod mod_own2; /// mod_orphan1 orphan mod mod_orphan1; /// mod_orphan2 diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected1.rs b/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected1.rs index c95649476e..a314e81b31 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected1.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected1.rs @@ -1,5 +1,5 @@ -/// has_protected1 -pub fn has_protected1() -> bool +/// has_own1 +pub fn has_own1() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected2.rs b/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected2.rs index 8466c075b3..5b59e31a83 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected2.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules_two/mod_protected2.rs @@ -1,5 +1,5 @@ -/// has_protected2 -pub fn has_protected2() -> bool +/// has_own2 +pub fn has_own2() -> bool { true } diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod.rs b/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod.rs index da5ed051d0..ced5712479 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod.rs @@ -9,12 +9,12 @@ mod private mod_interface! { - protected mod + own mod { - /// mod_protected1 - mod_protected1, - /// mod_protected2 - mod_protected2, + /// mod_own1 + mod_own1, + /// mod_own2 + mod_own2, }; orphan mod { diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected1.rs b/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected1.rs index c95649476e..a314e81b31 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected1.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected1.rs @@ -1,5 +1,5 @@ -/// has_protected1 -pub fn has_protected1() -> bool +/// has_own1 +pub fn has_own1() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected2.rs b/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected2.rs index a163ea8af5..b442687a02 100644 --- a/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected2.rs +++ b/module/core/mod_interface/tests/inc/derive/micro_modules_two_joined/mod_protected2.rs @@ -1,5 +1,5 @@ -/// has_protected2 -pub fn has_protected2() -> bool +/// has_own2 +pub fn has_own2() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/derive/use_as/layer_x.rs b/module/core/mod_interface/tests/inc/derive/use_as/layer_x.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/derive/use_as/layer_x.rs +++ b/module/core/mod_interface/tests/inc/derive/use_as/layer_x.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/use_as/layer_y.rs b/module/core/mod_interface/tests/inc/derive/use_as/layer_y.rs index 7c4b399355..1e15689f05 100644 --- a/module/core/mod_interface/tests/inc/derive/use_as/layer_y.rs +++ b/module/core/mod_interface/tests/inc/derive/use_as/layer_y.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_b_protected - pub fn layer_b_protected() -> bool + pub use orphan::*; + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_b_orphan pub fn layer_b_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_b_exposed pub fn layer_b_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_b_prelude pub fn layer_b_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/use_as/manual_only.rs b/module/core/mod_interface/tests/inc/derive/use_as/manual_only.rs index ad855c9ed0..f6fcb2f162 100644 --- a/module/core/mod_interface/tests/inc/derive/use_as/manual_only.rs +++ b/module/core/mod_interface/tests/inc/derive/use_as/manual_only.rs @@ -5,10 +5,11 @@ use layer_x as layer_a; #[allow(unused_imports)] pub use protected :: * ; -#[doc = r" Protected namespace of the module."] +#[doc = r" Own namespace of the module."] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[doc(inline)] #[allow(unused_imports)] @@ -25,6 +26,7 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[doc(inline)] #[allow(unused_imports)] @@ -51,6 +53,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[doc(inline)] #[allow(unused_imports)] #[doc = " layer_a"] diff --git a/module/core/mod_interface/tests/inc/derive/use_basic/layer_a.rs b/module/core/mod_interface/tests/inc/derive/use_basic/layer_a.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/derive/use_basic/layer_a.rs +++ b/module/core/mod_interface/tests/inc/derive/use_basic/layer_a.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/derive/use_basic/layer_b.rs b/module/core/mod_interface/tests/inc/derive/use_basic/layer_b.rs index 7c4b399355..1e15689f05 100644 --- a/module/core/mod_interface/tests/inc/derive/use_basic/layer_b.rs +++ b/module/core/mod_interface/tests/inc/derive/use_basic/layer_b.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_b_protected - pub fn layer_b_protected() -> bool + pub use orphan::*; + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_b_orphan pub fn layer_b_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_b_exposed pub fn layer_b_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_b_prelude pub fn layer_b_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/manual/layer/layer_a.rs b/module/core/mod_interface/tests/inc/manual/layer/layer_a.rs index ab1245c77d..8c49982711 100644 --- a/module/core/mod_interface/tests/inc/manual/layer/layer_a.rs +++ b/module/core/mod_interface/tests/inc/manual/layer/layer_a.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_a_protected - pub fn layer_a_protected() -> bool + pub use orphan::*; + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_a_orphan pub fn layer_a_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_a_exposed pub fn layer_a_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_a_prelude pub fn layer_a_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/manual/layer/layer_b.rs b/module/core/mod_interface/tests/inc/manual/layer/layer_b.rs index 7c4b399355..1e15689f05 100644 --- a/module/core/mod_interface/tests/inc/manual/layer/layer_b.rs +++ b/module/core/mod_interface/tests/inc/manual/layer/layer_b.rs @@ -4,14 +4,15 @@ mod private { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - /// layer_b_protected - pub fn layer_b_protected() -> bool + pub use orphan::*; + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -19,14 +20,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; /// layer_b_orphan pub fn layer_b_orphan() -> bool { @@ -40,7 +42,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; /// layer_b_exposed pub fn layer_b_exposed() -> bool { @@ -52,6 +54,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; /// layer_b_prelude pub fn layer_b_prelude() -> bool { diff --git a/module/core/mod_interface/tests/inc/manual/layer/mod.rs b/module/core/mod_interface/tests/inc/manual/layer/mod.rs index bf46202142..044ff08dbf 100644 --- a/module/core/mod_interface/tests/inc/manual/layer/mod.rs +++ b/module/core/mod_interface/tests/inc/manual/layer/mod.rs @@ -11,12 +11,13 @@ pub mod layer_a; /// layer_b pub mod layer_b; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::layer_a::orphan::*; @@ -27,14 +28,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -43,7 +45,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::layer_a::exposed::*; @@ -56,6 +58,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::layer_a::prelude::*; diff --git a/module/core/mod_interface/tests/inc/manual/layer_use/layer_a.rs b/module/core/mod_interface/tests/inc/manual/layer_use/layer_a.rs index dd08931e1e..91a75eba06 100644 --- a/module/core/mod_interface/tests/inc/manual/layer_use/layer_a.rs +++ b/module/core/mod_interface/tests/inc/manual/layer_use/layer_a.rs @@ -3,8 +3,8 @@ mod private { - /// layer_a_protected - pub fn layer_a_protected() -> bool + /// layer_a_own + pub fn layer_a_own() -> bool { true } @@ -29,30 +29,32 @@ mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_a_protected; + pub use private::layer_a_own; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_a_orphan; + pub use private::layer_a_orphan; } /// Exposed namespace of the module. @@ -61,17 +63,18 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_a_exposed; + pub use private::layer_a_exposed; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_a_prelude; + pub use private::layer_a_prelude; } diff --git a/module/core/mod_interface/tests/inc/manual/layer_use/layer_b.rs b/module/core/mod_interface/tests/inc/manual/layer_use/layer_b.rs index 09e7e780eb..aa5802c05e 100644 --- a/module/core/mod_interface/tests/inc/manual/layer_use/layer_b.rs +++ b/module/core/mod_interface/tests/inc/manual/layer_use/layer_b.rs @@ -3,8 +3,8 @@ mod private { - /// layer_b_protected - pub fn layer_b_protected() -> bool + /// layer_b_own + pub fn layer_b_own() -> bool { true } @@ -29,30 +29,32 @@ mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_b_protected; + pub use private::layer_b_own; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_b_orphan; + pub use private::layer_b_orphan; } /// Exposed namespace of the module. @@ -61,17 +63,18 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_b_exposed; + pub use private::layer_b_exposed; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::layer_b_prelude; + pub use private::layer_b_prelude; } diff --git a/module/core/mod_interface/tests/inc/manual/layer_use/mod.rs b/module/core/mod_interface/tests/inc/manual/layer_use/mod.rs index bf46202142..044ff08dbf 100644 --- a/module/core/mod_interface/tests/inc/manual/layer_use/mod.rs +++ b/module/core/mod_interface/tests/inc/manual/layer_use/mod.rs @@ -11,12 +11,13 @@ pub mod layer_a; /// layer_b pub mod layer_b; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::layer_a::orphan::*; @@ -27,14 +28,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -43,7 +45,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::layer_a::exposed::*; @@ -56,6 +58,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::layer_a::prelude::*; diff --git a/module/core/mod_interface/tests/inc/manual/micro_modules/mod.rs b/module/core/mod_interface/tests/inc/manual/micro_modules/mod.rs index ba309281a4..65ba341ba1 100644 --- a/module/core/mod_interface/tests/inc/manual/micro_modules/mod.rs +++ b/module/core/mod_interface/tests/inc/manual/micro_modules/mod.rs @@ -6,30 +6,32 @@ mod private { } -pub mod mod_protected; +pub mod mod_own; pub mod mod_orphan; pub mod mod_exposed; pub mod mod_prelude; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - pub use super::mod_protected; + pub use orphan::*; + pub use super::mod_own; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; pub use super::mod_orphan; } @@ -39,7 +41,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; pub use super::mod_exposed; } @@ -47,6 +49,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; pub use super::mod_prelude; } diff --git a/module/core/mod_interface/tests/inc/manual/micro_modules/mod_protected.rs b/module/core/mod_interface/tests/inc/manual/micro_modules/mod_protected.rs index 3bd5325a02..a6619cc0c4 100644 --- a/module/core/mod_interface/tests/inc/manual/micro_modules/mod_protected.rs +++ b/module/core/mod_interface/tests/inc/manual/micro_modules/mod_protected.rs @@ -1,5 +1,5 @@ -/// has_protected -pub fn has_protected() -> bool +/// has_own +pub fn has_own() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod.rs b/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod.rs index d8f96c6130..6a9a63843d 100644 --- a/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod.rs +++ b/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod.rs @@ -6,36 +6,38 @@ mod private { } -pub mod mod_protected1; +pub mod mod_own1; pub mod mod_orphan1; pub mod mod_exposed1; pub mod mod_prelude1; -pub mod mod_protected2; +pub mod mod_own2; pub mod mod_orphan2; pub mod mod_exposed2; pub mod mod_prelude2; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; - pub use super::mod_protected1; - pub use super::mod_protected2; + pub use orphan::*; + pub use super::mod_own1; + pub use super::mod_own2; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; pub use super::mod_orphan1; pub use super::mod_orphan2; } @@ -46,7 +48,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; pub use super::mod_exposed1; pub use super::mod_exposed2; } @@ -55,6 +57,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; pub use super::mod_prelude1; pub use super::mod_prelude2; } diff --git a/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected1.rs b/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected1.rs index c95649476e..a314e81b31 100644 --- a/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected1.rs +++ b/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected1.rs @@ -1,5 +1,5 @@ -/// has_protected1 -pub fn has_protected1() -> bool +/// has_own1 +pub fn has_own1() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected2.rs b/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected2.rs index a163ea8af5..b442687a02 100644 --- a/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected2.rs +++ b/module/core/mod_interface/tests/inc/manual/micro_modules_two/mod_protected2.rs @@ -1,5 +1,5 @@ -/// has_protected2 -pub fn has_protected2() -> bool +/// has_own2 +pub fn has_own2() -> bool { true } \ No newline at end of file diff --git a/module/core/mod_interface/tests/inc/only_test/layer_simple_only_test.rs b/module/core/mod_interface/tests/inc/only_test/layer_simple_only_test.rs index 12b14ca545..93b1190705 100644 --- a/module/core/mod_interface/tests/inc/only_test/layer_simple_only_test.rs +++ b/module/core/mod_interface/tests/inc/only_test/layer_simple_only_test.rs @@ -9,8 +9,8 @@ tests_impls! /* test.case( "root" ); */ { - a_id!( layer_a::layer_a_protected(), true ); - a_id!( layer_b::layer_b_protected(), true ); + a_id!( layer_a::layer_a_own(), true ); + a_id!( layer_b::layer_b_own(), true ); a_id!( layer_a::layer_a_orphan(), true ); a_id!( layer_b::layer_b_orphan(), true ); a_id!( layer_a::layer_a_exposed(), true ); @@ -21,8 +21,8 @@ tests_impls! /* test.case( "root" ); */ { - // a_id!( layer_a_protected(), true ); - // a_id!( layer_b_protected(), true ); + // a_id!( layer_a_own(), true ); + // a_id!( layer_b_own(), true ); a_id!( layer_a_orphan(), true ); a_id!( layer_b_orphan(), true ); a_id!( layer_a_exposed(), true ); @@ -33,20 +33,20 @@ tests_impls! /* test.case( "protected" ); */ { - // a_id!( protected::layer_a_protected(), true ); - // a_id!( protected::layer_b_protected(), true ); - a_id!( protected::layer_a_orphan(), true ); - a_id!( protected::layer_b_orphan(), true ); - a_id!( protected::layer_a_exposed(), true ); - a_id!( protected::layer_b_exposed(), true ); - a_id!( protected::layer_a_prelude(), true ); - a_id!( protected::layer_b_prelude(), true ); + // a_id!( own::layer_a_own(), true ); + // a_id!( own::layer_b_own(), true ); + a_id!( own::layer_a_orphan(), true ); + a_id!( own::layer_b_orphan(), true ); + a_id!( own::layer_a_exposed(), true ); + a_id!( own::layer_b_exposed(), true ); + a_id!( own::layer_a_prelude(), true ); + a_id!( own::layer_b_prelude(), true ); } /* test.case( "orphan" ); */ { - // a_id!( orphan::layer_a_protected(), true ); - // a_id!( orphan::layer_b_protected(), true ); + // a_id!( orphan::layer_a_own(), true ); + // a_id!( orphan::layer_b_own(), true ); // a_id!( orphan::layer_a_orphan(), true ); // a_id!( orphan::layer_b_orphan(), true ); a_id!( orphan::layer_a_exposed(), true ); @@ -57,8 +57,8 @@ tests_impls! /* test.case( "exposed" ); */ { - // a_id!( exposed::layer_a_protected(), true ); - // a_id!( exposed::layer_b_protected(), true ); + // a_id!( exposed::layer_a_own(), true ); + // a_id!( exposed::layer_b_own(), true ); // a_id!( exposed::layer_a_orphan(), true ); // a_id!( exposed::layer_b_orphan(), true ); a_id!( exposed::layer_a_exposed(), true ); @@ -69,8 +69,8 @@ tests_impls! /* test.case( "prelude" ); */ { - // a_id!( prelude::layer_a_protected(), true ); - // a_id!( prelude::layer_b_protected(), true ); + // a_id!( prelude::layer_a_own(), true ); + // a_id!( prelude::layer_b_own(), true ); // a_id!( prelude::layer_a_orphan(), true ); // a_id!( prelude::layer_b_orphan(), true ); // a_id!( prelude::layer_a_exposed(), true ); diff --git a/module/core/mod_interface/tests/inc/only_test/layer_single_only_test.rs b/module/core/mod_interface/tests/inc/only_test/layer_single_only_test.rs index ea9a785df0..5adb9cbe73 100644 --- a/module/core/mod_interface/tests/inc/only_test/layer_single_only_test.rs +++ b/module/core/mod_interface/tests/inc/only_test/layer_single_only_test.rs @@ -9,7 +9,7 @@ tests_impls! /* test.case( "root" ); */ { - a_id!( layer_a::layer_a_protected(), true ); + a_id!( layer_a::layer_a_own(), true ); a_id!( layer_a::layer_a_orphan(), true ); a_id!( layer_a::layer_a_exposed(), true ); a_id!( layer_a::layer_a_prelude(), true ); @@ -17,7 +17,7 @@ tests_impls! /* test.case( "root" ); */ { - // a_id!( layer_a_protected(), true ); + // a_id!( layer_a_own(), true ); a_id!( layer_a_orphan(), true ); a_id!( layer_a_exposed(), true ); a_id!( layer_a_prelude(), true ); @@ -25,15 +25,15 @@ tests_impls! /* test.case( "protected" ); */ { - // a_id!( protected::layer_a_protected(), true ); - a_id!( protected::layer_a_orphan(), true ); - a_id!( protected::layer_a_exposed(), true ); - a_id!( protected::layer_a_prelude(), true ); + // a_id!( own::layer_a_own(), true ); + a_id!( own::layer_a_orphan(), true ); + a_id!( own::layer_a_exposed(), true ); + a_id!( own::layer_a_prelude(), true ); } /* test.case( "orphan" ); */ { - // a_id!( orphan::layer_a_protected(), true ); + // a_id!( orphan::layer_a_own(), true ); // a_id!( orphan::layer_a_orphan(), true ); a_id!( orphan::layer_a_exposed(), true ); a_id!( orphan::layer_a_prelude(), true ); @@ -41,7 +41,7 @@ tests_impls! /* test.case( "exposed" ); */ { - // a_id!( exposed::layer_a_protected(), true ); + // a_id!( exposed::layer_a_own(), true ); // a_id!( exposed::layer_a_orphan(), true ); a_id!( exposed::layer_a_exposed(), true ); a_id!( exposed::layer_a_prelude(), true ); @@ -49,7 +49,7 @@ tests_impls! /* test.case( "prelude" ); */ { - // a_id!( prelude::layer_a_protected(), true ); + // a_id!( prelude::layer_a_own(), true ); // a_id!( prelude::layer_a_orphan(), true ); // a_id!( prelude::layer_a_exposed(), true ); a_id!( prelude::layer_a_prelude(), true ); diff --git a/module/core/mod_interface/tests/inc/only_test/micro_modules_only_test.rs b/module/core/mod_interface/tests/inc/only_test/micro_modules_only_test.rs index db02c32da5..b08874b8d0 100644 --- a/module/core/mod_interface/tests/inc/only_test/micro_modules_only_test.rs +++ b/module/core/mod_interface/tests/inc/only_test/micro_modules_only_test.rs @@ -8,24 +8,24 @@ tests_impls! { { - // a_id!( protected::mod_private::has_private(), true ); - a_id!( mod_protected::has_protected(), true ); + // a_id!( own::mod_private::has_private(), true ); + a_id!( mod_own::has_own(), true ); a_id!( mod_orphan::has_orphan(), true ); a_id!( mod_exposed::has_exposed(), true ); a_id!( mod_prelude::has_prelude(), true ); } { - // a_id!( protected::mod_private::has_private(), true ); - a_id!( protected::mod_protected::has_protected(), true ); - a_id!( protected::mod_orphan::has_orphan(), true ); - a_id!( protected::mod_exposed::has_exposed(), true ); - a_id!( protected::mod_prelude::has_prelude(), true ); + // a_id!( own::mod_private::has_private(), true ); + a_id!( own::mod_own::has_own(), true ); + a_id!( own::mod_orphan::has_orphan(), true ); + a_id!( own::mod_exposed::has_exposed(), true ); + a_id!( own::mod_prelude::has_prelude(), true ); } { // a_id!( orphan::mod_private::has_private(), true ); - // a_id!( orphan::mod_protected::has_protected(), true ); + // a_id!( orphan::mod_own::has_own(), true ); a_id!( orphan::mod_orphan::has_orphan(), true ); a_id!( orphan::mod_exposed::has_exposed(), true ); a_id!( orphan::mod_prelude::has_prelude(), true ); @@ -33,7 +33,7 @@ tests_impls! { // a_id!( exposed::mod_private::has_private(), true ); - // a_id!( exposed::mod_protected::has_protected(), true ); + // a_id!( exposed::mod_own::has_own(), true ); // a_id!( exposed::mod_orphan::has_orphan(), true ); a_id!( exposed::mod_exposed::has_exposed(), true ); a_id!( exposed::mod_prelude::has_prelude(), true ); @@ -41,7 +41,7 @@ tests_impls! { // a_id!( prelude::mod_private::has_private(), true ); - // a_id!( prelude::mod_protected::has_protected(), true ); + // a_id!( prelude::mod_own::has_own(), true ); // a_id!( prelude::mod_orphan::has_orphan(), true ); // a_id!( prelude::mod_exposed::has_exposed(), true ); a_id!( prelude::mod_prelude::has_prelude(), true ); diff --git a/module/core/mod_interface/tests/inc/only_test/micro_modules_two_only_test.rs b/module/core/mod_interface/tests/inc/only_test/micro_modules_two_only_test.rs index a9825ec197..a125123eed 100644 --- a/module/core/mod_interface/tests/inc/only_test/micro_modules_two_only_test.rs +++ b/module/core/mod_interface/tests/inc/only_test/micro_modules_two_only_test.rs @@ -10,8 +10,8 @@ tests_impls! { // a_id!( mod_private1::has_private1(), true ); // a_id!( mod_private2::has_private2(), true ); - a_id!( mod_protected1::has_protected1(), true ); - a_id!( mod_protected2::has_protected2(), true ); + a_id!( mod_own1::has_own1(), true ); + a_id!( mod_own2::has_own2(), true ); a_id!( mod_orphan1::has_orphan1(), true ); a_id!( mod_orphan2::has_orphan2(), true ); a_id!( mod_exposed1::has_exposed1(), true ); @@ -21,23 +21,23 @@ tests_impls! } { - // a_id!( protected::mod_private1::has_private1(), true ); - // a_id!( protected::mod_private2::has_private2(), true ); - a_id!( protected::mod_protected1::has_protected1(), true ); - a_id!( protected::mod_protected2::has_protected2(), true ); - a_id!( protected::mod_orphan1::has_orphan1(), true ); - a_id!( protected::mod_orphan2::has_orphan2(), true ); - a_id!( protected::mod_exposed1::has_exposed1(), true ); - a_id!( protected::mod_exposed2::has_exposed2(), true ); - a_id!( protected::mod_prelude1::has_prelude1(), true ); - a_id!( protected::mod_prelude2::has_prelude2(), true ); + // a_id!( own::mod_private1::has_private1(), true ); + // a_id!( own::mod_private2::has_private2(), true ); + a_id!( own::mod_own1::has_own1(), true ); + a_id!( own::mod_own2::has_own2(), true ); + a_id!( own::mod_orphan1::has_orphan1(), true ); + a_id!( own::mod_orphan2::has_orphan2(), true ); + a_id!( own::mod_exposed1::has_exposed1(), true ); + a_id!( own::mod_exposed2::has_exposed2(), true ); + a_id!( own::mod_prelude1::has_prelude1(), true ); + a_id!( own::mod_prelude2::has_prelude2(), true ); } { // a_id!( orphan::mod_private1::has_private1(), true ); // a_id!( orphan::mod_private2::has_private2(), true ); - // a_id!( orphan::mod_protected1::has_protected1(), true ); - // a_id!( orphan::mod_protected2::has_protected2(), true ); + // a_id!( orphan::mod_own1::has_own1(), true ); + // a_id!( orphan::mod_own2::has_own2(), true ); a_id!( orphan::mod_orphan1::has_orphan1(), true ); a_id!( orphan::mod_orphan2::has_orphan2(), true ); a_id!( orphan::mod_exposed1::has_exposed1(), true ); @@ -49,8 +49,8 @@ tests_impls! { // a_id!( exposed::mod_private1::has_private1(), true ); // a_id!( exposed::mod_private2::has_private2(), true ); - // a_id!( exposed::mod_protected1::has_protected1(), true ); - // a_id!( exposed::mod_protected2::has_protected2(), true ); + // a_id!( exposed::mod_own1::has_own1(), true ); + // a_id!( exposed::mod_own2::has_own2(), true ); // a_id!( exposed::mod_orphan1::has_orphan1(), true ); // a_id!( exposed::mod_orphan2::has_orphan2(), true ); a_id!( exposed::mod_exposed1::has_exposed1(), true ); @@ -62,8 +62,8 @@ tests_impls! { // a_id!( prelude::mod_private1::has_private1(), true ); // a_id!( prelude::mod_private2::has_private2(), true ); - // a_id!( prelude::mod_protected1::has_protected1(), true ); - // a_id!( prelude::mod_protected2::has_protected2(), true ); + // a_id!( prelude::mod_own1::has_own1(), true ); + // a_id!( prelude::mod_own2::has_own2(), true ); // a_id!( prelude::mod_orphan1::has_orphan1(), true ); // a_id!( prelude::mod_orphan2::has_orphan2(), true ); // a_id!( prelude::mod_exposed1::has_exposed1(), true ); diff --git a/module/core/mod_interface/tests/inc/only_test/use_non_layer_only_test.rs b/module/core/mod_interface/tests/inc/only_test/use_non_layer_only_test.rs index e0851aa35f..db252b6a5c 100644 --- a/module/core/mod_interface/tests/inc/only_test/use_non_layer_only_test.rs +++ b/module/core/mod_interface/tests/inc/only_test/use_non_layer_only_test.rs @@ -10,67 +10,67 @@ tests_impls! // test.case( "CrateStructForTesting1" ); { a_id!( layer_a::CrateStructForTesting1{}, layer_a::CrateStructForTesting1{} ); - a_id!( layer_a::protected::CrateStructForTesting1{}, layer_a::protected::CrateStructForTesting1{} ); + a_id!( layer_a::own::CrateStructForTesting1{}, layer_a::own::CrateStructForTesting1{} ); } // test.case( "SuperStruct" ); { a_id!( layer_a::SuperStruct1{}, layer_a::SuperStruct1{} ); - a_id!( layer_a::protected::SuperStruct1{}, layer_a::protected::SuperStruct1{} ); + a_id!( layer_a::own::SuperStruct1{}, layer_a::own::SuperStruct1{} ); } // test.case( "Vec" ); { a_id!( layer_a::Vec::< i32 >::new(), layer_a::Vec::< i32 >::new() ); - a_id!( layer_a::protected::Vec::< i32 >::new(), layer_a::protected::Vec::< i32 >::new() ); + a_id!( layer_a::own::Vec::< i32 >::new(), layer_a::own::Vec::< i32 >::new() ); a_id!( layer_a::orphan::Vec::< i32 >::new(), layer_a::orphan::Vec::< i32 >::new() ); // a_id!( layer_a::exposed::Vec::< i32 >::new(), layer_a::exposed::Vec::< i32 >::new() ); a_id!( Vec::< i32 >::new(), Vec::< i32 >::new() ); - a_id!( protected::Vec::< i32 >::new(), protected::Vec::< i32 >::new() ); + a_id!( own::Vec::< i32 >::new(), own::Vec::< i32 >::new() ); // a_id!( orphan::Vec::< i32 >::new(), orphan::Vec::< i32 >::new() ); } // test.case( "SubStruct2" ); { a_id!( layer_a::SubStruct2{}, layer_a::SubStruct2{} ); - a_id!( layer_a::protected::SubStruct2{}, layer_a::protected::SubStruct2{} ); + a_id!( layer_a::own::SubStruct2{}, layer_a::own::SubStruct2{} ); a_id!( layer_a::orphan::SubStruct2{}, layer_a::orphan::SubStruct2{} ); // a_id!( layer_a::exposed::SubStruct2{}, layer_a::exposed::SubStruct2{} ); a_id!( SubStruct2{}, SubStruct2{} ); - a_id!( protected::SubStruct2{}, protected::SubStruct2{} ); + a_id!( own::SubStruct2{}, own::SubStruct2{} ); // a_id!( orphan::SubStruct2{}, orphan::SubStruct2{} ); } // test.case( "SubStruct2" ); { a_id!( layer_a::SubStruct3{}, layer_a::SubStruct3{} ); - a_id!( layer_a::protected::SubStruct3{}, layer_a::protected::SubStruct3{} ); + a_id!( layer_a::own::SubStruct3{}, layer_a::own::SubStruct3{} ); a_id!( layer_a::orphan::SubStruct3{}, layer_a::orphan::SubStruct3{} ); // a_id!( layer_a::exposed::SubStruct3{}, layer_a::exposed::SubStruct3{} ); a_id!( SubStruct3{}, SubStruct3{} ); - a_id!( protected::SubStruct3{}, protected::SubStruct3{} ); + a_id!( own::SubStruct3{}, own::SubStruct3{} ); // a_id!( orphan::SubStruct3{}, orphan::SubStruct3{} ); } // test.case( "SubStruct2" ); { a_id!( layer_a::SubStruct4{}, layer_a::SubStruct4{} ); - a_id!( layer_a::protected::SubStruct4{}, layer_a::protected::SubStruct4{} ); + a_id!( layer_a::own::SubStruct4{}, layer_a::own::SubStruct4{} ); a_id!( layer_a::orphan::SubStruct4{}, layer_a::orphan::SubStruct4{} ); // a_id!( layer_a::exposed::SubStruct4{}, layer_a::exposed::SubStruct4{} ); a_id!( SubStruct4{}, SubStruct4{} ); - a_id!( protected::SubStruct4{}, protected::SubStruct4{} ); + a_id!( own::SubStruct4{}, own::SubStruct4{} ); // a_id!( orphan::SubStruct4{}, orphan::SubStruct4{} ); } // test.case( "SubStruct2" ); { a_id!( layer_a::PrivateStruct1{}, layer_a::PrivateStruct1{} ); - a_id!( layer_a::protected::PrivateStruct1{}, layer_a::protected::PrivateStruct1{} ); + a_id!( layer_a::own::PrivateStruct1{}, layer_a::own::PrivateStruct1{} ); a_id!( layer_a::orphan::PrivateStruct1{}, layer_a::orphan::PrivateStruct1{} ); // a_id!( layer_a::exposed::PrivateStruct1{}, layer_a::exposed::PrivateStruct1{} ); a_id!( PrivateStruct1{}, PrivateStruct1{} ); - a_id!( protected::PrivateStruct1{}, protected::PrivateStruct1{} ); + a_id!( own::PrivateStruct1{}, own::PrivateStruct1{} ); // a_id!( orphan::PrivateStruct1{}, orphan::PrivateStruct1{} ); } diff --git a/module/core/mod_interface_meta/src/impls.rs b/module/core/mod_interface_meta/src/impls.rs index 2f84bf65fd..e7c76bf6a8 100644 --- a/module/core/mod_interface_meta/src/impls.rs +++ b/module/core/mod_interface_meta/src/impls.rs @@ -10,7 +10,7 @@ pub( crate ) mod private // x // use private::Type1; // use private::{ Type1, Type2 }; - // protected use private::Type1; + // own use private::Type1; // prelude use private::Type1; // = ? @@ -41,7 +41,7 @@ pub( crate ) mod private // - extending // x - // prelude exposed macromod mod_protected1; + // prelude exposed macromod mod_own1; // : protected -> exposed // : orphan -> exposed // : exposed -> exposed @@ -78,13 +78,13 @@ pub( crate ) mod private // mod { mod1, mod2 }; // + - // protected mod mod_protected1; + // own mod mod_own1; // orphan mod mod_orphan1; // exposed mod mod_exposed1; // prelude mod mod_prelude1; // + - // protected mod { mod_protected1, mod_protected2 }; + // own mod { mod_own1, mod_own2 }; // orphan mod { mod_orphan1, mod_orphan2 }; // exposed mod { mod_exposed1, mod_exposed2 }; // prelude mod { mod_prelude1, mod_prelude2 }; @@ -145,7 +145,7 @@ pub( crate ) mod private }); } - c.clauses_map.get_mut( &VisProtected::Kind() ).unwrap().push( qt! + c.clauses_map.get_mut( &VisOwn::Kind() ).unwrap().push( qt! { #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -263,7 +263,8 @@ pub( crate ) mod private #[ allow( unused_imports ) ] #attrs1 #attrs2 - pub use super::#path; + pub use #path; + // xxx : remove super? }); Ok( () ) @@ -303,13 +304,13 @@ pub( crate ) mod private pub mod #path; }); - c.clauses_map.get_mut( &VisProtected::Kind() ).unwrap().push( qt! + c.clauses_map.get_mut( &VisOwn::Kind() ).unwrap().push( qt! { #[ doc( inline ) ] #[ allow( unused_imports ) ] #attrs1 #attrs2 - pub use super::#path::orphan::*; + pub use #path::orphan::*; }); c.clauses_map.get_mut( &VisExposed::Kind() ).unwrap().push( qt! @@ -318,7 +319,7 @@ pub( crate ) mod private #[ allow( unused_imports ) ] #attrs1 #attrs2 - pub use super::#path::exposed::*; + pub use #path::exposed::*; }); c.clauses_map.get_mut( &VisPrelude::Kind() ).unwrap().push( qt! @@ -327,7 +328,7 @@ pub( crate ) mod private #[ allow( unused_imports ) ] #attrs1 #attrs2 - pub use super::#path::prelude::*; + pub use #path::prelude::*; }); Ok( () ) @@ -352,7 +353,7 @@ pub( crate ) mod private let mut clauses_map : HashMap< _ , Vec< proc_macro2::TokenStream > > = HashMap::new(); clauses_map.insert( ClauseImmediates::Kind(), Vec::new() ); //clauses_map.insert( VisPrivate::Kind(), Vec::new() ); - clauses_map.insert( VisProtected::Kind(), Vec::new() ); + clauses_map.insert( VisOwn::Kind(), Vec::new() ); clauses_map.insert( VisOrphan::Kind(), Vec::new() ); clauses_map.insert( VisExposed::Kind(), Vec::new() ); clauses_map.insert( VisPrelude::Kind(), Vec::new() ); @@ -409,7 +410,7 @@ pub( crate ) mod private })?; let immediates_clause = clauses_map.get( &ClauseImmediates::Kind() ).unwrap(); - let protected_clause = clauses_map.get( &VisProtected::Kind() ).unwrap(); + let protected_clause = clauses_map.get( &VisOwn::Kind() ).unwrap(); let orphan_clause = clauses_map.get( &VisOrphan::Kind() ).unwrap(); let exposed_clause = clauses_map.get( &VisExposed::Kind() ).unwrap(); let prelude_clause = clauses_map.get( &VisPrelude::Kind() ).unwrap(); @@ -421,14 +422,15 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use protected::*; + pub use own::*; - /// Protected namespace of the module. + /// Own namespace of the module. #[ allow( unused_imports ) ] - pub mod protected + pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #( #protected_clause )* } @@ -436,8 +438,9 @@ pub( crate ) mod private #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #( #orphan_clause )* } @@ -445,8 +448,9 @@ pub( crate ) mod private #[ allow( unused_imports ) ] pub mod exposed { + use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #( #exposed_clause )* } @@ -454,6 +458,7 @@ pub( crate ) mod private #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #( #prelude_clause )* } @@ -475,20 +480,22 @@ pub( crate ) mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; } -pub use protected::*; +pub use own::*; /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -496,9 +503,9 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -507,8 +514,9 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { mod_interface, }; diff --git a/module/core/mod_interface_meta/src/lib.rs b/module/core/mod_interface_meta/src/lib.rs index f06407f56b..663e57652f 100644 --- a/module/core/mod_interface_meta/src/lib.rs +++ b/module/core/mod_interface_meta/src/lib.rs @@ -19,13 +19,13 @@ // // xxx : make it working // // exposed use super; // exposed use super::super::compiletime; -// protected use +// own use // { // * // }; // } -// xxx : make use proper_path_tools::protected::path working +// xxx : make use proper_path_tools::own::path working // xxx : put modular files into a namespace `file` maybe // #[ cfg( feature = "enabled" ) ] @@ -55,6 +55,22 @@ // Assign, // }; +// xxx : inherit all entities, somehow +// +// pub mod ca; +// +// crate::mod_interface! +// { +// // #![ debug ] +// +// // xxx : syntax for that, please +// use super::ca; +// own use super::ca::own::*; +// +// // /// Commands aggregator library. +// // layer ca; +// } + mod impls; #[ allow( unused_imports ) ] use impls::exposed::*; @@ -90,7 +106,7 @@ mod_interface! pub mod file2; private mod micro_private; - protected mod micro_protected; + own mod micro_own; orphan mod micro_orphan; exposed mod micro_exposed; prelude mod micro_prelude; diff --git a/module/core/mod_interface_meta/src/record.rs b/module/core/mod_interface_meta/src/record.rs index 8b12ecfca4..37a43bc148 100644 --- a/module/core/mod_interface_meta/src/record.rs +++ b/module/core/mod_interface_meta/src/record.rs @@ -256,20 +256,22 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; } /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -277,9 +279,9 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { ElementType, Record, @@ -292,8 +294,9 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } diff --git a/module/core/mod_interface_meta/src/use_tree.rs b/module/core/mod_interface_meta/src/use_tree.rs index 2e8050f7e0..0c70d97e1e 100644 --- a/module/core/mod_interface_meta/src/use_tree.rs +++ b/module/core/mod_interface_meta/src/use_tree.rs @@ -207,20 +207,22 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; } /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -228,10 +230,10 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { UseTree, }; @@ -242,4 +244,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/mod_interface_meta/src/visibility.rs b/module/core/mod_interface_meta/src/visibility.rs index d21fbce77d..e5e4184b67 100644 --- a/module/core/mod_interface_meta/src/visibility.rs +++ b/module/core/mod_interface_meta/src/visibility.rs @@ -5,7 +5,7 @@ pub( crate ) mod private // use macro_tools::syn::Result; use core::hash::{ Hash, Hasher }; - pub const VALID_VISIBILITY_LIST_STR : &str = "[ private, protected, orphan, exposed, prelude ]"; + pub const VALID_VISIBILITY_LIST_STR : &str = "[ private, own, orphan, exposed, prelude ]"; /// /// Custom keywords @@ -15,7 +15,7 @@ pub( crate ) mod private { use super::*; // syn::custom_keyword!( private ); - syn::custom_keyword!( protected ); + syn::custom_keyword!( own ); syn::custom_keyword!( orphan ); syn::custom_keyword!( exposed ); syn::custom_keyword!( prelude ); @@ -217,7 +217,7 @@ pub( crate ) mod private } // Vis!( Private, VisPrivate, private, 1 ); - Vis!( Protected, VisProtected, protected, Protected ); + Vis!( Own, VisOwn, own, Own ); Vis!( Orphan, VisOrphan, orphan, Orphan ); Vis!( Exposed, VisExposed, exposed, Exposed ); Vis!( Prelude, VisPrelude, prelude, Prelude ); @@ -230,7 +230,7 @@ pub( crate ) mod private Clause!( ClauseImmediates, Immadiate ); // impl_valid_sub_namespace!( VisPrivate, false ); - impl_valid_sub_namespace!( VisProtected, true ); + impl_valid_sub_namespace!( VisOwn, true ); impl_valid_sub_namespace!( VisOrphan, true ); impl_valid_sub_namespace!( VisExposed, true ); impl_valid_sub_namespace!( VisPrelude, true ); @@ -260,7 +260,7 @@ pub( crate ) mod private #[ default ] Private, /// Owned by current file entities. - Protected, + Own, /// Should be used by parent. Orphan, /// Should be used by all ascendants in the current crate. @@ -283,7 +283,7 @@ pub( crate ) mod private pub enum Visibility { //Private( VisPrivate ), - Protected( VisProtected ), + Own( VisOwn ), Orphan( VisOrphan ), Exposed( VisExposed ), Prelude( VisPrelude ), @@ -298,9 +298,9 @@ pub( crate ) mod private impl Visibility { - fn parse_protected( input : ParseStream< '_ > ) -> syn::Result< Self > + fn parse_own( input : ParseStream< '_ > ) -> syn::Result< Self > { - Self::_parse_vis::< VisProtected >( input ) + Self::_parse_vis::< VisOwn >( input ) } fn parse_orphan( input : ParseStream< '_ > ) -> syn::Result< Self > @@ -403,7 +403,7 @@ pub( crate ) mod private { // Visibility::Private( e ) => e.kind(), // Visibility::Crate( e ) => e.kind(), - Visibility::Protected( e ) => e.kind(), + Visibility::Own( e ) => e.kind(), Visibility::Orphan( e ) => e.kind(), Visibility::Exposed( e ) => e.kind(), Visibility::Prelude( e ) => e.kind(), @@ -421,7 +421,7 @@ pub( crate ) mod private { // Visibility::Private( e ) => e.restriction(), // Visibility::Crate( e ) => e.restriction(), - Visibility::Protected( e ) => e.restriction(), + Visibility::Own( e ) => e.restriction(), Visibility::Orphan( e ) => e.restriction(), Visibility::Exposed( e ) => e.restriction(), Visibility::Prelude( e ) => e.restriction(), @@ -454,7 +454,7 @@ pub( crate ) mod private match() { //_case if input.peek( kw::private ) => Self::parse_private( input ), - _case if input.peek( kw::protected ) => Self::parse_protected( input ), + _case if input.peek( kw::own ) => Self::parse_own( input ), _case if input.peek( kw::orphan ) => Self::parse_orphan( input ), _case if input.peek( kw::exposed ) => Self::parse_exposed( input ), _case if input.peek( kw::prelude ) => Self::parse_prelude( input ), @@ -475,7 +475,7 @@ pub( crate ) mod private match self { //Visibility::Private( e ) => e.to_tokens( tokens ), - Visibility::Protected( e ) => e.to_tokens( tokens ), + Visibility::Own( e ) => e.to_tokens( tokens ), Visibility::Orphan( e ) => e.to_tokens( tokens ), Visibility::Exposed( e ) => e.to_tokens( tokens ), Visibility::Prelude( e ) => e.to_tokens( tokens ), @@ -501,7 +501,7 @@ pub( crate ) mod private match self { //Visibility::Private( e ) => e.valid_sub_namespace(), - Visibility::Protected( e ) => e.valid_sub_namespace(), + Visibility::Own( e ) => e.valid_sub_namespace(), Visibility::Orphan( e ) => e.valid_sub_namespace(), Visibility::Exposed( e ) => e.valid_sub_namespace(), Visibility::Prelude( e ) => e.valid_sub_namespace(), @@ -514,20 +514,22 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; } /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -535,17 +537,17 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { kw, VALID_VISIBILITY_LIST_STR, ValidSubNamespace, HasClauseKind, // VisPrivate, - VisProtected, + VisOwn, VisOrphan, VisExposed, VisPrelude, @@ -560,4 +562,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/process_tools/src/environment.rs b/module/core/process_tools/src/environment.rs index a69a622379..c31a836e49 100644 --- a/module/core/process_tools/src/environment.rs +++ b/module/core/process_tools/src/environment.rs @@ -50,5 +50,5 @@ pub( crate ) mod private crate::mod_interface! { #[ cfg( feature = "process_environment_is_cicd" ) ] - protected use is_cicd; + own use is_cicd; } diff --git a/module/core/process_tools/src/process.rs b/module/core/process_tools/src/process.rs index 9786e183dc..e2857e4152 100644 --- a/module/core/process_tools/src/process.rs +++ b/module/core/process_tools/src/process.rs @@ -14,7 +14,7 @@ pub( crate ) mod private use duct::cmd; use error_tools:: { - untyped::{ Error, Context, anyhow }, + untyped::{ Error, Context, format_err }, // Result, }; use former::Former; @@ -197,7 +197,7 @@ pub( crate ) mod private } else { - report.error = Err( anyhow!( "Process was finished with error code : {}", output.status ) ); + report.error = Err( format_err!( "Process was finished with error code : {}", output.status ) ); Err( report ) } @@ -324,8 +324,8 @@ pub( crate ) mod private crate::mod_interface! { - // protected use run_with_shell; - protected use run; - protected use Run; - protected use Report; + // own use run_with_shell; + own use run; + own use Run; + own use Report; } diff --git a/module/core/program_tools/src/program.rs b/module/core/program_tools/src/program.rs index 5ae707cf30..b049eb364e 100644 --- a/module/core/program_tools/src/program.rs +++ b/module/core/program_tools/src/program.rs @@ -143,7 +143,7 @@ crate::mod_interface! Program, }; - protected use + own use { Plan, Call, diff --git a/module/core/proper_path_tools/src/lib.rs b/module/core/proper_path_tools/src/lib.rs index 96b91321c3..1ac23b4abd 100644 --- a/module/core/proper_path_tools/src/lib.rs +++ b/module/core/proper_path_tools/src/lib.rs @@ -22,7 +22,7 @@ mod_interface! layer transitive; #[ cfg( feature = "path_utf8" ) ] - protected use ::camino::{ Utf8Path, Utf8PathBuf }; - protected use ::std::path::{ PathBuf, Path }; + own use ::camino::{ Utf8Path, Utf8PathBuf }; + own use ::std::path::{ PathBuf, Path }; } diff --git a/module/core/reflect_tools/src/lib.rs b/module/core/reflect_tools/src/lib.rs index f3d1830e8b..67edd9c9de 100644 --- a/module/core/reflect_tools/src/lib.rs +++ b/module/core/reflect_tools/src/lib.rs @@ -20,15 +20,16 @@ pub mod dependency #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ cfg( feature = "reflect_reflect" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -40,8 +41,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -51,7 +53,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ cfg( feature = "reflect_reflect" ) ] #[ doc( inline ) ] @@ -70,6 +72,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "reflect_reflect" ) ] #[ doc( inline ) ] diff --git a/module/core/reflect_tools/src/reflect.rs b/module/core/reflect_tools/src/reflect.rs index baf95bf178..48c84ffc45 100644 --- a/module/core/reflect_tools/src/reflect.rs +++ b/module/core/reflect_tools/src/reflect.rs @@ -72,14 +72,15 @@ pub mod wrapper; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::axiomatic::orphan::*; @@ -116,7 +117,7 @@ pub mod protected #[ allow( unused_imports ) ] pub use super::wrapper::orphan::*; - // pub use super::private:: + // pub use private:: // { // }; } @@ -125,8 +126,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -135,7 +137,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::axiomatic::exposed::*; @@ -177,6 +179,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/reflect_tools/src/reflect/axiomatic.rs b/module/core/reflect_tools/src/reflect/axiomatic.rs index 110303e9c2..06baa8f4c2 100644 --- a/module/core/reflect_tools/src/reflect/axiomatic.rs +++ b/module/core/reflect_tools/src/reflect/axiomatic.rs @@ -493,25 +493,27 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { // reflect, IsContainer, @@ -532,10 +534,10 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { reflect, }; @@ -549,4 +551,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/entity_array.rs b/module/core/reflect_tools/src/reflect/entity_array.rs index abcbfdd388..afe3363b7c 100644 --- a/module/core/reflect_tools/src/reflect/entity_array.rs +++ b/module/core/reflect_tools/src/reflect/entity_array.rs @@ -75,23 +75,25 @@ pub mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; - // pub use super::private:: + pub use exposed::*; + // pub use private:: // { // }; } @@ -102,7 +104,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ doc( inline ) ] @@ -113,4 +115,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/entity_hashmap.rs b/module/core/reflect_tools/src/reflect/entity_hashmap.rs index a71b682e02..97d9a821c9 100644 --- a/module/core/reflect_tools/src/reflect/entity_hashmap.rs +++ b/module/core/reflect_tools/src/reflect/entity_hashmap.rs @@ -82,23 +82,25 @@ pub mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; - // pub use super::private:: + pub use exposed::*; + // pub use private:: // { // }; } @@ -109,7 +111,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ doc( inline ) ] @@ -120,4 +122,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/entity_hashset.rs b/module/core/reflect_tools/src/reflect/entity_hashset.rs index 80840fa607..ba48a7a189 100644 --- a/module/core/reflect_tools/src/reflect/entity_hashset.rs +++ b/module/core/reflect_tools/src/reflect/entity_hashset.rs @@ -71,23 +71,25 @@ pub mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; - // pub use super::private:: + pub use exposed::*; + // pub use private:: // { // }; } @@ -98,7 +100,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ doc( inline ) ] @@ -109,4 +111,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/entity_slice.rs b/module/core/reflect_tools/src/reflect/entity_slice.rs index e989b0ff5c..e396f8bcf9 100644 --- a/module/core/reflect_tools/src/reflect/entity_slice.rs +++ b/module/core/reflect_tools/src/reflect/entity_slice.rs @@ -71,23 +71,25 @@ pub mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; - // pub use super::private:: + pub use exposed::*; + // pub use private:: // { // }; } @@ -98,7 +100,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ doc( inline ) ] @@ -109,4 +111,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } \ No newline at end of file diff --git a/module/core/reflect_tools/src/reflect/entity_vec.rs b/module/core/reflect_tools/src/reflect/entity_vec.rs index de7343d728..c559136729 100644 --- a/module/core/reflect_tools/src/reflect/entity_vec.rs +++ b/module/core/reflect_tools/src/reflect/entity_vec.rs @@ -70,23 +70,25 @@ pub mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; - // pub use super::private:: + pub use exposed::*; + // pub use private:: // { // }; } @@ -97,7 +99,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ doc( inline ) ] @@ -108,4 +110,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/fields.rs b/module/core/reflect_tools/src/reflect/fields.rs index 8be78b3690..7047faab82 100644 --- a/module/core/reflect_tools/src/reflect/fields.rs +++ b/module/core/reflect_tools/src/reflect/fields.rs @@ -98,20 +98,22 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -121,7 +123,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { _IteratorTrait, IteratorTrait, @@ -134,4 +136,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/primitive.rs b/module/core/reflect_tools/src/reflect/primitive.rs index 7938081e00..f9e112db80 100644 --- a/module/core/reflect_tools/src/reflect/primitive.rs +++ b/module/core/reflect_tools/src/reflect/primitive.rs @@ -223,23 +223,25 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; - pub use super::private:: + pub use exposed::*; + pub use private:: { Primitive, // Data, @@ -252,7 +254,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } #[ doc( inline ) ] @@ -263,4 +265,5 @@ pub use exposed::*; #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/reflect_tools/src/reflect/wrapper.rs b/module/core/reflect_tools/src/reflect/wrapper.rs index fbd62c842d..288a561e25 100644 --- a/module/core/reflect_tools/src/reflect/wrapper.rs +++ b/module/core/reflect_tools/src/reflect/wrapper.rs @@ -12,22 +12,24 @@ mod maybe_as; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -50,4 +52,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/strs_tools/src/lib.rs b/module/core/strs_tools/src/lib.rs index 4437814486..72ff01c34c 100644 --- a/module/core/strs_tools/src/lib.rs +++ b/module/core/strs_tools/src/lib.rs @@ -11,14 +11,15 @@ pub mod string; #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; pub use super::string::orphan::*; } @@ -27,7 +28,8 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -44,5 +46,6 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; pub use super::string::prelude::*; } diff --git a/module/core/strs_tools/src/string/indentation.rs b/module/core/strs_tools/src/string/indentation.rs index 6784d6dd3c..0248fc567d 100644 --- a/module/core/strs_tools/src/string/indentation.rs +++ b/module/core/strs_tools/src/string/indentation.rs @@ -79,15 +79,16 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -96,9 +97,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -108,10 +110,10 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::protected as indentation; + pub use super::own as indentation; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { indentation, }; @@ -121,4 +123,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/strs_tools/src/string/isolate.rs b/module/core/strs_tools/src/string/isolate.rs index 668c2932c1..d54e34d219 100644 --- a/module/core/strs_tools/src/string/isolate.rs +++ b/module/core/strs_tools/src/string/isolate.rs @@ -176,8 +176,9 @@ pub( crate ) mod private /// Owned namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; use super::private as i; pub use i::IsolateOptions; @@ -187,13 +188,14 @@ pub mod protected pub use i::isolate_right; } -pub use protected::*; +pub use own::*; /// Parented namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -201,7 +203,7 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::protected as isolate; + pub use super::own as isolate; use super::private as i; @@ -215,6 +217,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; use super::private as i; pub use i::IsolateOptionsAdapter; diff --git a/module/core/strs_tools/src/string/mod.rs b/module/core/strs_tools/src/string/mod.rs index 4faf1c6b96..46552b8124 100644 --- a/module/core/strs_tools/src/string/mod.rs +++ b/module/core/strs_tools/src/string/mod.rs @@ -27,13 +27,14 @@ pub mod split; #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; #[ cfg( all( feature = "string_indentation", not( feature = "no_std" ) ) ) ] pub use super::indentation::orphan::*; #[ cfg( all( feature = "string_isolate", not( feature = "no_std" ) ) ) ] @@ -51,7 +52,8 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -77,6 +79,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( all( feature = "string_indentation", not( feature = "no_std" ) ) ) ] #[ allow( unused_imports ) ] pub use super::indentation::prelude::*; diff --git a/module/core/strs_tools/src/string/number.rs b/module/core/strs_tools/src/string/number.rs index 6cc7a271e6..a5629ea42a 100644 --- a/module/core/strs_tools/src/string/number.rs +++ b/module/core/strs_tools/src/string/number.rs @@ -5,15 +5,16 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; + use super::*; + pub use orphan::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; #[ cfg( all( feature = "string_parse_number" ) ) ] @@ -26,9 +27,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -38,10 +40,10 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::protected as number; + pub use super::own as number; #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -50,4 +52,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/strs_tools/src/string/parse_request.rs b/module/core/strs_tools/src/string/parse_request.rs index bc9dd452fd..9a0d896a2a 100644 --- a/module/core/strs_tools/src/string/parse_request.rs +++ b/module/core/strs_tools/src/string/parse_request.rs @@ -482,14 +482,15 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; - pub use super::private:: + use super::*; + pub use orphan::*; + pub use private:: { OpType, Request, @@ -503,7 +504,8 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -511,9 +513,9 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::protected as parse_request; + pub use super::own as parse_request; - pub use super::private:: + pub use private:: { ParseOptionsAdapter, request_parse, @@ -524,5 +526,6 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { - pub use super::private::ParseOptionsAdapter; + use super::*; + pub use private::ParseOptionsAdapter; } diff --git a/module/core/strs_tools/src/string/split.rs b/module/core/strs_tools/src/string/split.rs index 806ad2361f..2f2b078eea 100644 --- a/module/core/strs_tools/src/string/split.rs +++ b/module/core/strs_tools/src/string/split.rs @@ -645,14 +645,15 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::orphan::*; - pub use super::private:: + use super::*; + pub use orphan::*; + pub use private:: { Split, SplitType, @@ -667,7 +668,8 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -675,9 +677,9 @@ pub mod orphan pub mod exposed { use super::*; - pub use super::protected as split; + pub use super::own as split; - pub use super::private:: + pub use private:: { SplitOptionsAdapter, split, @@ -688,5 +690,6 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { - pub use super::private::SplitOptionsAdapter; + use super::*; + pub use private::SplitOptionsAdapter; } diff --git a/module/core/test_tools/src/lib.rs b/module/core/test_tools/src/lib.rs index babcb96c49..a5e09fde70 100644 --- a/module/core/test_tools/src/lib.rs +++ b/module/core/test_tools/src/lib.rs @@ -55,7 +55,7 @@ pub mod dependency { // #![ debug ] - protected use super::dependency::*; + own use super::dependency::*; layer test; diff --git a/module/core/test_tools/src/test/asset.rs b/module/core/test_tools/src/test/asset.rs index 929ff1f382..9f4068709f 100644 --- a/module/core/test_tools/src/test/asset.rs +++ b/module/core/test_tools/src/test/asset.rs @@ -42,6 +42,6 @@ crate::mod_interface! // exposed use super; exposed use super::super::asset; - // protected use path_to_exe; + // own use path_to_exe; } diff --git a/module/core/test_tools/src/test/compiletime.rs b/module/core/test_tools/src/test/compiletime.rs index 6b32d232b4..82cde05a1d 100644 --- a/module/core/test_tools/src/test/compiletime.rs +++ b/module/core/test_tools/src/test/compiletime.rs @@ -17,7 +17,7 @@ crate::mod_interface! // xxx : make it working // exposed use super; exposed use super::super::compiletime; - protected use + own use { * }; diff --git a/module/core/time_tools/src/lib.rs b/module/core/time_tools/src/lib.rs index f14a7cdbf7..afa8c3a1e7 100644 --- a/module/core/time_tools/src/lib.rs +++ b/module/core/time_tools/src/lib.rs @@ -25,27 +25,29 @@ pub mod dependency { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; /// Shared with parent namespace of the module #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -55,7 +57,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ cfg( feature = "time_now" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -67,4 +69,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/core/typing_tools/src/lib.rs b/module/core/typing_tools/src/lib.rs index 7eaef693dd..ce12c46568 100644 --- a/module/core/typing_tools/src/lib.rs +++ b/module/core/typing_tools/src/lib.rs @@ -32,15 +32,16 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::typing::orphan::*; @@ -51,8 +52,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -62,7 +64,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::typing::exposed::*; @@ -73,6 +75,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::typing::prelude::*; diff --git a/module/core/typing_tools/src/typing.rs b/module/core/typing_tools/src/typing.rs index c39c57c666..afbd7973c3 100644 --- a/module/core/typing_tools/src/typing.rs +++ b/module/core/typing_tools/src/typing.rs @@ -1,14 +1,15 @@ #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ cfg( feature = "typing_inspect_type" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -27,8 +28,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -37,7 +39,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "typing_inspect_type" ) ] @@ -56,6 +58,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "typing_inspect_type" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/variadic_from/src/lib.rs b/module/core/variadic_from/src/lib.rs index c486270ae3..a853004cdc 100644 --- a/module/core/variadic_from/src/lib.rs +++ b/module/core/variadic_from/src/lib.rs @@ -19,15 +19,16 @@ pub mod dependency #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::variadic::orphan::*; @@ -38,8 +39,9 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } @@ -50,7 +52,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; // #[ cfg( any_derive ) ] #[ doc( inline ) ] @@ -64,6 +66,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/core/variadic_from/src/variadic.rs b/module/core/variadic_from/src/variadic.rs index 548e5b69dd..89e814c9d8 100644 --- a/module/core/variadic_from/src/variadic.rs +++ b/module/core/variadic_from/src/variadic.rs @@ -373,28 +373,30 @@ pub( crate ) mod private pub use from; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; @@ -406,7 +408,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -414,9 +416,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { // From_0, diff --git a/module/core/wtools/src/lib.rs b/module/core/wtools/src/lib.rs index ccc022e055..3ea359658d 100644 --- a/module/core/wtools/src/lib.rs +++ b/module/core/wtools/src/lib.rs @@ -50,12 +50,13 @@ pub mod dependency } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] - pub use super::orphan::*; + pub use orphan::*; #[ cfg( feature = "iter" ) ] #[ doc( inline ) ] @@ -110,14 +111,15 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -126,7 +128,7 @@ pub mod exposed { use super::*; #[ doc( inline ) ] - pub use super::prelude::*; + pub use prelude::*; #[ cfg( feature = "iter" ) ] pub use super::iter::exposed::*; #[ cfg( feature = "meta" ) ] @@ -159,6 +161,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ cfg( feature = "iter" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/move/assistant/src/client.rs b/module/move/assistant/src/client.rs index 45d9a6d01e..3dbd2eea5d 100644 --- a/module/move/assistant/src/client.rs +++ b/module/move/assistant/src/client.rs @@ -39,16 +39,17 @@ pub( crate ) mod private } #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } @@ -56,9 +57,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -69,7 +71,7 @@ pub mod exposed #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { ClientOptions, client, @@ -91,4 +93,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/move/assistant/src/lib.rs b/module/move/assistant/src/lib.rs index d0620eaa8e..8f1345c5aa 100644 --- a/module/move/assistant/src/lib.rs +++ b/module/move/assistant/src/lib.rs @@ -13,12 +13,13 @@ pub( crate ) mod private pub mod client; #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] @@ -29,7 +30,7 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } @@ -37,9 +38,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -70,6 +72,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] diff --git a/module/move/crates_tools/src/lib.rs b/module/move/crates_tools/src/lib.rs index 7a924a63b0..8456839b4f 100644 --- a/module/move/crates_tools/src/lib.rs +++ b/module/move/crates_tools/src/lib.rs @@ -127,16 +127,17 @@ pub( crate ) mod private #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -144,9 +145,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -157,7 +159,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -165,7 +167,8 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private::CrateArchive; + pub use private::CrateArchive; } diff --git a/module/move/deterministic_rand/src/lib.rs b/module/move/deterministic_rand/src/lib.rs index bb9a097fe9..b41e465453 100644 --- a/module/move/deterministic_rand/src/lib.rs +++ b/module/move/deterministic_rand/src/lib.rs @@ -21,7 +21,7 @@ pub use hrng_non_deterministic as hrng; mod_interface! { - protected use ::rand::*; + own use ::rand::*; use super::hrng; diff --git a/module/move/plot_interface/src/plot/abs/change.rs b/module/move/plot_interface/src/plot/abs/change.rs index c4ed6fba10..75087410e6 100644 --- a/module/move/plot_interface/src/plot/abs/change.rs +++ b/module/move/plot_interface/src/plot/abs/change.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Context. #[ clone_dyn ] diff --git a/module/move/plot_interface/src/plot/abs/changer.rs b/module/move/plot_interface/src/plot/abs/changer.rs index b3db57d644..b08fab234b 100644 --- a/module/move/plot_interface/src/plot/abs/changer.rs +++ b/module/move/plot_interface/src/plot/abs/changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Context. pub trait ChangerInterface diff --git a/module/move/plot_interface/src/plot/abs/context.rs b/module/move/plot_interface/src/plot/abs/context.rs index a168563487..821b2fb123 100644 --- a/module/move/plot_interface/src/plot/abs/context.rs +++ b/module/move/plot_interface/src/plot/abs/context.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; // use crate::abs::*; // use once_cell::sync::Lazy; // use std::sync::Mutex; diff --git a/module/move/plot_interface/src/plot/abs/identity.rs b/module/move/plot_interface/src/plot/abs/identity.rs index 9c44106555..e9fe2b4ab6 100644 --- a/module/move/plot_interface/src/plot/abs/identity.rs +++ b/module/move/plot_interface/src/plot/abs/identity.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; use once_cell::sync::Lazy; use std::sync::Mutex; use core::hash::Hash; diff --git a/module/move/plot_interface/src/plot/abs/registry.rs b/module/move/plot_interface/src/plot/abs/registry.rs index 82a18645a4..a3c640cdd2 100644 --- a/module/move/plot_interface/src/plot/abs/registry.rs +++ b/module/move/plot_interface/src/plot/abs/registry.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; // use crate::abs::*; use once_cell::sync::Lazy; use std::sync::Mutex; diff --git a/module/move/plot_interface/src/plot/color.rs b/module/move/plot_interface/src/plot/color.rs index b41399f253..18bd1c0733 100644 --- a/module/move/plot_interface/src/plot/color.rs +++ b/module/move/plot_interface/src/plot/color.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; use num_traits::{ Zero }; /* zzz : consider as submodule for wtools */ /// Convertable into RGBA. @@ -92,7 +92,7 @@ pub( crate ) mod private crate::mod_interface! { - protected use ::rgb::*; + own use ::rgb::*; #[ cfg( not( feature = "no_std" ) ) ] exposed use Rgba; diff --git a/module/move/plot_interface/src/plot/sys/context.rs b/module/move/plot_interface/src/plot/sys/context.rs index 9b11a3f80a..c47566d47d 100644 --- a/module/move/plot_interface/src/plot/sys/context.rs +++ b/module/move/plot_interface/src/plot/sys/context.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; use crate::abs::*; use once_cell::sync::Lazy; @@ -85,6 +85,6 @@ pub( crate ) mod private crate::mod_interface! { - protected use { REGISTRY, current }; + own use { REGISTRY, current }; exposed use { Context, current as context }; } diff --git a/module/move/plot_interface/src/plot/sys/context_changer.rs b/module/move/plot_interface/src/plot/sys/context_changer.rs index e32452adf9..fe06c75c67 100644 --- a/module/move/plot_interface/src/plot/sys/context_changer.rs +++ b/module/move/plot_interface/src/plot/sys/context_changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Context. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/drawing.rs b/module/move/plot_interface/src/plot/sys/drawing.rs index 2efa4e8eaa..20aa9bf26e 100644 --- a/module/move/plot_interface/src/plot/sys/drawing.rs +++ b/module/move/plot_interface/src/plot/sys/drawing.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Drawing. #[ derive( Debug, Clone ) ] diff --git a/module/move/plot_interface/src/plot/sys/drawing/change_new.rs b/module/move/plot_interface/src/plot/sys/drawing/change_new.rs index 08b0125b77..e7d72be5b5 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/change_new.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/change_new.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/drawing/changer.rs b/module/move/plot_interface/src/plot/sys/drawing/changer.rs index eaa2d0c76f..2400ac77a2 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/changer.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/drawing/command.rs b/module/move/plot_interface/src/plot/sys/drawing/command.rs index 8108cbcf17..e10b140493 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/command.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/command.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; // /// Interface of command to draw something. // pub trait DrawCommandInterface diff --git a/module/move/plot_interface/src/plot/sys/drawing/queue.rs b/module/move/plot_interface/src/plot/sys/drawing/queue.rs index 6b9ba83b3c..06367a519a 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/queue.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/queue.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; // use crate::drawing_changer::*; // // /// Queue of draw commands. diff --git a/module/move/plot_interface/src/plot/sys/drawing/rect_change_new.rs b/module/move/plot_interface/src/plot/sys/drawing/rect_change_new.rs index f3ce04bca6..b021be8e07 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/rect_change_new.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/rect_change_new.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Command to draw rectangle. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/drawing/rect_change_region.rs b/module/move/plot_interface/src/plot/sys/drawing/rect_change_region.rs index 163a8309ea..9f3fdc07df 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/rect_change_region.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/rect_change_region.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Command to draw rectangle. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/drawing/rect_changer.rs b/module/move/plot_interface/src/plot/sys/drawing/rect_changer.rs index 3550c4153c..6f7afe8caf 100644 --- a/module/move/plot_interface/src/plot/sys/drawing/rect_changer.rs +++ b/module/move/plot_interface/src/plot/sys/drawing/rect_changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// Command to draw rectangle. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/stroke_brush.rs b/module/move/plot_interface/src/plot/sys/stroke_brush.rs index 28a88e7aee..d7e451dc95 100644 --- a/module/move/plot_interface/src/plot/sys/stroke_brush.rs +++ b/module/move/plot_interface/src/plot/sys/stroke_brush.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// StrokeBrush. #[ derive( Debug, Clone ) ] diff --git a/module/move/plot_interface/src/plot/sys/stroke_brush/change_color.rs b/module/move/plot_interface/src/plot/sys/stroke_brush/change_color.rs index 98d55ffbaa..42a2e6f486 100644 --- a/module/move/plot_interface/src/plot/sys/stroke_brush/change_color.rs +++ b/module/move/plot_interface/src/plot/sys/stroke_brush/change_color.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/stroke_brush/change_new.rs b/module/move/plot_interface/src/plot/sys/stroke_brush/change_new.rs index 86f5ae3914..1ffe548ae5 100644 --- a/module/move/plot_interface/src/plot/sys/stroke_brush/change_new.rs +++ b/module/move/plot_interface/src/plot/sys/stroke_brush/change_new.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/stroke_brush/change_width.rs b/module/move/plot_interface/src/plot/sys/stroke_brush/change_width.rs index 41c86c90e3..991aa2092c 100644 --- a/module/move/plot_interface/src/plot/sys/stroke_brush/change_width.rs +++ b/module/move/plot_interface/src/plot/sys/stroke_brush/change_width.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/sys/stroke_brush/changer.rs b/module/move/plot_interface/src/plot/sys/stroke_brush/changer.rs index c18ebbd4f7..3fdd638da2 100644 --- a/module/move/plot_interface/src/plot/sys/stroke_brush/changer.rs +++ b/module/move/plot_interface/src/plot/sys/stroke_brush/changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/plot_interface/src/plot/wplot_lib.rs b/module/move/plot_interface/src/plot/wplot_lib.rs index 13e61e7dfd..b1d6d6211b 100644 --- a/module/move/plot_interface/src/plot/wplot_lib.rs +++ b/module/move/plot_interface/src/plot/wplot_lib.rs @@ -42,7 +42,7 @@ crate::mod_interface! layer sys; use super::math; - protected use ::wmath as math; + own use ::wmath as math; protected( crate ) use ::wtools::prelude::*; } diff --git a/module/move/sqlx_query/src/lib.rs b/module/move/sqlx_query/src/lib.rs index 55dfc41d04..46aeccb400 100644 --- a/module/move/sqlx_query/src/lib.rs +++ b/module/move/sqlx_query/src/lib.rs @@ -92,16 +92,17 @@ pub( crate ) mod private #[ cfg( feature = "enabled" ) ] #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } /// Orphan namespace of the module. @@ -109,9 +110,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -122,7 +124,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. @@ -130,6 +132,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::query; diff --git a/module/move/wca/src/ca/executor/routine.rs b/module/move/wca/src/ca/executor/routine.rs index a18b4ff26a..1435910138 100644 --- a/module/move/wca/src/ca/executor/routine.rs +++ b/module/move/wca/src/ca/executor/routine.rs @@ -334,7 +334,8 @@ pub( crate ) mod private { fn into_result( self ) -> error::untyped::Result< () > { - self.map_err( | e | error::untyped::anyhow!( "{e:?}" )) + self.map_err( | e | error::untyped::format_err!( "{e:?}" )) + // xxx : qqq : ? } } } diff --git a/module/move/wca/src/ca/grammar/command.rs b/module/move/wca/src/ca/grammar/command.rs index 62b119c5ab..bab839527e 100644 --- a/module/move/wca/src/ca/grammar/command.rs +++ b/module/move/wca/src/ca/grammar/command.rs @@ -250,7 +250,7 @@ crate::mod_interface! { exposed use Command; exposed use CommandFormer; - protected use ValueDescription; + own use ValueDescription; } // qqq : use orphan instead of exposed for ALL files in the folder, dont use prelude for structs \ No newline at end of file diff --git a/module/move/wca/src/ca/help.rs b/module/move/wca/src/ca/help.rs index 4887618ccb..3cf65c4633 100644 --- a/module/move/wca/src/ca/help.rs +++ b/module/move/wca/src/ca/help.rs @@ -16,7 +16,7 @@ pub( crate ) mod private use iter_tools::Itertools; use std::rc::Rc; - use error::untyped::anyhow; + use error::untyped::format_err; use former::Former; // qqq : for Bohdan : it should transparent mechanist which patch list of commands, not a stand-alone mechanism @@ -265,7 +265,9 @@ pub( crate ) mod private _ => { let command = o.args.get_owned::< String >( 0 ).unwrap(); - let cmd = grammar.commands.get( &command ).ok_or_else( || anyhow!( "Can not found help for command `{command}`" ) )?; + let cmd = grammar.commands + .get( &command ) + .ok_or_else( || format_err!( "Can not found help for command `{command}`" ) )?; let args = HelpGeneratorOptions::former() .command_prefix( "." ) @@ -414,7 +416,7 @@ pub( crate ) mod private crate::mod_interface! { - protected use HelpGeneratorFn; - protected use HelpGeneratorOptions; + own use HelpGeneratorFn; + own use HelpGeneratorOptions; prelude use HelpVariants; } diff --git a/module/move/wca/src/ca/mod.rs b/module/move/wca/src/ca/mod.rs index c8c75253cf..3526d2c8fa 100644 --- a/module/move/wca/src/ca/mod.rs +++ b/module/move/wca/src/ca/mod.rs @@ -1,3 +1,6 @@ +//! +//! Commands aggregator library. +//! crate::mod_interface! { diff --git a/module/move/wca/src/ca/tool/table.rs b/module/move/wca/src/ca/tool/table.rs index c6fa61165d..192caa0396 100644 --- a/module/move/wca/src/ca/tool/table.rs +++ b/module/move/wca/src/ca/tool/table.rs @@ -124,5 +124,5 @@ mod private crate::mod_interface! { - protected use format_table; + own use format_table; } diff --git a/module/move/wca/src/lib.rs b/module/move/wca/src/lib.rs index 41d75a3c19..f65d8fd12a 100644 --- a/module/move/wca/src/lib.rs +++ b/module/move/wca/src/lib.rs @@ -8,16 +8,10 @@ use mod_interface::mod_interface; -mod ca; +pub mod ca; crate::mod_interface! { - // #![ debug ] - - // xxx : syntax for that, please use super::ca; - protected use super::ca::protected::*; - - // /// Commands aggregator library. - // layer ca; + own use super::ca::own::*; } diff --git a/module/move/wca/src/wtools.rs b/module/move/wca/src/wtools.rs index 75a1392519..1df4db86e7 100644 --- a/module/move/wca/src/wtools.rs +++ b/module/move/wca/src/wtools.rs @@ -2,12 +2,12 @@ // // crate::mod_interface! // { -// protected use ::iter_tools::Itertools; +// own use ::iter_tools::Itertools; // -// // protected use ::error_tools::err; -// // protected use ::error_tools::dependency::*; +// // own use ::error_tools::err; +// // own use ::error_tools::dependency::*; // -// protected use error_tools; +// own use error_tools; // // use ::strs_tools as string; // // use ::error_tools as error; diff --git a/module/move/willbe/src/action/list.rs b/module/move/willbe/src/action/list.rs index b25cf877a3..6f2708217b 100644 --- a/module/move/willbe/src/action/list.rs +++ b/module/move/willbe/src/action/list.rs @@ -833,21 +833,21 @@ mod private crate::mod_interface! { /// Arguments for `list` action. - protected use ListOptions; + own use ListOptions; /// Additional information to include in a package report. - protected use PackageAdditionalInfo; + own use PackageAdditionalInfo; /// Represents where a dependency located. - protected use DependencySource; + own use DependencySource; /// Represents the category of a dependency. - protected use DependencyCategory; + own use DependencyCategory; /// Argument for `list` action. Sets the output format. - protected use ListFormat; + own use ListFormat; /// Argument for `list` action. Sets filter(local or all) packages should be in the output. - protected use ListFilter; + own use ListFilter; /// Contains output of the action. - protected use ListReport; + own use ListReport; /// Contains output of a single node of the action. - // protected use ListNodeReport; + // own use ListNodeReport; /// List packages in workspace. orphan use list; } diff --git a/module/move/willbe/src/action/readme_health_table_renew.rs b/module/move/willbe/src/action/readme_health_table_renew.rs index 325fbc3819..f767c0a885 100644 --- a/module/move/willbe/src/action/readme_health_table_renew.rs +++ b/module/move/willbe/src/action/readme_health_table_renew.rs @@ -709,12 +709,12 @@ ensure that at least one remotest is present in git. ", crate::mod_interface! { // /// Return workspace root - // protected use workspace_root; + // own use workspace_root; /// Stability - protected use Stability; + own use Stability; /// Generate Stability badge - protected use stability_generate; - protected use find_example_file; + own use stability_generate; + own use find_example_file; /// Create Table. orphan use readme_health_table_renew; } diff --git a/module/move/willbe/src/action/test.rs b/module/move/willbe/src/action/test.rs index aa6e8c5b42..be0b90405c 100644 --- a/module/move/willbe/src/action/test.rs +++ b/module/move/willbe/src/action/test.rs @@ -219,5 +219,5 @@ crate::mod_interface! { /// run all tests in all crates orphan use test; - protected use TestsCommandOptions; + own use TestsCommandOptions; } diff --git a/module/move/willbe/src/command/mod.rs b/module/move/willbe/src/command/mod.rs index 0360feb96f..4cad62a6dc 100644 --- a/module/move/willbe/src/command/mod.rs +++ b/module/move/willbe/src/command/mod.rs @@ -108,17 +108,17 @@ pub( crate ) mod private .command( "readme.health.table.renew" ) .hint( "Generate a table for the root `Readme.md`" ) - .long_hint( + .long_hint( r#"Generates a data summary table for the `Readme.md` file located in the root of the workspace. To ensure the proper execution of the command, the following tags need to be specified in the Readme.md file: - + - + After executing the command, the tags will not be modified. - + Tags can contains params: - + path: The relative path to the directory from workspace root, which crates will be taken. Default is './'. with_branches: If set to 1, it will display the status of workflow execution on branches specified in branches under workspace.metadata in the Cargo.toml of your workspace. For example, branches = ["master", "alpha"]. Default is 1. with_stability: If set to 1, a column indicating the stability of the module will be added. Information is taken from package.metadata of each module (package.metadata.stability = "stable"). By default, the module is considered experimental. Default is 1. @@ -266,7 +266,7 @@ with_gitpod: If set to 1, a column with a link to Gitpod will be added. Clicking .long_hint( "Generate header which contains a badge with the general status of workspace, a link to discord, an example in gitpod and documentation in workspace`s Readme.md file.\n For use this command you need to specify:\n\n[workspace.metadata]\nmaster_branch = \"alpha\"\nworkspace_name = \"wtools\"\nrepo_url = \"https://github.com/Wandalen/wTools\"\ndiscord_url = \"https://discord.gg/123123\"\n\nin workspace's Cargo.toml.\n\nGenerates header for each workspace member which contains a badge with the status of crate, a link to discord, an example in gitpod and documentation in crate Readme.md file.\nFor use this command you need to specify:\n\n[package]\nname = \"test_module\"\nrepository = \"https://github.com/Username/ProjectName/tree/master/module/test_module\"\n...\n[package.metadata]\nstability = \"stable\" (Optional)\ndiscord_url = \"https://discord.gg/1234567890\" (Optional)\n\nin module's Cargo.toml.") .routine( command::readme_headers_renew ) .end() - + .command( "features" ) .hint( "Lists features of the package" ) .long_hint( "Lists features of the package located in a folder.\nWill list either separate package features or features for every package of a workspace") @@ -288,7 +288,7 @@ with_gitpod: If set to 1, a column with a link to Gitpod will be added. Clicking crate::mod_interface! { - protected use ca; + own use ca; /// List packages. layer list; diff --git a/module/move/willbe/src/entity/channel.rs b/module/move/willbe/src/entity/channel.rs index 5228930459..5d0d33b1d3 100644 --- a/module/move/willbe/src/entity/channel.rs +++ b/module/move/willbe/src/entity/channel.rs @@ -83,6 +83,6 @@ mod private crate::mod_interface! { - protected use Channel; - protected use available_channels; + own use Channel; + own use available_channels; } diff --git a/module/move/willbe/src/entity/dependency.rs b/module/move/willbe/src/entity/dependency.rs index bf7f785d52..337ecb01a2 100644 --- a/module/move/willbe/src/entity/dependency.rs +++ b/module/move/willbe/src/entity/dependency.rs @@ -278,10 +278,10 @@ crate::mod_interface! exposed use DependencyRef; exposed use DependencyKind; - protected use CrateId; - protected use DependenciesSort; - protected use DependenciesOptions; - protected use _list; - protected use list; + own use CrateId; + own use DependenciesSort; + own use DependenciesOptions; + own use _list; + own use list; } diff --git a/module/move/willbe/src/entity/diff.rs b/module/move/willbe/src/entity/diff.rs index 7ddd7f65f1..08b0638b77 100644 --- a/module/move/willbe/src/entity/diff.rs +++ b/module/move/willbe/src/entity/diff.rs @@ -218,9 +218,9 @@ mod private crate::mod_interface! { - protected use Diff; - protected use DiffItem; - protected use DiffReport; - protected use crate_diff; - protected use PUBLISH_IGNORE_LIST; + own use Diff; + own use DiffItem; + own use DiffReport; + own use crate_diff; + own use PUBLISH_IGNORE_LIST; } \ No newline at end of file diff --git a/module/move/willbe/src/entity/features.rs b/module/move/willbe/src/entity/features.rs index e0dedd9f99..300fa7ca2f 100644 --- a/module/move/willbe/src/entity/features.rs +++ b/module/move/willbe/src/entity/features.rs @@ -143,6 +143,6 @@ mod private crate::mod_interface! { /// Features - protected use features_powerset; - protected use estimate_with; + own use features_powerset; + own use estimate_with; } diff --git a/module/move/willbe/src/entity/git.rs b/module/move/willbe/src/entity/git.rs index df8c7fb4c9..eeeddfd5a4 100644 --- a/module/move/willbe/src/entity/git.rs +++ b/module/move/willbe/src/entity/git.rs @@ -82,7 +82,7 @@ mod private crate::mod_interface! { - protected use ExtendedGitReport; - protected use GitOptions; - protected use perform_git_commit; + own use ExtendedGitReport; + own use GitOptions; + own use perform_git_commit; } diff --git a/module/move/willbe/src/entity/manifest.rs b/module/move/willbe/src/entity/manifest.rs index dcaea64ed8..97f02977b9 100644 --- a/module/move/willbe/src/entity/manifest.rs +++ b/module/move/willbe/src/entity/manifest.rs @@ -185,5 +185,5 @@ crate::mod_interface! { exposed use Manifest; orphan use ManifestError; - protected use repo_url; + own use repo_url; } diff --git a/module/move/willbe/src/entity/optimization.rs b/module/move/willbe/src/entity/optimization.rs index 56bdaf1385..875dd76100 100644 --- a/module/move/willbe/src/entity/optimization.rs +++ b/module/move/willbe/src/entity/optimization.rs @@ -15,5 +15,5 @@ mod private crate::mod_interface! { - protected use Optimization; + own use Optimization; } diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs index f972e8b627..5e53b6ea19 100644 --- a/module/move/willbe/src/entity/package.rs +++ b/module/move/willbe/src/entity/package.rs @@ -234,9 +234,9 @@ crate::mod_interface! { exposed use Package; - protected use PackageName; - protected use PackageError; + own use PackageName; + own use PackageError; - protected use publish_need; + own use publish_need; } diff --git a/module/move/willbe/src/entity/package_md_extension.rs b/module/move/willbe/src/entity/package_md_extension.rs index 1cc03998c7..0401b30644 100644 --- a/module/move/willbe/src/entity/package_md_extension.rs +++ b/module/move/willbe/src/entity/package_md_extension.rs @@ -18,25 +18,25 @@ pub( crate ) mod private /// Discord url fn discord_url( &self ) -> Result< Option< String >, package::PackageError >; } - + impl < 'a > package::Package< 'a > { /// Package name pub fn name( &self ) -> Result< &str, package::PackageError > - { + { match self - { - Self::Manifest( manifest ) => - { + { + Self::Manifest( manifest ) => + { // let data = manifest.data.as_ref().ok_or_else( || PackageError::Manifest( ManifestError::EmptyManifestData ) )?; let data = &manifest.data; - + // Unwrap safely because of the `Package` type guarantee // Ok( data[ "package" ][ "name" ].as_str().unwrap().to_string() ) Ok( data[ "package" ][ "name" ].as_str().unwrap() ) } - Self::WorkspacePackageRef( package ) => - { + Self::WorkspacePackageRef( package ) => + { Ok( package.name() ) } } @@ -51,20 +51,20 @@ pub( crate ) mod private // aaa : done match self { - Self::Manifest( _ ) => + Self::Manifest( _ ) => { // Unwrap safely because of the `Package` type guarantee Ok - ( + ( self.package_metadata() .and_then( | m | m.get( "stability" ) ) .and_then( | s | s.as_str() ) .and_then( | s | s.parse::< action::readme_health_table_renew::Stability >().ok() ) - .unwrap_or( action::readme_health_table_renew::Stability::Experimental ) - ) + .unwrap_or( action::readme_health_table_renew::Stability::Experimental ) + ) } - Self::WorkspacePackageRef( package ) => - { + Self::WorkspacePackageRef( package ) => + { Ok ( package @@ -82,18 +82,18 @@ pub( crate ) mod private { match self { - Self::Manifest( manifest ) => - { + Self::Manifest( manifest ) => + { // let data = manifest.data.as_ref().ok_or_else( || PackageError::Manifest( ManifestError::EmptyManifestData ) )?; let data = &manifest.data; - + // Unwrap safely because of the `Package` type guarantee Ok - ( + ( data[ "package" ] .get( "repository" ) .and_then( | r | r.as_str() ) - .map( | r | r.to_string()) + .map( | r | r.to_string()) ) } Self::WorkspacePackageRef( package ) => @@ -105,38 +105,38 @@ pub( crate ) mod private /// Discord url pub fn discord_url( &self ) -> Result< Option< String >, package::PackageError > - { + { match self { - Self::Manifest( _ ) => + Self::Manifest( _ ) => { // let data = manifest.data.as_ref().ok_or_else( || PackageError::Manifest( ManifestError::EmptyManifestData ) )?; Ok - ( + ( self.package_metadata() .and_then( | m | m.get( "discord_url" ) ) .and_then( | url | url.as_str() ) - .map( | r | r.to_string() ) + .map( | r | r.to_string() ) ) } - Self::WorkspacePackageRef( package ) => + Self::WorkspacePackageRef( package ) => { Ok( package.metadata()[ "discord_url" ].as_str().map( | url | url.to_string() ) ) } } } - + fn package_metadata( &self ) -> Option< &toml_edit::Item > { match self { - package::Package::Manifest( manifest ) => + package::Package::Manifest( manifest ) => { let data = &manifest.data; - + data[ "package" ] .get( "metadata" ) } - package::Package::WorkspacePackageRef(_) => + package::Package::WorkspacePackageRef(_) => { None } @@ -148,5 +148,5 @@ pub( crate ) mod private crate::mod_interface! { - protected use PackageMdExtension; + own use PackageMdExtension; } diff --git a/module/move/willbe/src/entity/packages.rs b/module/move/willbe/src/entity/packages.rs index b1a4e0d141..6dd4006db3 100644 --- a/module/move/willbe/src/entity/packages.rs +++ b/module/move/willbe/src/entity/packages.rs @@ -109,7 +109,7 @@ mod private crate::mod_interface! { - protected use FilterMapOptions; - protected use filter; + own use FilterMapOptions; + own use filter; } diff --git a/module/move/willbe/src/entity/packed_crate.rs b/module/move/willbe/src/entity/packed_crate.rs index e8bd052b1e..77da22b98e 100644 --- a/module/move/willbe/src/entity/packed_crate.rs +++ b/module/move/willbe/src/entity/packed_crate.rs @@ -68,7 +68,7 @@ mod private crate::mod_interface! { - protected use local_path; - protected use download; + own use local_path; + own use download; } diff --git a/module/move/willbe/src/entity/progress_bar.rs b/module/move/willbe/src/entity/progress_bar.rs index 52e0460f48..c9fef4cf07 100644 --- a/module/move/willbe/src/entity/progress_bar.rs +++ b/module/move/willbe/src/entity/progress_bar.rs @@ -102,7 +102,7 @@ mod private crate::mod_interface! { #[ cfg( feature = "progress_bar" ) ] - protected use ProgressBar; + own use ProgressBar; #[ cfg( feature = "progress_bar" ) ] - protected use MultiProgress; + own use MultiProgress; } \ No newline at end of file diff --git a/module/move/willbe/src/entity/publish.rs b/module/move/willbe/src/entity/publish.rs index 75ac067653..ed1e336129 100644 --- a/module/move/willbe/src/entity/publish.rs +++ b/module/move/willbe/src/entity/publish.rs @@ -433,10 +433,10 @@ mod private crate::mod_interface! { - protected use PublishPlan; - protected use PackagePublishInstruction; - protected use PublishSinglePackagePlanner; - protected use PublishReport; - protected use perform_package_publish; - protected use perform_packages_publish; + own use PublishPlan; + own use PackagePublishInstruction; + own use PublishSinglePackagePlanner; + own use PublishReport; + own use perform_package_publish; + own use perform_packages_publish; } diff --git a/module/move/willbe/src/entity/table.rs b/module/move/willbe/src/entity/table.rs index 564c1f6d43..38e789686c 100644 --- a/module/move/willbe/src/entity/table.rs +++ b/module/move/willbe/src/entity/table.rs @@ -9,14 +9,14 @@ mod private inner : prettytable::Table, } - impl Display for Table + impl Display for Table { - fn fmt( &self, f : &mut Formatter< '_ > ) -> std::fmt::Result + fn fmt( &self, f : &mut Formatter< '_ > ) -> std::fmt::Result { writeln!( f, "{}", self.inner.to_string() ) } } - + impl Table { /// Create an empty table. @@ -28,7 +28,7 @@ mod private } } } - + impl Table { /// Set the optional header. @@ -36,17 +36,17 @@ mod private { self.inner.set_titles( row.inner ); } - + /// Append a row in the table. pub fn add_row(&mut self, row : Row ) { self.inner.add_row( row.inner ); } } - + impl Default for Table { - fn default() -> Self + fn default() -> Self { let mut table = Self::new(); let format = default_format(); @@ -69,17 +69,17 @@ mod private .build(); format } - + /// Represent a table row made of cells. #[ derive( Debug ) ] pub struct Row { inner : prettytable::Row, } - + impl Row { - + /// Append a cell at the end of the row. pub fn add_cell( &mut self, title : &str ) { @@ -88,7 +88,7 @@ mod private self.inner.add_cell( prettytable::Cell::new( title ) ); } } - + impl Row { /// Create an row of length size, with empty strings stored. @@ -104,6 +104,6 @@ mod private crate::mod_interface! { - protected use Table; - protected use Row; + own use Table; + own use Row; } \ No newline at end of file diff --git a/module/move/willbe/src/entity/test.rs b/module/move/willbe/src/entity/test.rs index c58c78bafb..938c5ca415 100644 --- a/module/move/willbe/src/entity/test.rs +++ b/module/move/willbe/src/entity/test.rs @@ -778,14 +778,14 @@ mod private crate::mod_interface! { - protected use SingleTestOptions; - protected use TestVariant; - protected use _run; - - protected use TestPlan; - protected use TestOptions; - protected use TestReport; - protected use TestsReport; - protected use run; - protected use tests_run; + own use SingleTestOptions; + own use TestVariant; + own use _run; + + own use TestPlan; + own use TestOptions; + own use TestReport; + own use TestsReport; + own use run; + own use tests_run; } diff --git a/module/move/willbe/src/entity/version.rs b/module/move/willbe/src/entity/version.rs index 8e05fa1efa..0722b8a59c 100644 --- a/module/move/willbe/src/entity/version.rs +++ b/module/move/willbe/src/entity/version.rs @@ -374,18 +374,18 @@ crate::mod_interface! exposed use Version; /// Report for bump operation. - protected use BumpReport; + own use BumpReport; /// Options for version bumping. - protected use BumpOptions; + own use BumpOptions; /// Report about a changing version with list of files that was changed. - protected use ExtendedBumpReport; + own use ExtendedBumpReport; /// Bumps the version of a package and its dependencies. - protected use manifest_bump; + own use manifest_bump; /// Bump version. - protected use bump; + own use bump; /// Reverts the version of a package. - protected use revert; + own use revert; } diff --git a/module/move/willbe/src/entity/workspace_graph.rs b/module/move/willbe/src/entity/workspace_graph.rs index 01e17d7846..c0cc7c29c7 100644 --- a/module/move/willbe/src/entity/workspace_graph.rs +++ b/module/move/willbe/src/entity/workspace_graph.rs @@ -32,7 +32,7 @@ pub( crate ) mod private crate::mod_interface! { - protected use graph; + own use graph; } // xxx : move \ No newline at end of file diff --git a/module/move/willbe/src/entity/workspace_md_extension.rs b/module/move/willbe/src/entity/workspace_md_extension.rs index bbc5f06da9..b971c26d97 100644 --- a/module/move/willbe/src/entity/workspace_md_extension.rs +++ b/module/move/willbe/src/entity/workspace_md_extension.rs @@ -2,7 +2,7 @@ pub( crate ) mod private { use crate::*; - + /// Md's extension for workspace pub trait WorkspaceMdExtension { @@ -21,7 +21,7 @@ pub( crate ) mod private impl WorkspaceMdExtension for Workspace { - fn discord_url( &self ) -> Option< String > + fn discord_url( &self ) -> Option< String > { self .metadata @@ -30,7 +30,7 @@ pub( crate ) mod private .map( | url | url.to_string() ) } - fn master_branch( &self ) -> Option< String > + fn master_branch( &self ) -> Option< String > { self .metadata @@ -40,7 +40,7 @@ pub( crate ) mod private .map( | b | b.to_string() ) } - fn repository_url( &self ) -> Option< String > + fn repository_url( &self ) -> Option< String > { self .metadata @@ -50,7 +50,7 @@ pub( crate ) mod private .map( | b | b.to_string() ) } - fn workspace_name( &self ) -> Option< String > + fn workspace_name( &self ) -> Option< String > { self .metadata @@ -66,5 +66,5 @@ pub( crate ) mod private crate::mod_interface! { - protected use WorkspaceMdExtension; + own use WorkspaceMdExtension; } diff --git a/module/move/willbe/src/lib.rs b/module/move/willbe/src/lib.rs index 69d0e6f1f9..df3c1c5c4b 100644 --- a/module/move/willbe/src/lib.rs +++ b/module/move/willbe/src/lib.rs @@ -47,7 +47,7 @@ pub( crate ) mod private mod_interface! { - protected use run; + own use run; /// Entities of which spaces consists of. layer entity; diff --git a/module/move/willbe/src/tool/cargo.rs b/module/move/willbe/src/tool/cargo.rs index 7b3668acbf..71590ecd45 100644 --- a/module/move/willbe/src/tool/cargo.rs +++ b/module/move/willbe/src/tool/cargo.rs @@ -211,10 +211,10 @@ mod private crate::mod_interface! { - protected use pack; - protected use publish; + own use pack; + own use publish; - protected use PublishOptions; - protected use PackOptions; + own use PublishOptions; + own use PackOptions; } \ No newline at end of file diff --git a/module/move/willbe/src/tool/collection.rs b/module/move/willbe/src/tool/collection.rs index 42254b9618..cf1cf710c0 100644 --- a/module/move/willbe/src/tool/collection.rs +++ b/module/move/willbe/src/tool/collection.rs @@ -7,6 +7,6 @@ crate::mod_interface! { use ::collection_tools; - protected use ::collection_tools::protected::*; + own use ::collection_tools::own::*; } diff --git a/module/move/willbe/src/tool/error.rs b/module/move/willbe/src/tool/error.rs index 1572a2ca13..2647ee56ff 100644 --- a/module/move/willbe/src/tool/error.rs +++ b/module/move/willbe/src/tool/error.rs @@ -3,7 +3,7 @@ pub( crate ) mod private { use crate::tool::*; - use ::error_tools::protected::*; + use ::error_tools::own::*; } @@ -12,7 +12,7 @@ crate::mod_interface! // #![ debug ] use ::error_tools; - protected use ::error_tools::protected::*; + own use ::error_tools::own::*; // exposed use ErrWith; // exposed use ResultWithReport; diff --git a/module/move/willbe/src/tool/files.rs b/module/move/willbe/src/tool/files.rs index bb684e8bbe..a8dc67350b 100644 --- a/module/move/willbe/src/tool/files.rs +++ b/module/move/willbe/src/tool/files.rs @@ -37,6 +37,6 @@ pub( crate ) mod private crate::mod_interface! { - protected use valid_is; + own use valid_is; orphan use find; } diff --git a/module/move/willbe/src/tool/git.rs b/module/move/willbe/src/tool/git.rs index 5f9772d374..828e4d3c64 100644 --- a/module/move/willbe/src/tool/git.rs +++ b/module/move/willbe/src/tool/git.rs @@ -240,9 +240,9 @@ mod private crate::mod_interface! { - protected use add; - protected use commit; - protected use push; - protected use reset; - protected use ls_remote_url; + own use add; + own use commit; + own use push; + own use reset; + own use ls_remote_url; } diff --git a/module/move/willbe/src/tool/graph.rs b/module/move/willbe/src/tool/graph.rs index d3068f318e..b322b76025 100644 --- a/module/move/willbe/src/tool/graph.rs +++ b/module/move/willbe/src/tool/graph.rs @@ -317,9 +317,9 @@ pub( crate ) mod private crate::mod_interface! { - protected use construct; - protected use toposort; - protected use topological_sort_with_grouping; - protected use subgraph; - protected use remove_not_required_to_publish; + own use construct; + own use toposort; + own use topological_sort_with_grouping; + own use subgraph; + own use remove_not_required_to_publish; } diff --git a/module/move/willbe/src/tool/iter.rs b/module/move/willbe/src/tool/iter.rs index 2c6e19f54a..b9cd5f3279 100644 --- a/module/move/willbe/src/tool/iter.rs +++ b/module/move/willbe/src/tool/iter.rs @@ -8,5 +8,5 @@ pub( crate ) mod private crate::mod_interface! { use ::iter_tools; - protected use ::iter_tools::protected::*; + own use ::iter_tools::own::*; } diff --git a/module/move/willbe/src/tool/macros.rs b/module/move/willbe/src/tool/macros.rs index 1a59faa9f7..155ff49386 100644 --- a/module/move/willbe/src/tool/macros.rs +++ b/module/move/willbe/src/tool/macros.rs @@ -7,6 +7,6 @@ crate::mod_interface! { use ::macro_tools; - protected use ::macro_tools::protected::*; + own use ::macro_tools::own::*; } diff --git a/module/move/willbe/src/tool/path.rs b/module/move/willbe/src/tool/path.rs index 03d2e08276..b2abea76e1 100644 --- a/module/move/willbe/src/tool/path.rs +++ b/module/move/willbe/src/tool/path.rs @@ -7,6 +7,6 @@ crate::mod_interface! { use ::proper_path_tools; - protected use ::proper_path_tools::protected::*; + own use ::proper_path_tools::own::*; } diff --git a/module/move/willbe/src/tool/query.rs b/module/move/willbe/src/tool/query.rs index cdf1989078..3528d887ae 100644 --- a/module/move/willbe/src/tool/query.rs +++ b/module/move/willbe/src/tool/query.rs @@ -261,7 +261,7 @@ mod private crate::mod_interface! { - protected use parse; - protected use Value; - protected use ParseResult; + own use parse; + own use Value; + own use ParseResult; } diff --git a/module/move/willbe/src/tool/repository.rs b/module/move/willbe/src/tool/repository.rs index 5cb5b61623..9ddb691f03 100644 --- a/module/move/willbe/src/tool/repository.rs +++ b/module/move/willbe/src/tool/repository.rs @@ -57,5 +57,5 @@ pub( crate ) mod private crate::mod_interface! { - protected use readme_path; + own use readme_path; } diff --git a/module/move/willbe/src/tool/url.rs b/module/move/willbe/src/tool/url.rs index f527589579..f1ab5b8f9c 100644 --- a/module/move/willbe/src/tool/url.rs +++ b/module/move/willbe/src/tool/url.rs @@ -46,6 +46,6 @@ mod private crate::mod_interface! { - protected use repo_url_extract; - protected use git_info_extract; + own use repo_url_extract; + own use git_info_extract; } diff --git a/module/move/willbe/src/wtools.rs b/module/move/willbe/src/wtools.rs index 1ff22e50ab..1735805c0b 100644 --- a/module/move/willbe/src/wtools.rs +++ b/module/move/willbe/src/wtools.rs @@ -21,8 +21,8 @@ // /// Collection of function and structures to manipulate paths. // pub mod path_tools // { -// // pub use proper_path_tools::protected::*; -// // pub use proper_path_tools::protected::path; -// // zzz : make use proper_path_tools::protected::path working -// pub use proper_path::protected as path; +// // pub use proper_path_tools::own::*; +// // pub use proper_path_tools::own::path; +// // zzz : make use proper_path_tools::own::path working +// pub use proper_path::own as path; // } diff --git a/module/move/wplot/src/plot/abs/change.rs b/module/move/wplot/src/plot/abs/change.rs index 3d05cbcdbf..48c1e5cfb4 100644 --- a/module/move/wplot/src/plot/abs/change.rs +++ b/module/move/wplot/src/plot/abs/change.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use core::fmt; use crate::abs::changer::private::ChangerInterface; diff --git a/module/move/wplot/src/plot/abs/changer.rs b/module/move/wplot/src/plot/abs/changer.rs index 8af8e00f03..1a5f9fdaf0 100644 --- a/module/move/wplot/src/plot/abs/changer.rs +++ b/module/move/wplot/src/plot/abs/changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use core::fmt; use crate::abs::change::private::ChangeInterface; diff --git a/module/move/wplot/src/plot/abs/context.rs b/module/move/wplot/src/plot/abs/context.rs index 4c2716661d..3ad4970206 100644 --- a/module/move/wplot/src/plot/abs/context.rs +++ b/module/move/wplot/src/plot/abs/context.rs @@ -2,7 +2,7 @@ #[ cfg( not( feature = "no_std" ) ) ] pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use core::fmt; // use wtools::From_0; diff --git a/module/move/wplot/src/plot/abs/identity.rs b/module/move/wplot/src/plot/abs/identity.rs index 4a181d63fe..1ec0802a79 100644 --- a/module/move/wplot/src/plot/abs/identity.rs +++ b/module/move/wplot/src/plot/abs/identity.rs @@ -2,7 +2,7 @@ #[ cfg( not( feature = "no_std" ) ) ] pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use once_cell::sync::Lazy; use std::sync::Mutex; use core::{hash::Hash, fmt}; diff --git a/module/move/wplot/src/plot/abs/registry.rs b/module/move/wplot/src/plot/abs/registry.rs index af48a2062d..8844149feb 100644 --- a/module/move/wplot/src/plot/abs/registry.rs +++ b/module/move/wplot/src/plot/abs/registry.rs @@ -2,7 +2,7 @@ #[ cfg( not( feature = "no_std" ) ) ] pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; // use crate::abs::*; use once_cell::sync::Lazy; // use wtools::from; diff --git a/module/move/wplot/src/plot/color.rs b/module/move/wplot/src/plot/color.rs index 9ded69bdfc..6fd07c0bcc 100644 --- a/module/move/wplot/src/plot/color.rs +++ b/module/move/wplot/src/plot/color.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use core::fmt; use num_traits::{ Zero }; /* zzz : consider as submodule for wtools */ @@ -93,7 +93,7 @@ pub( crate ) mod private ::meta_tools::mod_interface! { - protected use ::rgb::*; + own use ::rgb::*; #[ cfg( not( feature = "no_std" ) ) ] exposed use Rgba; diff --git a/module/move/wplot/src/plot/sys/context.rs b/module/move/wplot/src/plot/sys/context.rs index 8a7ed41bc9..904b0f03e3 100644 --- a/module/move/wplot/src/plot/sys/context.rs +++ b/module/move/wplot/src/plot/sys/context.rs @@ -2,7 +2,7 @@ pub( crate ) mod private { use crate::abs::registry::private::Registry; - use crate::protected::*; + use crate::own::*; // use crate::abs::*; use once_cell::sync::Lazy; @@ -90,6 +90,6 @@ pub( crate ) mod private crate::mod_interface! { - protected use { REGISTRY, current }; + own use { REGISTRY, current }; exposed use { Context, current as context }; } diff --git a/module/move/wplot/src/plot/sys/context_changer.rs b/module/move/wplot/src/plot/sys/context_changer.rs index 202be58c58..48f1784ff7 100644 --- a/module/move/wplot/src/plot/sys/context_changer.rs +++ b/module/move/wplot/src/plot/sys/context_changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use core::fmt; use crate::{abs::{identity::private::{Id, HasIdInterface}, change::private::ChangeInterface, changer::private::ChangerInterface}, StrokeBrushChanger, sys::drawing::changer::private::DrawChanger}; diff --git a/module/move/wplot/src/plot/sys/drawing.rs b/module/move/wplot/src/plot/sys/drawing.rs index 0c997329c8..4c6df7c8c5 100644 --- a/module/move/wplot/src/plot/sys/drawing.rs +++ b/module/move/wplot/src/plot/sys/drawing.rs @@ -3,7 +3,7 @@ pub(crate) mod changer; /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use crate::abs::identity::private::{Id, HasIdInterface}; diff --git a/module/move/wplot/src/plot/sys/drawing/change_new.rs b/module/move/wplot/src/plot/sys/drawing/change_new.rs index 44d47fd981..af0ae7f483 100644 --- a/module/move/wplot/src/plot/sys/drawing/change_new.rs +++ b/module/move/wplot/src/plot/sys/drawing/change_new.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use crate::abs::{change::private::ChangeInterface, identity::private::Id}; /// ChangerInterface of brush stroke. diff --git a/module/move/wplot/src/plot/sys/drawing/changer.rs b/module/move/wplot/src/plot/sys/drawing/changer.rs index 5ddb3e5f3a..2540cc9bb4 100644 --- a/module/move/wplot/src/plot/sys/drawing/changer.rs +++ b/module/move/wplot/src/plot/sys/drawing/changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use crate::{abs::{identity::private::{Id, HasIdInterface}, changer::private::ChangerInterface}, ContextChanger, sys::drawing::{rect_changer::private::RectChanger, change_new::private::DrawingChangeNew}}; use crate::abs::change::private::ChangeInterface; diff --git a/module/move/wplot/src/plot/sys/drawing/command.rs b/module/move/wplot/src/plot/sys/drawing/command.rs index 8108cbcf17..e10b140493 100644 --- a/module/move/wplot/src/plot/sys/drawing/command.rs +++ b/module/move/wplot/src/plot/sys/drawing/command.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; // /// Interface of command to draw something. // pub trait DrawCommandInterface diff --git a/module/move/wplot/src/plot/sys/drawing/queue.rs b/module/move/wplot/src/plot/sys/drawing/queue.rs index 6b9ba83b3c..06367a519a 100644 --- a/module/move/wplot/src/plot/sys/drawing/queue.rs +++ b/module/move/wplot/src/plot/sys/drawing/queue.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; // use crate::drawing_changer::*; // // /// Queue of draw commands. diff --git a/module/move/wplot/src/plot/sys/drawing/rect_change_new.rs b/module/move/wplot/src/plot/sys/drawing/rect_change_new.rs index c7af894d1c..7d088c86de 100644 --- a/module/move/wplot/src/plot/sys/drawing/rect_change_new.rs +++ b/module/move/wplot/src/plot/sys/drawing/rect_change_new.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use crate::abs::{identity::private::Id, change::private::ChangeInterface}; /// Command to draw rectangle. diff --git a/module/move/wplot/src/plot/sys/drawing/rect_change_region.rs b/module/move/wplot/src/plot/sys/drawing/rect_change_region.rs index aa70c4947f..3035a71215 100644 --- a/module/move/wplot/src/plot/sys/drawing/rect_change_region.rs +++ b/module/move/wplot/src/plot/sys/drawing/rect_change_region.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; use crate::abs::change::private::ChangeInterface; use crate::abs::identity::private::Id; diff --git a/module/move/wplot/src/plot/sys/drawing/rect_changer.rs b/module/move/wplot/src/plot/sys/drawing/rect_changer.rs index f3ac913f77..5f8d13e3a3 100644 --- a/module/move/wplot/src/plot/sys/drawing/rect_changer.rs +++ b/module/move/wplot/src/plot/sys/drawing/rect_changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; use crate::abs::identity::private::Id; use crate::sys::context_changer::private::ContextChanger; use crate::sys::drawing::changer::private::DrawChanger; diff --git a/module/move/wplot/src/plot/sys/stroke_brush.rs b/module/move/wplot/src/plot/sys/stroke_brush.rs index 8cfe8c0b10..295b3be13d 100644 --- a/module/move/wplot/src/plot/sys/stroke_brush.rs +++ b/module/move/wplot/src/plot/sys/stroke_brush.rs @@ -4,7 +4,7 @@ mod change_new; /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; use crate::abs::identity::private::Id; use crate::abs::identity::private::HasIdInterface; diff --git a/module/move/wplot/src/plot/sys/stroke_brush/change_color.rs b/module/move/wplot/src/plot/sys/stroke_brush/change_color.rs index 98d55ffbaa..42a2e6f486 100644 --- a/module/move/wplot/src/plot/sys/stroke_brush/change_color.rs +++ b/module/move/wplot/src/plot/sys/stroke_brush/change_color.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/wplot/src/plot/sys/stroke_brush/change_new.rs b/module/move/wplot/src/plot/sys/stroke_brush/change_new.rs index 1a1160de67..43caacdae9 100644 --- a/module/move/wplot/src/plot/sys/stroke_brush/change_new.rs +++ b/module/move/wplot/src/plot/sys/stroke_brush/change_new.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use crate::abs::{identity::private::Id, change::private::ChangeInterface}; diff --git a/module/move/wplot/src/plot/sys/stroke_brush/change_width.rs b/module/move/wplot/src/plot/sys/stroke_brush/change_width.rs index 1a6fa4aeed..b832e4b38d 100644 --- a/module/move/wplot/src/plot/sys/stroke_brush/change_width.rs +++ b/module/move/wplot/src/plot/sys/stroke_brush/change_width.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - // use crate::protected::*; + // use crate::own::*; use crate::abs::{change::private::ChangeInterface, identity::private::Id}; diff --git a/module/move/wplot/src/plot/sys/stroke_brush/changer.rs b/module/move/wplot/src/plot/sys/stroke_brush/changer.rs index 33ef3969e1..7195588297 100644 --- a/module/move/wplot/src/plot/sys/stroke_brush/changer.rs +++ b/module/move/wplot/src/plot/sys/stroke_brush/changer.rs @@ -1,7 +1,7 @@ /// Internal namespace. pub( crate ) mod private { - use crate::protected::*; + use crate::own::*; /// ChangerInterface of brush stroke. #[ allow( dead_code ) ] diff --git a/module/move/wplot/src/plot/wplot_lib.rs b/module/move/wplot/src/plot/wplot_lib.rs index c33e8463dd..8adbd6a246 100644 --- a/module/move/wplot/src/plot/wplot_lib.rs +++ b/module/move/wplot/src/plot/wplot_lib.rs @@ -46,7 +46,7 @@ pub mod dependency // layer sys; use super::math; - protected use ::wmath as math; + own use ::wmath as math; protected( crate ) use ::wtools::prelude::*; } diff --git a/module/postponed/type_constructor/src/lib.rs b/module/postponed/type_constructor/src/lib.rs index 811db6ec80..d850d048e5 100644 --- a/module/postponed/type_constructor/src/lib.rs +++ b/module/postponed/type_constructor/src/lib.rs @@ -54,17 +54,18 @@ pub mod dependency #[ doc( inline ) ] #[ allow( unused_imports ) ] #[ cfg( feature = "enabled" ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ cfg( feature = "enabled" ) ] #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; - pub use super::type_constuctor::protected::*; + pub use orphan::*; + pub use super::type_constuctor::own::*; } /// Shared with parent namespace of the module @@ -72,9 +73,10 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; pub use super::type_constuctor::orphan::*; } @@ -86,7 +88,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::type_constuctor::exposed::*; @@ -97,5 +99,6 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; pub use super::type_constuctor::prelude::*; } diff --git a/module/postponed/type_constructor/src/type_constuctor/enumerable.rs b/module/postponed/type_constructor/src/type_constuctor/enumerable.rs index 22642dcf79..2530b36b46 100644 --- a/module/postponed/type_constructor/src/type_constuctor/enumerable.rs +++ b/module/postponed/type_constructor/src/type_constuctor/enumerable.rs @@ -229,26 +229,28 @@ pub( crate ) mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -258,10 +260,10 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { EnumerableIteratorCopy, EnumerableIteratorRef, @@ -274,9 +276,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Enumerable, EnumerableMut, diff --git a/module/postponed/type_constructor/src/type_constuctor/helper.rs b/module/postponed/type_constructor/src/type_constuctor/helper.rs index 3ab0670b39..45a66d4f8b 100644 --- a/module/postponed/type_constructor/src/type_constuctor/helper.rs +++ b/module/postponed/type_constructor/src/type_constuctor/helper.rs @@ -37,26 +37,28 @@ pub( crate ) mod private pub use _if_make; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -66,7 +68,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -74,9 +76,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { _if_make, }; diff --git a/module/postponed/type_constructor/src/type_constuctor/make.rs b/module/postponed/type_constructor/src/type_constuctor/make.rs index 17ad9add6b..f10ff21b96 100644 --- a/module/postponed/type_constructor/src/type_constuctor/make.rs +++ b/module/postponed/type_constructor/src/type_constuctor/make.rs @@ -234,24 +234,24 @@ // pub use make; // } // -// /// Protected namespace of the module. -// pub mod protected +// /// Own namespace of the module. +// pub mod own // { // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use super::orphan::*; +// pub use orphan::*; // } // // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use protected::*; +// pub use own::*; // // /// Orphan namespace of the module. // pub mod orphan // { // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use super::exposed::*; +// pub use exposed::*; // } // // /// Exposed namespace of the module. @@ -259,7 +259,7 @@ // { // #[ doc( inline ) ] // #[ allow( unused_imports ) ] -// pub use super::prelude::*; +// pub use prelude::*; // } // // #[ doc( inline ) ] @@ -272,7 +272,7 @@ // #[ cfg( feature = "make" ) ] // #[ doc( inline ) ] // // #[ allow( unused_imports ) ] -// pub use super::private:: +// pub use private:: // { // // From_0, diff --git a/module/postponed/type_constructor/src/type_constuctor/many.rs b/module/postponed/type_constructor/src/type_constuctor/many.rs index 1ea69a05c6..b40936c44a 100644 --- a/module/postponed/type_constructor/src/type_constuctor/many.rs +++ b/module/postponed/type_constructor/src/type_constuctor/many.rs @@ -542,26 +542,28 @@ pub( crate ) mod private pub use _many; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -571,10 +573,10 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { _many, _vec, @@ -587,9 +589,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Many, }; diff --git a/module/postponed/type_constructor/src/type_constuctor/mod.rs b/module/postponed/type_constructor/src/type_constuctor/mod.rs index 95012e1360..ce54e5f7fe 100644 --- a/module/postponed/type_constructor/src/type_constuctor/mod.rs +++ b/module/postponed/type_constructor/src/type_constuctor/mod.rs @@ -44,13 +44,14 @@ pub mod enumerable; #[ cfg( feature = "make" ) ] pub mod make; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::many::orphan::*; @@ -85,15 +86,16 @@ pub mod protected #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -103,7 +105,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::many::exposed::*; @@ -140,6 +142,7 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] pub use super::many::prelude::*; diff --git a/module/postponed/type_constructor/src/type_constuctor/no_many.rs b/module/postponed/type_constructor/src/type_constuctor/no_many.rs index d40ec51467..c1b7584ce6 100644 --- a/module/postponed/type_constructor/src/type_constuctor/no_many.rs +++ b/module/postponed/type_constructor/src/type_constuctor/no_many.rs @@ -28,26 +28,28 @@ pub( crate ) mod private pub use _many; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -57,11 +59,11 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { _many, }; @@ -73,4 +75,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/postponed/type_constructor/src/type_constuctor/pair.rs b/module/postponed/type_constructor/src/type_constuctor/pair.rs index 16fa37943f..a29125867d 100644 --- a/module/postponed/type_constructor/src/type_constuctor/pair.rs +++ b/module/postponed/type_constructor/src/type_constuctor/pair.rs @@ -195,26 +195,28 @@ pub( crate ) mod private // pub use type_constructor_meta; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -224,10 +226,10 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { _pair, }; @@ -238,9 +240,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Pair, HomoPair, diff --git a/module/postponed/type_constructor/src/type_constuctor/single.rs b/module/postponed/type_constructor/src/type_constuctor/single.rs index 281feb3c34..11068a54e3 100644 --- a/module/postponed/type_constructor/src/type_constuctor/single.rs +++ b/module/postponed/type_constructor/src/type_constuctor/single.rs @@ -530,26 +530,28 @@ pub( crate ) mod private pub use _single; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -559,10 +561,10 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { _single, }; @@ -573,9 +575,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { Single, }; diff --git a/module/postponed/type_constructor/src/type_constuctor/traits.rs b/module/postponed/type_constructor/src/type_constuctor/traits.rs index 1a5087c18f..fb5ec2a8b7 100644 --- a/module/postponed/type_constructor/src/type_constuctor/traits.rs +++ b/module/postponed/type_constructor/src/type_constuctor/traits.rs @@ -54,26 +54,28 @@ pub( crate ) mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -83,7 +85,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -91,9 +93,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { CloneAsTuple, CloneAsArray, diff --git a/module/postponed/type_constructor/src/type_constuctor/types.rs b/module/postponed/type_constructor/src/type_constuctor/types.rs index 65348d9b50..ba7f42ea6f 100644 --- a/module/postponed/type_constructor/src/type_constuctor/types.rs +++ b/module/postponed/type_constructor/src/type_constuctor/types.rs @@ -810,26 +810,28 @@ pub( crate ) mod private pub use types; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -839,7 +841,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -847,9 +849,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { types, }; diff --git a/module/postponed/type_constructor/src/type_constuctor/vectorized_from.rs b/module/postponed/type_constructor/src/type_constuctor/vectorized_from.rs index c13d6413ec..40871b5f4c 100644 --- a/module/postponed/type_constructor/src/type_constuctor/vectorized_from.rs +++ b/module/postponed/type_constructor/src/type_constuctor/vectorized_from.rs @@ -138,26 +138,28 @@ pub( crate ) mod private } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; } #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; /// Orphan namespace of the module. #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; } /// Exposed namespace of the module. @@ -167,7 +169,7 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; } @@ -175,9 +177,10 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { VectorizedFrom, VectorizedInto, diff --git a/module/step/meta/src/meta/_template_procedural_macro/front/lib.rs b/module/step/meta/src/meta/_template_procedural_macro/front/lib.rs index f62b457850..15e73ee498 100644 --- a/module/step/meta/src/meta/_template_procedural_macro/front/lib.rs +++ b/module/step/meta/src/meta/_template_procedural_macro/front/lib.rs @@ -23,23 +23,24 @@ pub mod dependency pub use procedural_macro_meta; } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::exposed::*; + use super::*; + pub use exposed::*; pub use procedural_macro_runtime as runtime; pub use procedural_macro_meta as meta; } -pub use protected::*; +pub use own::*; /// Exposed namespace of the module. #[ allow( unused_imports ) ] pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; pub use meta::*; } @@ -47,4 +48,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/step/meta/src/meta/_template_procedural_macro/runtime/lib.rs b/module/step/meta/src/meta/_template_procedural_macro/runtime/lib.rs index 0d3330a7a6..7c78810f2a 100644 --- a/module/step/meta/src/meta/_template_procedural_macro/runtime/lib.rs +++ b/module/step/meta/src/meta/_template_procedural_macro/runtime/lib.rs @@ -18,25 +18,27 @@ pub mod dependency { } -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { - pub use super::exposed::*; + use super::*; + pub use exposed::*; } -pub use protected::*; +pub use own::*; /// Exposed namespace of the module. #[ allow( unused_imports ) ] pub mod exposed { use super::*; - pub use super::prelude::*; + pub use prelude::*; } /// Prelude to use essentials: `use my_module::prelude::*`. #[ allow( unused_imports ) ] pub mod prelude { + use super::*; } diff --git a/module/template/layer/layer.rs b/module/template/layer/layer.rs index d81824858f..0d6887fa34 100644 --- a/module/template/layer/layer.rs +++ b/module/template/layer/layer.rs @@ -9,18 +9,19 @@ pub( crate ) mod private #[ doc( inline ) ] #[ allow( unused_imports ) ] -pub use protected::*; +pub use own::*; -/// Protected namespace of the module. +/// Own namespace of the module. #[ allow( unused_imports ) ] -pub mod protected +pub mod own { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::orphan::*; + pub use orphan::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { // ... list all items of private which should be visible outside }; @@ -30,12 +31,13 @@ pub mod protected #[ allow( unused_imports ) ] pub mod orphan { + use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::exposed::*; + pub use exposed::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -47,10 +49,10 @@ pub mod exposed use super::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::prelude::*; + pub use prelude::*; #[ doc( inline ) ] #[ allow( unused_imports ) ] - pub use super::private:: + pub use private:: { }; } @@ -59,4 +61,5 @@ pub mod exposed #[ allow( unused_imports ) ] pub mod prelude { + use super::*; }