rustfmt

Author: sunfishcode

crates/test-programs/tests/wasi-http-components-sync.rs

@@ -4,8 +4,7 @@ use wasmtime::{
     Config, Engine, Store,
 };
 use wasmtime_wasi::preview2::{
-    command::sync::Command, pipe::MemoryOutputPipe, Table, WasiCtx, WasiCtxBuilder,
-    WasiView,
+    command::sync::Command, pipe::MemoryOutputPipe, Table, WasiCtx, WasiCtxBuilder, WasiView,
 };
 use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
 

crates/test-programs/tests/wasi-http-proxy.rs

@@ -5,7 +5,7 @@ use wasmtime::{
     Config, Engine, Store,
 };
 use wasmtime_wasi::preview2::{
-    self, pipe::MemoryOutputPipe, IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+    self, pipe::MemoryOutputPipe, Table, WasiCtx, WasiCtxBuilder, WasiView,
 };
 use wasmtime_wasi_http::{proxy::Proxy, WasiHttpCtx, WasiHttpView};
 
@@ -70,17 +70,17 @@ async fn wasi_http_proxy_tests() -> anyhow::Result<()> {
     let stdout = MemoryOutputPipe::new(4096);
     let stderr = MemoryOutputPipe::new(4096);
 
-    let mut table = Table::new();
+    let table = Table::new();
     let component = get_component("wasi_http_proxy_tests");
 
     // Create our wasi context.
     let mut builder = WasiCtxBuilder::new();
-    builder.stdout(stdout.clone(), IsATTY::No);
-    builder.stderr(stderr.clone(), IsATTY::No);
+    builder.stdout(stdout.clone());
+    builder.stderr(stderr.clone());
     for (var, val) in test_programs::wasi_tests_environment() {
         builder.env(var, val);
     }
-    let wasi = builder.build(&mut table)?;
+    let wasi = builder.build();
     let http = WasiHttpCtx;
 
     let ctx = Ctx { table, wasi, http };

crates/test-programs/wasi-http-proxy-tests/src/lib.rs

@@ -23,11 +23,11 @@ impl bindings::exports::wasi::http::incoming_handler::Guest for T {
 
         bindings::wasi::http::types::set_response_outparam(outparam, Ok(resp));
 
-        let out = bindings::wasi::http::types::outgoing_body_write(body).expect("outgoing stream");
-        bindings::wasi::io::streams::blocking_write_and_flush(out, b"hello, world!")
+        let out = body.write().expect("outgoing stream");
+        out.blocking_write_and_flush(b"hello, world!")
             .expect("writing response");
 
-        bindings::wasi::io::streams::drop_output_stream(out);
-        bindings::wasi::http::types::outgoing_body_finish(body, None);
+        drop(out);
+        body.finish(None);
     }
 }

crates/test-programs/wasi-http-tests/src/lib.rs

@@ -117,7 +117,7 @@ pub async fn request(
     // TODO: The current implementation requires this drop after the request is sent.
     // The ownership semantics are unclear in wasi-http we should clarify exactly what is
     // supposed to happen here.
-    http_types::outgoing_body_finish(outgoing_body, None);
+    outgoing_body.finish(None);
     drop(outgoing_body);
 
     let incoming_response = match http_types::future_incoming_response_get(future_response) {

crates/wasi-http/src/proxy.rs

@@ -23,7 +23,7 @@ wasmtime::component::bindgen!({
 
 pub fn add_to_linker<T>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Result<()>
 where
-    T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
+    T: WasiHttpView + preview2::WasiView + bindings::http::types::Host + Sync,
 {
     // TODO: this shouldn't be required, but the adapter unconditionally pulls in all of these
     // dependencies.
@@ -59,7 +59,7 @@ pub mod sync {
         },
     });
 
-    pub fn add_to_linker<T>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Result<()>
+    pub fn add_to_linker<T: Sync>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Result<()>
     where
         T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
     {

crates/wasi-http/src/types_impl.rs

@@ -245,7 +245,7 @@ impl<T: WasiHttpView> crate::bindings::http::types::Host for T {
     fn outgoing_request_write(
         &mut self,
         request: OutgoingRequest,
-    ) -> wasmtime::Result<Result<Resousrce<OutgoingBody>, ()>> {
+    ) -> wasmtime::Result<Result<Resource<OutgoingBody>, ()>> {
         let req = types::OutgoingRequestLens::from(request)
             .get_mut(self.table())
             .context("[outgoing_request_write] getting request")?;
@@ -541,11 +541,7 @@ impl<T: WasiHttpView> crate::bindings::http::types::HostOutgoingBody for T {
         }
     }
 
-    fn outgoing_body_finish(
-        &mut self,
-        id: Resource<OutgoingBody>,
-        ts: Option<Trailers>,
-    ) -> wasmtime::Result<()> {
+    fn finish(&mut self, id: Resource<OutgoingBody>, ts: Option<Trailers>) -> wasmtime::Result<()> {
         let mut body = self.table().delete_outgoing_body(id)?;
 
         let sender = body

crates/wasi-http/wit/deps/http/types.wit

@@ -178,12 +178,12 @@ interface types {
   resource outgoing-body {
     /// Will give the child output-stream at most once. subsequent calls will
     /// return an error.
-    write: func(this: /* borrow */ outgoing-body) -> result</* child */ output-stream>
+    write: func() -> result</* child */ output-stream>
     /// Finalize an outgoing body, optionally providing trailers. This must be
     /// called to signal that the response is complete. If the `outgoing-body` is
     /// dropped without calling `outgoing-body-finalize`, the implementation
     /// should treat the body as corrupted.
-    finish: func(this: /* own */ outgoing-body, trailers: /* own */ option<trailers>)
+    finish: func(trailers: /* own */ option<trailers>)
   }
 
   /// The following block defines a special resource type used by the

crates/wasi/wit/deps/http/types.wit

@@ -178,12 +178,12 @@ interface types {
   resource outgoing-body {
     /// Will give the child output-stream at most once. subsequent calls will
     /// return an error.
-    write: func(this: /* borrow */ outgoing-body) -> result</* child */ output-stream>
+    write: func() -> result</* child */ output-stream>
     /// Finalize an outgoing body, optionally providing trailers. This must be
     /// called to signal that the response is complete. If the `outgoing-body` is
     /// dropped without calling `outgoing-body-finalize`, the implementation
     /// should treat the body as corrupted.
-    finish: func(this: /* own */ outgoing-body, trailers: /* own */ option<trailers>)
+    finish: func(trailers: /* own */ option<trailers>)
   }
 
   /// The following block defines a special resource type used by the