From 1edb9e795fd1958de3ca9788132c2db0153ed720 Mon Sep 17 00:00:00 2001 From: wandalen Date: Sat, 20 Apr 2024 21:30:30 +0300 Subject: [PATCH] former : evolve --- .../tests/inc/former_tests/subformer_extra.rs | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/module/core/former/tests/inc/former_tests/subformer_extra.rs b/module/core/former/tests/inc/former_tests/subformer_extra.rs index a843b05477..6d3b8a9678 100644 --- a/module/core/former/tests/inc/former_tests/subformer_extra.rs +++ b/module/core/former/tests/inc/former_tests/subformer_extra.rs @@ -248,22 +248,15 @@ where // -/// xxx : extend description -/// Convert an entity to an element which could be added to a container. -pub trait IntoElement< Element > -{ - /// Convert an entity to an element which could be added to a container. - fn into_element( self ) -> Element; -} - -impl< K > IntoElement< ( String, Command< K > ) > -for Command< K > +impl< K > From< Command< K > > +for ( String, Command< K > ) where K : core::hash::Hash + std::cmp::Eq, { - fn into_element( self ) -> ( String, Command< K > ) + #[ inline( always ) ] + fn from( src : Command< K > ) -> Self { - ( self.name.clone(), self ) + ( src.name.clone(), src ) } } @@ -370,7 +363,8 @@ where >, SubDefinition::Storage : former::StoragePreform< Preformed = SubFormed >, - SubFormed : IntoElement< Element >, + // SubFormed : IntoElement< Element >, + SubFormed : Into< Element >, { #[ inline( always ) ] @@ -394,7 +388,7 @@ where former::ContainerAdd::add ( container, - IntoElement::< Element >::into_element( storage ), + Into::< Element >::into( storage ), ); super_former