Remove duplicate add_to_linker calls for preview2 interfaces

prtest:all
bytecodealliance · Sep 27, 2023 · a58214f · a58214f
1 parent e9f77e1
commit a58214f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 38 deletions.
diff --git a/crates/test-programs/tests/wasi-http-components-sync.rs b/crates/test-programs/tests/wasi-http-components-sync.rs
@@ -4,9 +4,8 @@ use wasmtime::{
     Config, Engine, Store,
 };
 use wasmtime_wasi::preview2::{
-    command::sync::{add_to_linker, Command},
-    pipe::MemoryOutputPipe,
-    IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+    command::sync::Command, pipe::MemoryOutputPipe, IsATTY, Table, WasiCtx, WasiCtxBuilder,
+    WasiView,
 };
 use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
 
@@ -60,8 +59,7 @@ fn instantiate_component(
     ctx: Ctx,
 ) -> Result<(Store<Ctx>, Command), anyhow::Error> {
     let mut linker = Linker::new(&ENGINE);
-    add_to_linker(&mut linker)?;
-    wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
+    wasmtime_wasi_http::proxy::sync::add_to_linker(&mut linker)?;
 
     let mut store = Store::new(&ENGINE, ctx);
 

diff --git a/crates/test-programs/tests/wasi-http-components.rs b/crates/test-programs/tests/wasi-http-components.rs
@@ -4,9 +4,7 @@ use wasmtime::{
     Config, Engine, Store,
 };
 use wasmtime_wasi::preview2::{
-    command::{add_to_linker, Command},
-    pipe::MemoryOutputPipe,
-    IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+    command::Command, pipe::MemoryOutputPipe, IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
 };
 use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
 
@@ -60,7 +58,6 @@ async fn instantiate_component(
     ctx: Ctx,
 ) -> Result<(Store<Ctx>, Command), anyhow::Error> {
     let mut linker = Linker::new(&ENGINE);
-    add_to_linker(&mut linker)?;
     wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
 
     let mut store = Store::new(&ENGINE, ctx);

diff --git a/crates/test-programs/tests/wasi-http-proxy.rs b/crates/test-programs/tests/wasi-http-proxy.rs
@@ -59,17 +59,6 @@ async fn instantiate(component: Component, ctx: Ctx) -> Result<(Store<Ctx>, Prox
     let mut linker = Linker::new(&ENGINE);
     wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
 
-    // due to the preview1 adapter
-    preview2::bindings::filesystem::types::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::filesystem::preopens::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::environment::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::exit::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::terminal_input::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::terminal_output::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::terminal_stdin::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::terminal_stdout::add_to_linker(&mut linker, |l| l)?;
-    preview2::bindings::cli::terminal_stderr::add_to_linker(&mut linker, |l| l)?;
-
     let mut store = Store::new(&ENGINE, ctx);
 
     let (proxy, _instance) = Proxy::instantiate_async(&mut store, &component, &linker).await?;

diff --git a/crates/wasi-http/src/proxy.rs b/crates/wasi-http/src/proxy.rs
@@ -25,15 +25,9 @@ pub fn add_to_linker<T>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Resul
 where
     T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
 {
-    preview2::bindings::clocks::wall_clock::add_to_linker(l, |t| t)?;
-    preview2::bindings::clocks::monotonic_clock::add_to_linker(l, |t| t)?;
-    preview2::bindings::clocks::timezone::add_to_linker(l, |t| t)?;
-    preview2::bindings::poll::poll::add_to_linker(l, |t| t)?;
-    preview2::bindings::io::streams::add_to_linker(l, |t| t)?;
-    preview2::bindings::random::random::add_to_linker(l, |t| t)?;
-    preview2::bindings::cli::stdout::add_to_linker(l, |t| t)?;
-    preview2::bindings::cli::stderr::add_to_linker(l, |t| t)?;
-    preview2::bindings::cli::stdin::add_to_linker(l, |t| t)?;
+    // TODO: this shouldn't be required, but the adapter unconditionally pulls in all of these
+    // dependencies.
+    preview2::command::add_to_linker(l)?;
 
     bindings::http::outgoing_handler::add_to_linker(l, |t| t)?;
     bindings::http::types::add_to_linker(l, |t| t)?;
@@ -69,15 +63,9 @@ pub mod sync {
     where
         T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
     {
-        preview2::bindings::clocks::wall_clock::add_to_linker(l, |t| t)?;
-        preview2::bindings::clocks::monotonic_clock::add_to_linker(l, |t| t)?;
-        preview2::bindings::clocks::timezone::add_to_linker(l, |t| t)?;
-        preview2::bindings::io::streams::add_to_linker(l, |t| t)?;
-        preview2::bindings::random::random::add_to_linker(l, |t| t)?;
-        preview2::bindings::random::random::add_to_linker(l, |t| t)?;
-        preview2::bindings::cli::stdout::add_to_linker(l, |t| t)?;
-        preview2::bindings::cli::stderr::add_to_linker(l, |t| t)?;
-        preview2::bindings::cli::stdin::add_to_linker(l, |t| t)?;
+        // TODO: this shouldn't be required, but the adapter unconditionally pulls in all of these
+        // dependencies.
+        preview2::command::sync::add_to_linker(l)?;
 
         bindings::http::outgoing_handler::add_to_linker(l, |t| t)?;
         bindings::http::types::add_to_linker(l, |t| t)?;