From 727e5c15ec4804ebab1397df1f440e6da6c00ab9 Mon Sep 17 00:00:00 2001 From: wandalen Date: Sat, 20 Apr 2024 23:55:56 +0300 Subject: [PATCH] former : evolve --- .../inc/former_tests/subformer_shortcut.rs | 1 - module/core/macro_tools/src/generic_params.rs | 19 ------------------- .../macro_tools/tests/inc/generic_params.rs | 18 ------------------ 3 files changed, 38 deletions(-) diff --git a/module/core/former/tests/inc/former_tests/subformer_shortcut.rs b/module/core/former/tests/inc/former_tests/subformer_shortcut.rs index 16a87e16a6..dd22bdf686 100644 --- a/module/core/former/tests/inc/former_tests/subformer_shortcut.rs +++ b/module/core/former/tests/inc/former_tests/subformer_shortcut.rs @@ -105,7 +105,6 @@ where } -// xxx : uncomment #[ test ] fn basic() { diff --git a/module/core/macro_tools/src/generic_params.rs b/module/core/macro_tools/src/generic_params.rs index 3eec786c34..380e82e3ed 100644 --- a/module/core/macro_tools/src/generic_params.rs +++ b/module/core/macro_tools/src/generic_params.rs @@ -191,25 +191,6 @@ pub( crate ) mod private result } -// // add embedded generic parameters -// let mut extra_generics : syn::Generics = parse_quote! -// { -// < Definition = #former_definition < #generics_for_ty (), #struct_name, former::ReturnPreformed > > -// // Definition = Struct1FormerDefinition< (), Struct1, former::ReturnPreformed >, -// // xxx -// }; -// -// extra_generics.where_clause = parse_quote! -// { -// where -// Definition : former::FormerDefinition, -// Definition::Types : former::FormerDefinitionTypes< Storage = #former_storage #generics_for_ty >, -// // < Definition::Types as former::FormerDefinitionTypes >::Storage : former::StoragePreform, -// }; -// -// // zzz : write helper to fix bug with where -// let generics_of_former = generic_params::merge( &generics, &extra_generics ); - /// Extracts parameter names from the given `Generics`, /// dropping bounds, defaults, and the where clause. /// diff --git a/module/core/macro_tools/tests/inc/generic_params.rs b/module/core/macro_tools/tests/inc/generic_params.rs index 1988663f27..d0bb3b0dbe 100644 --- a/module/core/macro_tools/tests/inc/generic_params.rs +++ b/module/core/macro_tools/tests/inc/generic_params.rs @@ -352,21 +352,3 @@ fn decompose_mixed_generics_types() } } - -// xxx -// #[ test ] -// fn decompose_bug_a() -// { -// use macro_tools::quote::ToTokens; -// let generics : the_module::GenericsWithWhere = syn::parse_quote! { < K : core::hash::Hash + std::cmp::Eq > }; -// let generics = generics.unwrap(); -// let ( impl_with_def, impl_gen, ty_gen, where_gen ) = the_module::generic_params::decompose( &generics ); -// -// let impl_with_def_exp : syn::Generics = syn::parse_quote! { < K : core::hash::Hash + std::cmp::Eq, > }; -// let impl_gen_exp : syn::Generics = syn::parse_quote! { < K, > }; -// let ty_gen_exp : syn::Generics = syn::parse_quote! { < K, > }; -// a_id!( impl_with_def, impl_with_def_exp.params ); -// a_id!( impl_gen, impl_gen_exp.params ); -// a_id!( ty_gen_exp, ty_gen.params ); -// -// }