factors: Tweak Factor::prepare signature

Signed-off-by: Lann Martin <[email protected]>

Author: lann

crates/factor-key-value/src/lib.rs

@@ -102,6 +102,7 @@ impl Factor for KeyValueFactor {
     }
 
     fn prepare<T: RuntimeFactors>(
+        &self,
         ctx: PrepareContext<Self>,
         _builders: &mut InstanceBuilders<T>,
     ) -> anyhow::Result<InstanceBuilder> {

crates/factor-outbound-http/src/lib.rs

@@ -36,6 +36,7 @@ impl Factor for OutboundHttpFactor {
     }
 
     fn prepare<T: RuntimeFactors>(
+        &self,
         _ctx: PrepareContext<Self>,
         builders: &mut InstanceBuilders<T>,
     ) -> anyhow::Result<Self::InstanceBuilder> {

crates/factor-outbound-networking/src/lib.rs

@@ -49,6 +49,7 @@ impl Factor for OutboundNetworkingFactor {
     }
 
     fn prepare<T: RuntimeFactors>(
+        &self,
         ctx: PrepareContext<Self>,
         builders: &mut InstanceBuilders<T>,
     ) -> anyhow::Result<Self::InstanceBuilder> {

crates/factor-variables/src/lib.rs

@@ -81,6 +81,7 @@ impl Factor for VariablesFactor {
     }
 
     fn prepare<T: RuntimeFactors>(
+        &self,
         ctx: PrepareContext<Self>,
         _builders: &mut InstanceBuilders<T>,
     ) -> anyhow::Result<InstanceState> {

crates/factor-wasi/src/lib.rs

@@ -78,6 +78,7 @@ impl Factor for WasiFactor {
     }
 
     fn prepare<T: RuntimeFactors>(
+        &self,
         ctx: PrepareContext<Self>,
         _builders: &mut InstanceBuilders<T>,
     ) -> anyhow::Result<InstanceBuilder> {
@@ -92,8 +93,7 @@ impl Factor for WasiFactor {
         let mount_ctx = MountFilesContext {
             wasi_ctx: &mut wasi_ctx,
         };
-        ctx.factor()
-            .files_mounter
+        self.files_mounter
             .mount_files(ctx.app_component(), mount_ctx)?;
 
         Ok(InstanceBuilder { wasi_ctx })

crates/factor-wasi/src/preview1.rs

@@ -23,6 +23,7 @@ impl Factor for WasiPreview1Factor {
     }
 
     fn prepare<T: RuntimeFactors>(
+        &self,
         _ctx: spin_factors::PrepareContext<Self>,
         _builders: &mut spin_factors::InstanceBuilders<T>,
     ) -> anyhow::Result<Self::InstanceBuilder> {

crates/factors-derive/src/lib.rs

@@ -121,8 +121,8 @@ fn expand_factors(input: &DeriveInput) -> syn::Result<TokenStream> {
                 #(
                     builders.#factor_names = Some(
                         #Factor::prepare::<Self>(
+                            &self.#factor_names,
                             #factors_path::PrepareContext::new(
-                                &self.#factor_names,
                                 configured_app.app_state::<#factor_types>().unwrap(),
                                 &app_component,
                             ),

crates/factors/src/factor.rs

@@ -38,6 +38,7 @@ pub trait Factor: Any + Sized {
     /// This method is given access to the app component being instantiated and
     /// to any other factors' instance builders that have already been prepared.
     fn prepare<T: RuntimeFactors>(
+        &self,
         ctx: PrepareContext<Self>,
         _builders: &mut InstanceBuilders<T>,
     ) -> anyhow::Result<Self::InstanceBuilder>;

crates/factors/src/prepare.rs

@@ -32,25 +32,19 @@ impl<T: SelfInstanceBuilder> FactorInstanceBuilder for T {
 /// already-initialized [`FactorInstanceBuilder`]s, allowing for
 /// inter-[`Factor`] dependencies.
 pub struct PrepareContext<'a, F: Factor> {
-    pub(crate) factor: &'a F,
     pub(crate) app_state: &'a F::AppState,
     pub(crate) app_component: &'a AppComponent<'a>,
 }
 
 impl<'a, F: Factor> PrepareContext<'a, F> {
     #[doc(hidden)]
-    pub fn new(factor: &'a F, app_state: &'a F::AppState, app_component: &'a AppComponent) -> Self {
+    pub fn new(app_state: &'a F::AppState, app_component: &'a AppComponent) -> Self {
         Self {
-            factor,
             app_state,
             app_component,
         }
     }
 
-    pub fn factor(&self) -> &F {
-        self.factor
-    }
-
     pub fn app_state(&self) -> &F::AppState {
         self.app_state
     }