@@ -39,51 +39,43 @@ impl<T: SelfInstanceBuilder> FactorInstanceBuilder for T {
3939/// A PrepareContext is passed to [`Factor::prepare`].
4040///
4141/// This gives the factor access to app state and the app component.
42- pub struct PrepareContext < ' a , F : Factor > {
42+ pub struct PrepareContext < ' a , T : RuntimeFactors , F : Factor > {
4343 pub ( crate ) app_state : & ' a F :: AppState ,
4444 pub ( crate ) app_component : & ' a AppComponent < ' a > ,
45+ pub ( crate ) instance_builders : & ' a mut T :: InstanceBuilders ,
4546}
4647
47- impl < ' a , F : Factor > PrepareContext < ' a , F > {
48+ impl < ' a , T : RuntimeFactors , F : Factor > PrepareContext < ' a , T , F > {
4849 #[ doc( hidden) ]
49- pub fn new ( app_state : & ' a F :: AppState , app_component : & ' a AppComponent ) -> Self {
50+ pub fn new (
51+ app_state : & ' a F :: AppState ,
52+ app_component : & ' a AppComponent ,
53+ instance_builders : & ' a mut T :: InstanceBuilders ,
54+ ) -> Self {
5055 Self {
5156 app_state,
5257 app_component,
58+ instance_builders,
5359 }
5460 }
5561
5662 /// Get the app state related to the factor.
57- pub fn app_state ( & self ) -> & F :: AppState {
63+ pub fn app_state ( & self ) -> & ' a F :: AppState {
5864 self . app_state
5965 }
6066
6167 /// Get the app component.
62- pub fn app_component ( & self ) -> & AppComponent {
68+ pub fn app_component ( & self ) -> & ' a AppComponent {
6369 self . app_component
6470 }
65- }
66-
67- /// The collection of all the already prepared `InstanceBuilder`s.
68- ///
69- /// Use `InstanceBuilders::get_mut` to get a mutable reference to a specific factor's instance builder.
70- pub struct PreparedInstanceBuilders < ' a , T : RuntimeFactors > {
71- pub ( crate ) inner : & ' a mut T :: InstanceBuilders ,
72- }
73-
74- impl < ' a , T : RuntimeFactors > PreparedInstanceBuilders < ' a , T > {
75- #[ doc( hidden) ]
76- pub fn new ( inner : & ' a mut T :: InstanceBuilders ) -> Self {
77- Self { inner }
78- }
7971
8072 /// Returns the prepared [`FactorInstanceBuilder`] for the given [`Factor`].
8173///
8274/// Fails if the current [`RuntimeFactors`] does not include the given
8375/// [`Factor`] or if the given [`Factor`]'s builder has not been prepared
8476/// yet (because it is sequenced after this factor).
85- pub fn get_mut < U : Factor > ( & mut self ) -> crate :: Result < & mut U :: InstanceBuilder > {
86- T :: instance_builder_mut :: < U > ( self . inner )
77+ pub fn instance_builder < U : Factor > ( & mut self ) -> crate :: Result < & mut U :: InstanceBuilder > {
78+ T :: instance_builder_mut :: < U > ( self . instance_builders )
8779 . ok_or ( Error :: no_such_factor :: < U > ( ) ) ?
8880 . ok_or_else ( || {
8981 Error :: DependencyOrderingError ( format ! (
0 commit comments