Merge remote-tracking branch 'upstream/alpha' into wca_fluent_interface

Barsik-sus · Mar 11, 2024 · d1ef3b8 · d1ef3b8
2 parents 6c2bf97 + cc8021c
commit d1ef3b8
Show file tree

Hide file tree

Showing 148 changed files with 4,390 additions and 3,275 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -89,7 +89,7 @@ default-features = false
 # path = "module/core/type_constructor_derive_pair_meta"
 
 [workspace.dependencies.interval_adapter]
-version = "~0.8.0"
+version = "~0.9.0"
 path = "module/core/interval_adapter"
 default-features = false
 features = [ "enabled" ]
@@ -173,7 +173,7 @@ default-features = false
 ## iter
 
 [workspace.dependencies.iter_tools]
-version = "~0.7.0"
+version = "~0.8.0"
 path = "module/core/iter_tools"
 default-features = false
 
@@ -198,10 +198,7 @@ default-features = false
 [workspace.dependencies.former_meta]
 version = "~0.7.0"
 path = "module/core/former_meta"
-
-# [workspace.dependencies.former_runtime]
-# version = "~0.1.12"
-# path = "module/core/former_runtime"
+default-features = false
 
 [workspace.dependencies.impls_index]
 version = "~0.3.0"
@@ -244,7 +241,7 @@ default-features = false
 ## proc macro tools
 
 [workspace.dependencies.macro_tools]
-version = "~0.8.0"
+version = "~0.9.0"
 path = "module/core/macro_tools"
 default-features = false
 

diff --git a/module/alias/instance_of/src/typing/instance_of_lib.rs b/module/alias/instance_of/src/typing/instance_of_lib.rs
@@ -2,14 +2,6 @@
 #![ 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/instance_of/latest/instance_of/" ) ]
-// #![ deny( rust_2018_idioms ) ]
-// #![ deny( missing_debug_implementations ) ]
-// #![ deny( missing_docs ) ]
-
-//!
-//! Macro to answer the question: does it implement a trait?
-//!
-
 #![ doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "Readme.md" ) ) ]
 
 #[ doc( inline ) ]

diff --git a/module/alias/proc_macro_tools/Readme.md b/module/alias/proc_macro_tools/Readme.md
@@ -12,15 +12,13 @@ Tools for writing procedural macros.
 
 ```rust ignore
 use proc_macro_tools::*;
-use proc_macro_tools::dependency::*;
-use quote::quote;
 
 fn main()
 {
-  let code = quote!( core::option::Option< i8, i16, i32, i64 > );
+  let code = qt!( core::option::Option< i8, i16, i32, i64 > );
   let tree_type = syn::parse2::< syn::Type >( code ).unwrap();
   let got = type_parameters( &tree_type, 0..=2 );
-  got.iter().for_each( | e | println!( "{}", quote!( #e ) ) );
+  got.iter().for_each( | e | println!( "{}", qt!( #e ) ) );
   // < i8
   // < i16
   // < i32

diff --git a/module/alias/proc_macro_tools/examples/proc_macro_tools_trivial.rs b/module/alias/proc_macro_tools/examples/proc_macro_tools_trivial.rs
@@ -1,19 +1,20 @@
 //! example
 
+#[ cfg( feature = "no_std" ) ]
+fn main(){}
+
+#[ cfg( not( feature = "no_std" ) ) ]
 fn main()
 {
-  #[ cfg( not( feature = "no_std" ) ) ]
-  {
-    use proc_macro_tools::*;
+  use proc_macro_tools::{ typ, qt };
 
-    let code = qt!( core::option::Option< i8, i16, i32, i64 > );
-    let tree_type = syn::parse2::< syn::Type >( code ).unwrap();
-    let got = type_parameters( &tree_type, 0..=2 );
-    got.iter().for_each( | e | println!( "{}", qt!( #e ) ) );
-    /* print :
-      i8
-      i16
-      i32
-    */
-  }
+  let code = qt!( core::option::Option< i8, i16, i32, i64 > );
+  let tree_type = syn::parse2::< syn::Type >( code ).unwrap();
+  let got = typ::type_parameters( &tree_type, 0..=2 );
+  got.iter().for_each( | e | println!( "{}", qt!( #e ) ) );
+  /* print :
+    i8
+    i16
+    i32
+  */
 }
diff --git a/module/core/clone_dyn/Cargo.toml b/module/core/clone_dyn/Cargo.toml
@@ -23,7 +23,6 @@ workspace = true
 [package.metadata.docs.rs]
 features = [ "full" ]
 all-features = false
-
 exclude = [ "/tests", "/examples", "-*" ]
 
 [features]
@@ -32,7 +31,7 @@ default = [ "enabled" ]
 full = [ "enabled" ]
 no_std = []
 use_alloc = []
-enabled = []
+enabled = [ "clone_dyn_meta/enabled" ]
 
 [dependencies]
 clone_dyn_meta = { workspace = true }

diff --git a/module/core/clone_dyn/tests/inc/mod.rs b/module/core/clone_dyn/tests/inc/mod.rs
@@ -9,6 +9,7 @@ tests_impls!
 
   //
 
+  // qqq : organize tests in the same way tests organized for derive_tools
   fn manual()
   {
 
@@ -34,27 +35,31 @@ tests_impls!
 
     //
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c > Clone
     for Box< dyn Trait1 + 'c >
     {
       #[ inline ]
       fn clone( &self ) -> Self { _clone_boxed( &**self ) }
     }
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c > Clone
     for Box< dyn Trait1 + Send + 'c >
     {
       #[ inline ]
       fn clone( &self ) -> Self { _clone_boxed( &**self ) }
     }
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c > Clone
     for Box< dyn Trait1 + Sync + 'c >
     {
       #[ inline ]
       fn clone( &self ) -> Self { _clone_boxed( &**self ) }
     }
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c > Clone
     for Box< dyn Trait1 + Send + Sync + 'c >
     {

diff --git a/module/core/clone_dyn_meta/src/lib.rs b/module/core/clone_dyn_meta/src/lib.rs
@@ -2,17 +2,6 @@
 #![ 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/clone_dyn_meta/latest/clone_dyn_meta/" ) ]
-// #![ deny( rust_2018_idioms ) ]
-// #![ deny( missing_debug_implementations ) ]
-// #![ deny( missing_docs ) ]
-
-// #![ feature( type_name_of_val ) ]
-// #![ feature( trace_macros ) ]
-
-//!
-//! Derive to clone dyn structures.
-//!
-
 #![ doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "Readme.md" ) ) ]
 
 #[ cfg( feature = "enabled" ) ]

diff --git a/module/core/clone_dyn_meta/src/meta_impl.rs b/module/core/clone_dyn_meta/src/meta_impl.rs
@@ -1,6 +1,6 @@
 
 use macro_tools::prelude::*;
-pub type Result< T > = std::result::Result< T, syn::Error >;
+use macro_tools::Result;
 
 //
 
@@ -24,6 +24,7 @@ pub fn clone_dyn( _attr : proc_macro::TokenStream, item : proc_macro::TokenStrea
   {
     #item_parsed
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c, #generics_params > Clone
     for Box< dyn #name_ident< #( #generics_names ),* > + 'c >
     // where
@@ -33,6 +34,7 @@ pub fn clone_dyn( _attr : proc_macro::TokenStream, item : proc_macro::TokenStrea
       fn clone( &self ) -> Self { clone_dyn::_clone_boxed( &**self ) }
     }
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c, #generics_params > Clone
     for Box< dyn #name_ident< #( #generics_names ),* > + Send + 'c >
     // where
@@ -42,6 +44,7 @@ pub fn clone_dyn( _attr : proc_macro::TokenStream, item : proc_macro::TokenStrea
       fn clone( &self ) -> Self { clone_dyn::_clone_boxed( &**self ) }
     }
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c, #generics_params > Clone
     for Box< dyn #name_ident< #( #generics_names ),* > + Sync + 'c >
     // where
@@ -51,6 +54,7 @@ pub fn clone_dyn( _attr : proc_macro::TokenStream, item : proc_macro::TokenStrea
       fn clone( &self ) -> Self { clone_dyn::_clone_boxed( &**self ) }
     }
 
+    #[ allow( non_local_definitions ) ]
     impl < 'c, #generics_params > Clone
     for Box< dyn #name_ident< #( #generics_names ),* > + Send + Sync + 'c >
     // where

diff --git a/module/core/derive_tools/Cargo.toml b/module/core/derive_tools/Cargo.toml
@@ -125,34 +125,34 @@ derive_variadic_from = [ "type_variadic_from", "derive_tools_meta/derive_variadi
 
 # enable_track_caller = [ "derive_more", "derive_more/track-caller" ]
 
-derive_add_assign = [ "derive_more", "derive_more/add_assign" ]
-derive_add = [ "derive_more", "derive_more/add" ]
+derive_add_assign = [ "derive_more", "derive_more/std", "derive_more/add_assign" ]
+derive_add = [ "derive_more", "derive_more/std", "derive_more/add" ]
 derive_as_mut = [ "derive_tools_meta/derive_as_mut" ]
 derive_as_ref = [ "derive_tools_meta/derive_as_ref" ]
 # derive_as_mut = [ "derive_more", "derive_more/as_mut" ]
 # derive_as_ref = [ "derive_more", "derive_more/as_ref" ]
-derive_constructor = [ "derive_more", "derive_more/constructor" ]
+derive_constructor = [ "derive_more", "derive_more/std", "derive_more/constructor" ]
 derive_deref = [ "derive_tools_meta/derive_deref" ]
 derive_deref_mut = [ "derive_tools_meta/derive_deref_mut" ]
 # derive_deref = [ "derive_more", "derive_more/deref" ]
 # derive_deref_mut = [ "derive_more", "derive_more/deref_mut" ]
-derive_error = [ "derive_more", "derive_more/error" ]
+derive_error = [ "derive_more", "derive_more/std", "derive_more/error" ]
 # derive_from = [ "derive_more", "derive_more/from" ]
 # derive_from = [ "derive_tools_meta/derive_from" ]
 # derive_reflect = [ "derive_tools_meta/derive_reflect" ]
 
-derive_index = [ "derive_more", "derive_more/index" ]
-derive_index_mut = [ "derive_more", "derive_more/index_mut" ]
+derive_index = [ "derive_more", "derive_more/std", "derive_more/index" ]
+derive_index_mut = [ "derive_more", "derive_more/std", "derive_more/index_mut" ]
 # derive_inner_from = [ "derive_more", "derive_more/into" ]
-derive_into_iterator = [ "derive_more", "derive_more/into_iterator" ]
+derive_into_iterator = [ "derive_more", "derive_more/std", "derive_more/into_iterator" ]
 # derive_iterator = [ "derive_more", "derive_more/iterator" ]
-derive_mul_assign = [ "derive_more", "derive_more/mul_assign" ]
-derive_mul = [ "derive_more", "derive_more/mul" ]
-derive_not = [ "derive_more", "derive_more/not" ]
-derive_sum = [ "derive_more", "derive_more/sum" ]
-derive_try_into = [ "derive_more", "derive_more/try_into" ]
+derive_mul_assign = [ "derive_more", "derive_more/std", "derive_more/mul_assign" ]
+derive_mul = [ "derive_more", "derive_more/std", "derive_more/mul" ]
+derive_not = [ "derive_more", "derive_more/std", "derive_more/not" ]
+derive_sum = [ "derive_more", "derive_more/std", "derive_more/sum" ]
+derive_try_into = [ "derive_more", "derive_more/std", "derive_more/try_into" ]
 derive_is_variant = [ "derive_more", "derive_more/is_variant" ]
-derive_unwrap = [ "derive_more", "derive_more/unwrap" ]
+derive_unwrap = [ "derive_more", "derive_more/std", "derive_more/unwrap" ]
 # derive_convert_case = [ "derive_more", "derive_more/convert_case" ]
 
 derive_display = [ "parse-display" ]

diff --git a/module/core/derive_tools/src/lib.rs b/module/core/derive_tools/src/lib.rs
@@ -12,8 +12,8 @@
 #[ cfg( feature = "enabled" ) ]
 pub mod wtools;
 
-#[ cfg( feature = "derive_reflect" ) ]
-pub mod reflect;
+// #[ cfg( feature = "derive_reflect" ) ]
+// pub mod reflect;
 
 // use derive_tools_meta::Deref;
 // use derive_tools_meta::VariadicFrom;
@@ -55,20 +55,48 @@ pub mod protected
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
   pub use super::wtools::orphan::*;
-  #[ cfg( feature = "derive_reflect" ) ]
-  #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
-  pub use super::reflect::orphan::*;
+  // #[ cfg( feature = "derive_reflect" ) ]
+  // #[ doc( inline ) ]
+  // #[ allow( unused_imports ) ]
+  // pub use super::reflect::orphan::*;
 }
 
 #[ cfg( all( feature = "derive_more" ) ) ]
 #[ allow( unused_imports ) ]
 mod derive_more
 {
   #[ cfg( feature = "derive_add" ) ]
-  pub use ::derive_more::Add;
+  pub use ::derive_more::{ Add, Sub };
+  #[ cfg( feature = "derive_add_assign" ) ]
+  pub use ::derive_more::{ AddAssign, SubAssign };
+  #[ cfg( feature = "derive_constructor" ) ]
+  pub use ::derive_more::Constructor;
+  #[ cfg( feature = "derive_error" ) ]
+  pub use ::derive_more::Error;
+  #[ cfg( feature = "derive_index_mut" ) ]
+  pub use ::derive_more::IndexMut;
+  #[ cfg( feature = "derive_index" ) ]
+  pub use ::derive_more::Index;
+  #[ cfg( feature = "derive_into" ) ]
+  pub use ::derive_more::Into;
+  #[ cfg( feature = "derive_iterator" ) ]
+  pub use ::derive_more::Iterator;
+  #[ cfg( feature = "derive_into_iterator" ) ]
+  pub use ::derive_more::IntoIterator;
+  #[ cfg( feature = "derive_mul" ) ]
+  pub use ::derive_more::{ Mul, Div };
+  #[ cfg( feature = "derive_mul_assign" ) ]
+  pub use ::derive_more::{ MulAssign, DivAssign };
+  #[ cfg( feature = "derive_not" ) ]
+  pub use ::derive_more::Not;
+  #[ cfg( feature = "derive_sum" ) ]
+  pub use ::derive_more::Sum;
+  #[ cfg( feature = "derive_try_into" ) ]
+  pub use ::derive_more::TryInto;
   #[ cfg( feature = "derive_is_variant" ) ]
   pub use ::derive_more::IsVariant;
+  #[ cfg( feature = "derive_unwrap" ) ]
+  pub use ::derive_more::Unwrap;
 
   // qqq2 : list all
   // qqq2 : make sure all features of derive_more is reexported
@@ -183,10 +211,10 @@ pub mod exposed
   #[ allow( unused_imports ) ]
   pub use super::wtools::exposed::*;
 
-  #[ cfg( feature = "derive_reflect" ) ]
-  #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
-  pub use super::reflect::exposed::*;
+  // #[ cfg( feature = "derive_reflect" ) ]
+  // #[ doc( inline ) ]
+  // #[ allow( unused_imports ) ]
+  // pub use super::reflect::exposed::*;
 
   // #[ cfg( any_derive ) ]
   #[ doc( inline ) ]
@@ -217,10 +245,10 @@ pub mod prelude
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
   pub use ::clone_dyn::clone_dyn;
-  #[ cfg( feature = "derive_reflect" ) ]
-  #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
-  pub use super::reflect::prelude::*;
+  // #[ cfg( feature = "derive_reflect" ) ]
+  // #[ doc( inline ) ]
+  // #[ allow( unused_imports ) ]
+  // pub use super::reflect::prelude::*;
 
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]