Switch to using impl InitContext

Signed-off-by: Alex Crichton <[email protected]>

Author: alexcrichton

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

@@ -38,10 +38,7 @@ impl Factor for KeyValueFactor {
     type AppState = AppState;
     type InstanceBuilder = InstanceBuilder;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v1::key_value::add_to_linker)?;
         ctx.link_bindings(spin_world::v2::key_value::add_to_linker)?;
         ctx.link_bindings(spin_world::wasi::keyvalue::store::add_to_linker)?;

crates/factor-llm/src/lib.rs

@@ -36,10 +36,7 @@ impl Factor for LlmFactor {
     type AppState = AppState;
     type InstanceBuilder = InstanceState;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: spin_factors::InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl spin_factors::InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v1::llm::add_to_linker)?;
         ctx.link_bindings(spin_world::v2::llm::add_to_linker)?;
         Ok(())

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

@@ -52,10 +52,7 @@ impl Factor for OutboundHttpFactor {
     type AppState = ();
     type InstanceBuilder = InstanceState;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: spin_factors::InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl spin_factors::InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v1::http::add_to_linker)?;
         wasi::add_to_linker(ctx)?;
         Ok(())

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

@@ -31,10 +31,7 @@ impl Factor for OutboundMqttFactor {
     type AppState = ();
     type InstanceBuilder = InstanceState;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: spin_factors::InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl spin_factors::InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v2::mqtt::add_to_linker)?;
         Ok(())
     }

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

@@ -17,10 +17,7 @@ impl<C: Send + Sync + Client + 'static> Factor for OutboundMysqlFactor<C> {
     type AppState = ();
     type InstanceBuilder = InstanceState<C>;
 
-    fn init<I>(&mut self, ctx: &mut I) -> anyhow::Result<()>
-    where
-        I: InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(v1::add_to_linker)?;
         ctx.link_bindings(v2::add_to_linker)?;
         Ok(())

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

@@ -17,10 +17,7 @@ impl<C: Send + Sync + Client + 'static> Factor for OutboundPgFactor<C> {
     type AppState = ();
     type InstanceBuilder = InstanceState<C>;
 
-    fn init<I>(&mut self, ctx: &mut I) -> anyhow::Result<()>
-    where
-        I: spin_factors::InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl spin_factors::InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v1::postgres::add_to_linker)?;
         ctx.link_bindings(spin_world::v2::postgres::add_to_linker)?;
         ctx.link_bindings(spin_world::spin::postgres::postgres::add_to_linker)?;

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

@@ -23,10 +23,7 @@ impl Factor for OutboundRedisFactor {
     type AppState = ();
     type InstanceBuilder = InstanceState;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: spin_factors::InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl spin_factors::InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v1::redis::add_to_linker)?;
         ctx.link_bindings(spin_world::v2::redis::add_to_linker)?;
         Ok(())

crates/factor-sqlite/src/lib.rs

@@ -32,10 +32,7 @@ impl Factor for SqliteFactor {
     type AppState = AppState;
     type InstanceBuilder = InstanceState;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: spin_factors::InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl spin_factors::InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(v1::add_to_linker)?;
         ctx.link_bindings(v2::add_to_linker)?;
         ctx.link_bindings(v3::add_to_linker)?;

crates/factor-variables/src/lib.rs

@@ -28,10 +28,7 @@ impl Factor for VariablesFactor {
     type AppState = AppState;
     type InstanceBuilder = InstanceState;
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl InitContext<Self>) -> anyhow::Result<()> {
         ctx.link_bindings(spin_world::v1::config::add_to_linker)?;
         ctx.link_bindings(spin_world::v2::variables::add_to_linker)?;
         ctx.link_bindings(spin_world::wasi::config::store::add_to_linker)?;

crates/factor-wasi/src/lib.rs

@@ -44,66 +44,98 @@ impl WasiFactor {
     }
 }
 
-impl Factor for WasiFactor {
-    type RuntimeConfig = ();
-    type AppState = ();
-    type InstanceBuilder = InstanceBuilder;
+/// Helper trait to extend `InitContext` with some more `link_*_bindings`
+/// methods related to `wasmtime-wasi` and `wasmtime-wasi-io`-specific
+/// signatures.
+#[allow(clippy::type_complexity, reason = "sorry, blame alex")]
+trait InitContextExt: InitContext<WasiFactor> {
+    fn get_io(data: &mut Self::StoreData) -> IoImpl<WasiImplInner<'_>> {
+        let (state, table) = Self::get_data_with_table(data);
+        IoImpl(WasiImplInner {
+            ctx: &mut state.ctx,
+            table,
+        })
+    }
 
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
+    fn link_io_bindings(
+        &mut self,
+        add_to_linker: fn(
+            &mut wasmtime::component::Linker<Self::StoreData>,
+            fn(&mut Self::StoreData) -> IoImpl<WasiImplInner<'_>>,
+        ) -> anyhow::Result<()>,
+    ) -> anyhow::Result<()> {
+        add_to_linker(self.linker(), Self::get_io)
+    }
+
+    fn get_wasi(data: &mut Self::StoreData) -> WasiImpl<WasiImplInner<'_>> {
+        WasiImpl(Self::get_io(data))
+    }
+
+    fn link_wasi_bindings(
+        &mut self,
+        add_to_linker: fn(
+            &mut wasmtime::component::Linker<Self::StoreData>,
+            fn(&mut Self::StoreData) -> WasiImpl<WasiImplInner<'_>>,
+        ) -> anyhow::Result<()>,
+    ) -> anyhow::Result<()> {
+        add_to_linker(self.linker(), Self::get_wasi)
+    }
+
+    fn link_wasi_default_bindings<O>(
+        &mut self,
+        add_to_linker: fn(
+            &mut wasmtime::component::Linker<Self::StoreData>,
+            &O,
+            fn(&mut Self::StoreData) -> WasiImpl<WasiImplInner<'_>>,
+        ) -> anyhow::Result<()>,
+    ) -> anyhow::Result<()>
     where
-        C: InitContext<Self>,
+        O: Default,
     {
-        fn get_io<C: InitContext<WasiFactor>>(
-            data: &mut C::StoreData,
-        ) -> IoImpl<WasiImplInner<'_>> {
-            let (state, table) = C::get_data_with_table(data);
-            IoImpl(WasiImplInner {
-                ctx: &mut state.ctx,
-                table,
-            })
-        }
+        add_to_linker(self.linker(), &O::default(), Self::get_wasi)
+    }
+}
 
-        fn get_wasi<C: InitContext<WasiFactor>>(
-            data: &mut C::StoreData,
-        ) -> WasiImpl<WasiImplInner<'_>> {
-            WasiImpl(get_io::<C>(data))
-        }
+impl<T> InitContextExt for T where T: InitContext<WasiFactor> {}
+
+impl Factor for WasiFactor {
+    type RuntimeConfig = ();
+    type AppState = ();
+    type InstanceBuilder = InstanceBuilder;
 
-        let get_io = get_io::<C> as fn(&mut C::StoreData) -> IoImpl<WasiImplInner<'_>>;
-        let get_wasi = get_wasi::<C> as fn(&mut C::StoreData) -> WasiImpl<WasiImplInner<'_>>;
-        let linker = ctx.linker();
+    fn init(&mut self, ctx: &mut impl InitContext<Self>) -> anyhow::Result<()> {
         use wasmtime_wasi::bindings;
-        bindings::clocks::wall_clock::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::clocks::monotonic_clock::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::filesystem::types::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::filesystem::preopens::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::io::error::add_to_linker_get_host(linker, get_io)?;
-        bindings::io::poll::add_to_linker_get_host(linker, get_io)?;
-        bindings::io::streams::add_to_linker_get_host(linker, get_io)?;
-        bindings::random::random::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::random::insecure::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::random::insecure_seed::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::exit::add_to_linker_get_host(linker, &Default::default(), get_wasi)?;
-        bindings::cli::environment::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::stdin::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::stdout::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::stderr::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::terminal_input::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::terminal_output::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::terminal_stdin::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::terminal_stdout::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::cli::terminal_stderr::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::sockets::tcp::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::sockets::tcp_create_socket::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::sockets::udp::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::sockets::udp_create_socket::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::sockets::instance_network::add_to_linker_get_host(linker, get_wasi)?;
-        bindings::sockets::network::add_to_linker_get_host(linker, &Default::default(), get_wasi)?;
-        bindings::sockets::ip_name_lookup::add_to_linker_get_host(linker, get_wasi)?;
-
-        wasi_2023_10_18::add_to_linker(linker, get_wasi)?;
-        wasi_2023_11_10::add_to_linker(linker, get_wasi)?;
 
+        ctx.link_wasi_bindings(bindings::clocks::wall_clock::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::clocks::monotonic_clock::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::filesystem::types::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::filesystem::preopens::add_to_linker_get_host)?;
+        ctx.link_io_bindings(bindings::io::error::add_to_linker_get_host)?;
+        ctx.link_io_bindings(bindings::io::poll::add_to_linker_get_host)?;
+        ctx.link_io_bindings(bindings::io::streams::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::random::random::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::random::insecure::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::random::insecure_seed::add_to_linker_get_host)?;
+        ctx.link_wasi_default_bindings(bindings::cli::exit::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::environment::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::stdin::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::stdout::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::stderr::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::terminal_input::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::terminal_output::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::terminal_stdin::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::terminal_stdout::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::cli::terminal_stderr::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::sockets::tcp::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::sockets::tcp_create_socket::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::sockets::udp::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::sockets::udp_create_socket::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::sockets::instance_network::add_to_linker_get_host)?;
+        ctx.link_wasi_default_bindings(bindings::sockets::network::add_to_linker_get_host)?;
+        ctx.link_wasi_bindings(bindings::sockets::ip_name_lookup::add_to_linker_get_host)?;
+
+        ctx.link_wasi_bindings(wasi_2023_10_18::add_to_linker)?;
+        ctx.link_wasi_bindings(wasi_2023_11_10::add_to_linker)?;
         Ok(())
     }
 

crates/factors/src/factor.rs

@@ -28,13 +28,7 @@ pub trait Factor: Any + Sized {
     /// This will be called at most once, before any call to
     /// [`Factor::prepare`]. `InitContext` provides access to a wasmtime
     /// `Linker`, so this is where any bindgen `add_to_linker` calls go.
-    ///
-    /// The type parameter `T` here is the same as the [`wasmtime::Store`] type
-    /// parameter `T`, which will contain the [`RuntimeFactors::InstanceState`].
-    fn init<C>(&mut self, ctx: &mut C) -> anyhow::Result<()>
-    where
-        C: InitContext<Self>,
-    {
+    fn init(&mut self, ctx: &mut impl InitContext<Self>) -> anyhow::Result<()> {
         let _ = ctx;
         Ok(())
     }
@@ -79,6 +73,7 @@ pub type FactorInstanceState<F> =
 /// An InitContext is passed to [`Factor::init`], giving access to the global
 /// common [`wasmtime::component::Linker`].
 pub trait InitContext<F: Factor> {
+    /// The `T` in `Store<T>`.
     type StoreData: Send + 'static;
 
     /// Returns a mutable reference to the [`wasmtime::component::Linker`].
@@ -103,8 +98,7 @@ pub trait InitContext<F: Factor> {
             fn(&mut Self::StoreData) -> &mut FactorInstanceState<F>,
         ) -> anyhow::Result<()>,
     ) -> anyhow::Result<()> {
-        let get_data = Self::get_data;
-        add_to_linker(self.linker(), get_data)
+        add_to_linker(self.linker(), Self::get_data)
     }
 }