diff --git a/module/core/former/src/vector.rs b/module/core/former/src/vector.rs index 9fb40007f1..db986241c7 100644 --- a/module/core/former/src/vector.rs +++ b/module/core/former/src/vector.rs @@ -43,15 +43,15 @@ for Vec< E > // = definition #[ derive( Debug, Default ) ] -pub struct VectorDefinition< E, Context = (), Formed = Vec< E >, End = ReturnStorage > -// pub struct VectorDefinition< E, Context, Formed, End > +// pub struct VectorDefinition< E, Context = (), Formed = Vec< E >, End = ReturnStorage > +pub struct VectorDefinition< E, Context, Formed, End > { _phantom : core::marker::PhantomData< ( E, Context, Formed, End ) >, } impl< E, Context, Formed > FormerDefinitionTypes -for VectorDefinition< E, Context, Formed > -// for VectorDefinition< E, Context, Formed, End > +// for VectorDefinition< E, Context, Formed > +for VectorDefinition< E, Context, Formed, ReturnStorage > // where // End : FormingEnd< Self >, { @@ -63,9 +63,9 @@ for VectorDefinition< E, Context, Formed > impl< E, Context, Formed, End > FormerDefinition for VectorDefinition< E, Context, Formed, End > where - End : FormingEnd< VectorDefinition< E, Context, Formed > >, + End : FormingEnd< VectorDefinition< E, Context, Formed, ReturnStorage > >, { - type Types = VectorDefinition< E, Context, Formed >; + type Types = VectorDefinition< E, Context, Formed, ReturnStorage >; type End = End; } diff --git a/module/core/former/tests/inc/former_tests/container_former_vec.rs b/module/core/former/tests/inc/former_tests/container_former_vec.rs index 6f28a5764a..048af90f1f 100644 --- a/module/core/former/tests/inc/former_tests/container_former_vec.rs +++ b/module/core/former/tests/inc/former_tests/container_former_vec.rs @@ -27,9 +27,9 @@ fn definitions() { } - f1( former::VectorDefinition::< String, () >::default() ); + // f1( former::VectorDefinition::< String, () >::default() ); f2( former::VectorDefinition::< String, (), Vec< String >, the_module::ReturnStorage >::default() ); - f3::< former::VectorDefinition< String, () >, the_module::ReturnStorage >( the_module::ReturnStorage ); + f3::< former::VectorDefinition< String, (), Vec< String >, the_module::ReturnStorage >, the_module::ReturnStorage >( the_module::ReturnStorage ); f3::< < former::VectorDefinition< String, (), Vec< String >, the_module::ReturnStorage > as the_module::FormerDefinition >::Types, the_module::ReturnStorage >( the_module::ReturnStorage ); }