fixing cyclic dependency problem

Author: Wandalen

Cargo.toml

@@ -536,4 +536,14 @@ version = "0.1.83"
 [workspace.dependencies.tokio]
 version = "1.41.0"
 features = []
-default-features = false
+default-features = false
+
+[workspace.dependencies.anyhow]
+version = "~1.0"
+# features = []
+# default-features = false
+
+[workspace.dependencies.thiserror]
+version = "~1.0"
+# features = []
+# default-features = false

module/core/error_tools/Cargo.toml

@@ -48,8 +48,9 @@ error_untyped = [ "anyhow" ]
 # = entry
 
 [dependencies]
-anyhow = { version = "~1.0", optional = true }
-thiserror = { version = "~1.0", optional = true }
+anyhow = { workspace = true, optional = true }
+thiserror = { workspace = true, optional = true }
 
 [dev-dependencies]
 test_tools = { workspace = true }
+# xxx : qqq : review

module/core/error_tools/src/error.rs renamed to module/core/error_tools/src/error/mod.rs

@@ -223,11 +223,13 @@ pub mod typed;
 /// Untyped exceptions handling mechanism.
 pub mod untyped;
 
+#[ cfg( feature = "enabled" ) ]
 #[ doc( inline ) ]
 #[ allow( unused_imports ) ]
 pub use own::*;
 
 /// Own namespace of the module.
+#[ cfg( feature = "enabled" ) ]
 #[ allow( unused_imports ) ]
 pub mod own
 {
@@ -256,16 +258,16 @@ pub mod own
     // BasicError,
   };
 
-  pub use super::
-  {
-    assert,
-    typed,
-    untyped,
-  };
+  pub use super::assert;
+  #[ cfg( feature = "error_typed" ) ]
+  pub use super::typed;
+  #[ cfg( feature = "error_untyped" ) ]
+  pub use super::untyped;
 
 }
 
 /// Shared with parent namespace of the module
+#[ cfg( feature = "enabled" ) ]
 #[ allow( unused_imports ) ]
 pub mod orphan
 {
@@ -275,6 +277,7 @@ pub mod orphan
 }
 
 /// Exposed namespace of the module.
+#[ cfg( feature = "enabled" ) ]
 #[ allow( unused_imports ) ]
 pub mod exposed
 {
@@ -304,6 +307,7 @@ pub mod exposed
 }
 
 /// Prelude to use essentials: `use my_module::prelude::*`.
+#[ cfg( feature = "enabled" ) ]
 #[ allow( unused_imports ) ]
 pub mod prelude
 {

module/core/test_tools/Cargo.toml

@@ -27,8 +27,12 @@ all-features = false
 # = features
 
 [features]
-default = [ "enabled" ]
-full = [ "enabled" ]
+default = [
+  "enabled",
+  "error_typed",
+  "error_untyped",
+]
+full = [ "default" ]
 no_std = [
   # "error_tools/no_std",
   # "meta_tools/no_std",
@@ -62,20 +66,22 @@ enabled = [
 ]
 # nightly = [ "typing_tools/nightly" ]
 
+error_typed = []
+error_untyped = []
+
 [dependencies]
 
 ## external
 
-paste = "~1.0" # zzz : remove laster
+# paste = "~1.0" # zzz : remove later
 rustversion = "~1.0"
-# anyhow = "~1.0"
 num-traits = "~0.2"
 trybuild = { version = "1.0.85", features = [ "diff" ] }
 rand = "0.8.5"
 
 ## internal
 
-error_tools = { workspace = true, features = [ "full" ] }
+# error_tools = { workspace = true, features = [ "full" ] }
 meta_tools = { workspace = true, features = [ "full" ] }
 mem_tools = { workspace = true, features = [ "full" ] }
 typing_tools = { workspace = true, features = [ "full" ] }
@@ -86,5 +92,10 @@ collection_tools = { workspace = true, features = [ "full" ] }
 
 # former_stable = { workspace = true, features = [ "full" ] }
 
+## transient
+
+anyhow = { workspace = true }
+thiserror = { workspace = true }
+
 [build-dependencies]
 rustc_version = "0.4"

module/core/test_tools/src/lib.rs

@@ -11,9 +11,9 @@
 pub mod dependency
 {
 
-  // zzz : exclude later
-  #[ doc( inline ) ]
-  pub use ::paste;
+  // // zzz : exclude later
+  // #[ doc( inline ) ]
+  // pub use ::paste;
   #[ doc( inline ) ]
   pub use ::trybuild;
   #[ doc( inline ) ]
@@ -41,8 +41,8 @@ pub mod dependency
 
 }
 
-// #[ path = "../../../core/error_tools/src/lib.rs" ]
-// pub mod error_tools;
+#[ path = "../../../core/error_tools/src/error/mod.rs" ]
+pub mod error_tools;
 
 mod private {}
 

module/move/willbe/src/action/cicd_renew.rs

@@ -19,7 +19,7 @@ mod private
   use error::
   {
     typed::Error,
-    err,
+    // err,
   };
 
   #[ derive( Debug, Error ) ]
@@ -375,7 +375,7 @@ mod private
         return url::repo_url_extract( &url )
         .and_then( | url | url::git_info_extract( &url ).ok() )
         .map( UsernameAndRepository )
-        .ok_or_else( || err!( "Fail to parse repository url from workspace Cargo.toml"))
+        .ok_or_else( || error::untyped::format_err!( "Fail to parse repository url from workspace Cargo.toml"))
       }
       else
       {
@@ -393,7 +393,7 @@ mod private
         .and_then( | url | url::repo_url_extract( &url ) )
         .and_then( | url | url::git_info_extract( &url ).ok() )
         .map( UsernameAndRepository )
-        .ok_or_else( || err!( "Fail to extract repository url") )
+        .ok_or_else( || error::untyped::format_err!( "Fail to extract repository url") )
       }
     }
 

module/move/willbe/src/action/list.rs

@@ -13,7 +13,7 @@ mod private
   };
   use error::
   {
-    ErrWith, err,
+    ErrWith,
     untyped::{ Context, format_err },
   };
   use tool::{ TreePrinter, ListNodeReport };
@@ -39,7 +39,7 @@ mod private
       {
         "tree" => ListFormat::Tree,
         "toposort" => ListFormat::Topological,
-        e => return Err( err!( "Unknown format '{}'. Available values : [tree, toposort]", e ))
+        e => return Err( error::untyped::format_err!( "Unknown format '{}'. Available values : [tree, toposort]", e ))
       };
 
       Ok( value )
@@ -105,7 +105,7 @@ mod private
       {
         "nothing" => ListFilter::Nothing,
         "local" => ListFilter::Local,
-        e => return Err( err!( "Unknown filter '{}'. Available values : [nothing, local]", e ) )
+        e => return Err( error::untyped::format_err!( "Unknown filter '{}'. Available values : [nothing, local]", e ) )
       };
 
       Ok( value )

module/move/willbe/src/action/main_header.rs

@@ -18,8 +18,8 @@ mod private
   use entity::{ PathError, WorkspaceInitError };
   use error::
   {
-    err,
-    untyped::Error,
+    // err,
+    // untyped::Error,
   };
   use workspace_md_extension::WorkspaceMdExtension;
 
@@ -86,7 +86,7 @@ mod private
   {
     /// Represents a common error.
     #[ error( "Common error: {0}" ) ]
-    Common(#[ from ] Error ),
+    Common( #[ from ] error::untyped::Error ), // qqq : rid of
     /// Represents an I/O error.
     #[ error( "I/O error: {0}" ) ]
     IO( #[ from ] std::io::Error ),
@@ -116,14 +116,14 @@ mod private
       // aaa : done
       let repository_url = workspace
       .repository_url()
-      .ok_or_else::< Error, _ >
-      ( || err!( "repo_url not found in workspace Cargo.toml" ) )?;
+      .ok_or_else::< error::untyped::Error, _ >
+      ( || error::untyped::format_err!( "repo_url not found in workspace Cargo.toml" ) )?;
 
       let master_branch = workspace.master_branch().unwrap_or( "master".into() );
       let workspace_name = workspace
       .workspace_name()
-      .ok_or_else::< Error, _ >
-      ( || err!( "workspace_name not found in workspace Cargo.toml" ) )?;
+      .ok_or_else::< error::untyped::Error, _ >
+      ( || error::untyped::format_err!( "workspace_name not found in workspace Cargo.toml" ) )?;
 
       let discord_url = workspace.discord_url();
 

module/move/willbe/src/action/readme_modules_headers_renew.rs

@@ -20,11 +20,11 @@ mod private
   use package::Package;
   use error::
   {
-    err,
+    // err,
     untyped::
     {
       // Result,
-      Error as wError,
+      // Error as wError,
       Context,
     },
   };
@@ -101,7 +101,7 @@ mod private
   {
     /// Represents a common error.
     #[ error( "Common error: {0}" ) ]
-    Common(#[ from ] wError ),
+    Common(#[ from ] error::untyped::Error ), // qqq : rid of
     /// Represents an I/O error.
     #[ error( "I/O error: {0}" ) ]
     IO( #[ from ] std::io::Error ),
@@ -140,7 +140,7 @@ mod private
       let stability = package.stability()?;
       let module_name = package.name()?;
       let repository_url = package.repository()?
-      .ok_or_else::< wError, _ >( || err!( "Fail to find repository_url in module`s Cargo.toml" ) )?;
+      .ok_or_else::< error::untyped::Error, _ >( || error::untyped::format_err!( "Fail to find repository_url in module`s Cargo.toml" ) )?;
 
       let discord_url = package
       .discord_url()?
@@ -172,7 +172,7 @@ mod private
 
       let repo_url = url::repo_url_extract( &self.repository_url )
       .and_then( | r | url::git_info_extract( &r ).ok() )
-      .ok_or_else::< wError, _ >( || err!( "Fail to parse repository url" ) )?;
+      .ok_or_else::< error::untyped::Error, _ >( || error::untyped::format_err!( "Fail to parse repository url" ) )?;
       let example= if let Some( name ) = find_example_file
       (
         self.module_path.as_path(),
@@ -269,7 +269,7 @@ mod private
       .join
       (
         repository::readme_path( path.parent().unwrap().as_ref() )
-        // .ok_or_else::< wError, _ >( || err!( "Fail to find README.md at {}", &path ) )
+        // .ok_or_else::< error::untyped::Error, _ >( || error::untyped::format_err!( "Fail to find README.md at {}", &path ) )
         .err_with_report( &report )?
       );
 

module/move/willbe/src/command/readme_headers_renew.rs

@@ -2,7 +2,7 @@ mod private
 {
   use crate::*;
   use action;
-  use error::{ err };
+  // use error::{ err };
   use std::fmt::{ Display, Formatter };
 
   #[ derive( Debug, Default ) ]
@@ -103,7 +103,7 @@ mod private
     if fail
     {
       eprintln!( "{report}" );
-      Err( err!( "Something went wrong" ) )
+      Err( error::untyped::format_err!( "Something went wrong" ) )
     }
     else
     {