Merge pull request #1612 from Wandalen/merging4

Merging4

Author: Wandalen

.github/workflows/module_benchkit_push.yml

@@ -21,4 +21,4 @@ jobs :
       manifest_path : 'module/move/benchkit/Cargo.toml'
       module_name : 'benchkit'
       commit_message : ${{ github.event.head_commit.message }}
-      commiter_username:  ${{ github.event.head_commit.committer.username }}
+      commiter_username:  ${{ github.event.head_commit.committer.username }}

Cargo.toml

@@ -122,14 +122,14 @@ version = "~0.1.4"
 path = "module/alias/std_x"
 
 [workspace.dependencies.unilang_parser]
-version = "~0.11.0"
+version = "~0.13.0"
 path = "module/move/unilang_parser" # Point to original unilang_parser
 
 
 ## data_type
 
 [workspace.dependencies.data_type]
-version = "~0.15.0"
+version = "~0.17.0"
 path = "module/core/data_type"
 default-features = false
 
@@ -147,7 +147,7 @@ version = "~0.1.0"
 path = "module/core/type_constructor_derive_pair_meta"
 
 [workspace.dependencies.interval_adapter]
-version = "~0.36.0"
+version = "~0.38.0"
 path = "module/core/interval_adapter"
 default-features = false
 # features = [ "enabled" ]
@@ -159,21 +159,21 @@ default-features = false
 # features = [ "enabled" ]
 
 [workspace.dependencies.collection_tools]
-version = "~0.25.0"
+version = "~0.27.0"
 path = "module/core/collection_tools"
 default-features = false
 
 
 ## derive
 
 [workspace.dependencies.derive_tools]
-version = "~0.47.0"
+version = "~0.49.0"
 path = "module/core/derive_tools"
 default-features = false
 # features = [ "enabled" ]
 
 [workspace.dependencies.derive_tools_meta]
-version = "~0.46.0"
+version = "~0.48.0"
 path = "module/core/derive_tools_meta"
 default-features = false
 # features = [ "enabled" ]
@@ -215,30 +215,30 @@ path = "module/alias/fundamental_data_type"
 default-features = false
 
 [workspace.dependencies.variadic_from]
-version = "~0.41.0"
+version = "~0.43.0"
 path = "module/core/variadic_from"
 default-features = false
 # features = [ "enabled" ]
 
 [workspace.dependencies.variadic_from_meta]
-version = "~0.12.0"
+version = "~0.14.0"
 path = "module/core/variadic_from_meta"
 default-features = false
 # features = [ "enabled" ]
 
 [workspace.dependencies.clone_dyn]
-version = "~0.44.0"
+version = "~0.46.0"
 path = "module/core/clone_dyn"
 default-features = false
 # features = [ "enabled" ]
 
 [workspace.dependencies.clone_dyn_meta]
-version = "~0.41.0"
+version = "~0.43.0"
 path = "module/core/clone_dyn_meta"
 # features = [ "enabled" ]
 
 [workspace.dependencies.clone_dyn_types]
-version = "~0.38.0"
+version = "~0.40.0"
 path = "module/core/clone_dyn_types"
 default-features = false
 # features = [ "enabled" ]
@@ -263,7 +263,7 @@ default-features = false
 ## iter
 
 [workspace.dependencies.iter_tools]
-version = "~0.37.0"
+version = "~0.39.0"
 path = "module/core/iter_tools"
 default-features = false
 
@@ -281,32 +281,32 @@ path = "module/core/for_each"
 default-features = false
 
 [workspace.dependencies.former]
-version = "~2.28.0"
+version = "~2.30.0"
 path = "module/core/former"
 default-features = false
 
 [workspace.dependencies.former_meta]
-version = "~2.27.0"
+version = "~2.29.0"
 path = "module/core/former_meta"
 default-features = false
 
 [workspace.dependencies.former_types]
-version = "~2.24.0"
+version = "~2.26.0"
 path = "module/core/former_types"
 default-features = false
 
 [workspace.dependencies.component_model]
-version = "~0.6.0"
+version = "~0.8.0"
 path = "module/core/component_model"
 default-features = false
 
 [workspace.dependencies.component_model_meta]
-version = "~0.6.0"
+version = "~0.8.0"
 path = "module/core/component_model_meta"
 default-features = false
 
 [workspace.dependencies.component_model_types]
-version = "~0.11.0"
+version = "~0.13.0"
 path = "module/core/component_model_types"
 default-features = false
 
@@ -320,12 +320,12 @@ version = "~0.13.0"
 path = "module/core/impls_index_meta"
 
 [workspace.dependencies.mod_interface]
-version = "~0.44.0"
+version = "~0.46.0"
 path = "module/core/mod_interface"
 default-features = false
 
 [workspace.dependencies.mod_interface_meta]
-version = "~0.42.0"
+version = "~0.44.0"
 path = "module/core/mod_interface_meta"
 default-features = false
 
@@ -351,7 +351,7 @@ default-features = false
 ## macro tools
 
 [workspace.dependencies.macro_tools]
-version = "~0.67.0"
+version = "~0.69.0"
 path = "module/core/macro_tools"
 default-features = false
 
@@ -410,7 +410,7 @@ default-features = false
 ## error
 
 [workspace.dependencies.error_tools]
-version = "~0.32.0"
+version = "~0.34.0"
 path = "module/core/error_tools"
 default-features = false
 
@@ -422,12 +422,12 @@ path = "module/alias/werror"
 ## string tools
 
 [workspace.dependencies.strs_tools]
-version = "~0.29.0"
+version = "~0.31.0"
 path = "module/core/strs_tools"
 default-features = false
 
 [workspace.dependencies.strs_tools_meta]
-version = "~0.6.0"
+version = "~0.8.0"
 path = "module/core/strs_tools_meta"
 default-features = false
 
@@ -449,7 +449,7 @@ path = "module/alias/file_tools"
 default-features = false
 
 [workspace.dependencies.pth]
-version = "~0.25.0"
+version = "~0.27.0"
 path = "module/core/pth"
 default-features = false
 
@@ -462,7 +462,7 @@ default-features = false
 ## process tools
 
 [workspace.dependencies.process_tools]
-version = "~0.15.0"
+version = "~0.17.0"
 path = "module/core/process_tools"
 default-features = false
 
@@ -522,7 +522,7 @@ default-features = false
 ## ca
 
 [workspace.dependencies.wca]
-version = "~0.28.0"
+version = "~0.30.0"
 path = "module/move/wca"
 
 ## censor
@@ -535,7 +535,7 @@ path = "module/move/wcensor"
 ## willbe
 
 [workspace.dependencies.willbe]
-version = "~0.24.0"
+version = "~0.26.0"
 path = "module/move/willbe"
 
 
@@ -574,7 +574,7 @@ version = "~0.6.0"
 path = "module/move/deterministic_rand"
 
 [workspace.dependencies.crates_tools]
-version = "~0.17.0"
+version = "~0.19.0"
 path = "module/move/crates_tools"
 
 [workspace.dependencies.assistant]
@@ -586,8 +586,8 @@ version = "~0.2.0"
 path = "module/move/llm_tools"
 
 [workspace.dependencies.benchkit]
-version = "~0.5.0"
-path = "module/move/benchkit"
+version = "~0.11.0"
+path = "module/core/benchkit"
 
 ## steps
 
@@ -770,7 +770,7 @@ version = "0.4.34"
 version = "0.5.1"
 
 [workspace.dependencies.workspace_tools]
-version = "~0.2.0"
+version = "~0.5.0"
 path = "module/move/workspace_tools"
 default-features = false
 

Makefile

@@ -131,59 +131,35 @@ cwa:
 # Usage :
 #	make ctest1 [crate=name]
 ctest1:
-	@clear
-	@echo "Running Test Level 1: Primary test suite..."
-	@RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS)
+	@clear && RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS)
 
 # Test Level 2: Primary + Documentation tests.
 #
 # Usage :
 #	make ctest2 [crate=name]
 ctest2:
-	@clear
-	@echo "Running Test Level 2: Primary + Doc tests..."
-	@RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && \
-	RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS)
+	@clear && RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS)
 
 # Test Level 3: Primary + Doc + Linter.
 #
 # Usage :
 #	make ctest3 [crate=name]
 ctest3:
-	@clear
-	@echo "Running Test Level 3: All standard checks..."
-	@RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && \
-	RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && \
-	cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings
+	@clear && RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings
 
 # Test Level 4: All standard + Heavy testing (deps, audit).
 #
 # Usage :
 #	make ctest4 [crate=name]
 ctest4:
-	@clear
-	@echo "Running Test Level 4: All checks + Heavy testing..."
-	@RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && \
-	RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && \
-	cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && \
-	cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && \
-	cargo +nightly audit --all-features $(PKG_FLAGS) && \
-	$(MAKE) --no-print-directory clean-cache-files
+	@clear && RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && cargo +nightly audit
 
 # Test Level 5: Full heavy testing with mutation tests.
 #
 # Usage :
 #	make ctest5 [crate=name]
 ctest5:
-	@clear
-	@echo "Running Test Level 5: Full heavy testing with mutations..."
-	@RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && \
-	RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && \
-	cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && \
-	willbe .test dry:0 && \
-	cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && \
-	cargo +nightly audit --all-features $(PKG_FLAGS) && \
-	$(MAKE) --no-print-directory clean-cache-files
+	@clear && RUSTFLAGS="-D warnings" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && willbe .test dry:0 && cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && cargo +nightly audit
 
 #
 # === Watch Commands ===

module/alias/cargo_will/src/bin/cargo-will.rs

@@ -1,13 +1,13 @@
-#![ doc( html_logo_url = "https://raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
-#![ doc( html_favicon_url = "https://raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
-#![ doc( html_root_url = "https://docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
+#![ doc( html_logo_url = "https: //raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
+#![ doc( html_favicon_url = "https: //raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
+#![ doc( html_root_url = "https: //docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
 #![ cfg_attr( doc, doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "readme.md" ) ) ) ]
 
 #[ allow( unused_imports ) ]
-use::willbe::*;
+use ::willbe :: *;
 
-fn main() -> Result<  (), wtools::error::untyped::Error  >
+fn main() -> Result< (), wtools ::error ::untyped ::Error >
 {
-  let args = std::env::args().skip( 1 ).collect();
-  Ok( willbe::run( args )? )
+  let args = std ::env ::args().skip( 1 ).collect();
+  Ok( willbe ::run( args )? )
 }

module/alias/cargo_will/src/bin/will.rs

@@ -2,15 +2,15 @@
 //! Utility to publish multi-crate and multi-workspace environments and maintain their consistency.
 //!
 
-#![ doc( html_logo_url = "https://raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
-#![ doc( html_favicon_url = "https://raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
-#![ doc( html_root_url = "https://docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
+#![ doc( html_logo_url = "https: //raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
+#![ doc( html_favicon_url = "https: //raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
+#![ doc( html_root_url = "https: //docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
 #![ cfg_attr( doc, doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "readme.md" ) ) ) ]
 
 #[ allow( unused_imports ) ]
-use::willbe::*;
+use ::willbe :: *;
 
-fn main() -> Result<  (), wtools::error::untyped::Error  >
+fn main() -> Result< (), wtools ::error ::untyped ::Error >
 {
-  Ok( willbe::run( std::env::args().collect() )? )
+  Ok( willbe ::run( std ::env ::args().collect() )? )
 }

module/alias/cargo_will/src/bin/willbe.rs

@@ -1,12 +1,12 @@
-#![ doc( html_logo_url = "https://raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
-#![ doc( html_favicon_url = "https://raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
-#![ doc( html_root_url = "https://docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
+#![ doc( html_logo_url = "https: //raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
+#![ doc( html_favicon_url = "https: //raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
+#![ doc( html_root_url = "https: //docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
 #![ cfg_attr( doc, doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "readme.md" ) ) ) ]
 
 #[ allow( unused_imports ) ]
-use::willbe::*;
+use ::willbe :: *;
 
-fn main() -> Result<  (), error::untyped::Error  >
+fn main() -> Result< (), error ::untyped ::Error >
 {
-  Ok( willbe::run( std::env::args().collect() )? )
+  Ok( willbe ::run( std ::env ::args().collect() )? )
 }

module/alias/cargo_will/src/lib.rs

@@ -1,7 +1,7 @@
 #![ cfg_attr( feature = "no_std", no_std ) ]
-#![ doc( html_logo_url = "https://raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
-#![ doc( html_favicon_url = "https://raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
-#![ doc( html_root_url = "https://docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
+#![ doc( html_logo_url = "https: //raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
+#![ doc( html_favicon_url = "https: //raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
+#![ doc( html_root_url = "https: //docs.rs/{{template_blank}}/latest/{{template_blank}}/" ) ]
 #![ cfg_attr( doc, doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "readme.md" ) ) ) ]
 
 #[ doc( inline ) ]