From 2d07383bfa7e23f06baeebfdae3e675da5da8eb6 Mon Sep 17 00:00:00 2001 From: wandalen Date: Sat, 30 Mar 2024 15:17:29 +0200 Subject: [PATCH] former : experimenting --- .../inc/former_tests/a_primitives_manual.rs | 32 +++++++++++-------- .../inc/former_tests/only_test/primitives.rs | 18 ++++++++--- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/module/core/former/tests/inc/former_tests/a_primitives_manual.rs b/module/core/former/tests/inc/former_tests/a_primitives_manual.rs index 69a85e940e..79fa37d884 100644 --- a/module/core/former/tests/inc/former_tests/a_primitives_manual.rs +++ b/module/core/former/tests/inc/former_tests/a_primitives_manual.rs @@ -246,7 +246,7 @@ where } #[ inline( always ) ] - pub fn begin_explicit + pub fn begin_precise ( mut storage : core::option::Option< < Definition::Types as former::FormerDefinitionTypes >::Storage >, context : core::option::Option< < Definition::Types as former::FormerDefinitionTypes >::Context >, @@ -306,25 +306,31 @@ where // zzz : update description #[ inline( always ) ] - pub fn new( on_end : Definition::End ) -> Self + pub fn new_precise( on_end : Definition::End ) -> Self { - Self::begin_explicit( None, None, on_end ) + Self::begin_precise( None, None, on_end ) } - // zzz : update description #[ inline( always ) ] - pub fn new_with< IntoEnd >( end : IntoEnd ) -> Self - where - IntoEnd : Into< Definition::End >, + pub fn new( on_end : Definition::End ) -> Self { - Self::begin - ( - None, - None, - end.into(), - ) + Self::begin_precise( None, None, on_end ) } + // zzz : use + // #[ inline( always ) ] + // pub fn new< IntoEnd >( end : IntoEnd ) -> Self + // where + // IntoEnd : Into< Definition::End >, + // { + // Self::begin + // ( + // None, + // None, + // end.into(), + // ) + // } + } impl< Definition > Struct1Former< Definition > diff --git a/module/core/former/tests/inc/former_tests/only_test/primitives.rs b/module/core/former/tests/inc/former_tests/only_test/primitives.rs index c1f3c0fc34..ba8a0a30d9 100644 --- a/module/core/former/tests/inc/former_tests/only_test/primitives.rs +++ b/module/core/former/tests/inc/former_tests/only_test/primitives.rs @@ -166,13 +166,13 @@ tests_impls! // - fn begin_explicit() + fn begin_precise() { // custom params let got = Struct1Former ::< Struct1FormerDefinition< i32, i32, _ > > - ::begin_explicit + ::begin_precise ( None, Some( 3 ), @@ -188,7 +188,7 @@ tests_impls! // custom params with into let got = Struct1Former ::< Struct1FormerDefinition< i32, i32, former::FormingEndWrapper< Struct1FormerDefinitionTypes< i32, i32 > > > > - ::begin_explicit + ::begin_precise ( None, Some( 3 ), @@ -207,9 +207,19 @@ tests_impls! fn new() { + let former = Struct1::former(); + let former2 = Struct1Former::< Struct1FormerDefinition >::new_precise( former::ReturnPreformed ); + a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) ); + let exp = former.form(); + let got = former2.form(); + a_id!( got, exp ); + let former = Struct1::former(); let former2 = Struct1Former::< Struct1FormerDefinition >::new( former::ReturnPreformed ); a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) ); + let exp = former.form(); + let got = former2.form(); + a_id!( got, exp ); } @@ -481,7 +491,7 @@ tests_index! { internals, begin, - begin_explicit, + begin_precise, new, custom_definition_params, preform,