Update to WASI 0.2.6.

This includes two changes:

# WebAssembly/wasi-filesystem#165
Documentation update

# WebAssembly/wasi-http#139
Adds a new unstable `send-informational` function to the `response-outparam` resource. I've left this `unimplemented!()`.

Author: badeend

ci/vendor-wit.sh

@@ -37,31 +37,31 @@ make_vendor() {
 cache_dir=$(mktemp -d)
 
 make_vendor "wasi-io" "
-  io@v0.2.3
+  io@v0.2.6
 "
 
 make_vendor "wasi/src/p2" "
-  cli@v0.2.3
-  clocks@v0.2.3
-  filesystem@v0.2.3
-  io@v0.2.3
-  random@v0.2.3
-  sockets@v0.2.3
+  cli@v0.2.6
+  clocks@v0.2.6
+  filesystem@v0.2.6
+  io@v0.2.6
+  random@v0.2.6
+  sockets@v0.2.6
 "
 
 make_vendor "wasi-http" "
-  cli@v0.2.3
-  clocks@v0.2.3
-  filesystem@v0.2.3
-  io@v0.2.3
-  random@v0.2.3
-  sockets@v0.2.3
-  http@v0.2.3
+  cli@v0.2.6
+  clocks@v0.2.6
+  filesystem@v0.2.6
+  io@v0.2.6
+  random@v0.2.6
+  sockets@v0.2.6
+  http@v0.2.6
 "
 
 make_vendor "wasi-tls" "
-  io@v0.2.3
-  tls@v0.2.0-draft+d6fbdc7
+  io@v0.2.6
+  tls@v0.2.0-draft+505fc98
 "
 
 make_vendor "wasi-config" "config@f4d699b"

crates/test-programs/src/lib.rs

@@ -9,8 +9,8 @@ wit_bindgen::generate!({
         package wasmtime:test;
 
         world test {
-            include wasi:cli/imports@0.2.3;
-            include wasi:http/imports@0.2.3;
+            include wasi:cli/imports@0.2.6;
+            include wasi:http/imports@0.2.6;
             include wasi:config/imports@0.2.0-draft;
             include wasi:keyvalue/imports@0.2.0-draft;
             include wasi:tls/imports@0.2.0-draft;
@@ -34,17 +34,17 @@ pub mod proxy {
         default_bindings_module: "test_programs::proxy",
         pub_export_macro: true,
         with: {
-            "wasi:http/types@0.2.3": crate::wasi::http::types,
-            "wasi:http/outgoing-handler@0.2.3": crate::wasi::http::outgoing_handler,
-            "wasi:random/random@0.2.3": crate::wasi::random::random,
-            "wasi:io/error@0.2.3": crate::wasi::io::error,
-            "wasi:io/poll@0.2.3": crate::wasi::io::poll,
-            "wasi:io/streams@0.2.3": crate::wasi::io::streams,
-            "wasi:cli/stdout@0.2.3": crate::wasi::cli::stdout,
-            "wasi:cli/stderr@0.2.3": crate::wasi::cli::stderr,
-            "wasi:cli/stdin@0.2.3": crate::wasi::cli::stdin,
-            "wasi:clocks/monotonic-clock@0.2.3": crate::wasi::clocks::monotonic_clock,
-            "wasi:clocks/wall-clock@0.2.3": crate::wasi::clocks::wall_clock,
+            "wasi:http/types@0.2.6": crate::wasi::http::types,
+            "wasi:http/outgoing-handler@0.2.6": crate::wasi::http::outgoing_handler,
+            "wasi:random/random@0.2.6": crate::wasi::random::random,
+            "wasi:io/error@0.2.6": crate::wasi::io::error,
+            "wasi:io/poll@0.2.6": crate::wasi::io::poll,
+            "wasi:io/streams@0.2.6": crate::wasi::io::streams,
+            "wasi:cli/stdout@0.2.6": crate::wasi::cli::stdout,
+            "wasi:cli/stderr@0.2.6": crate::wasi::cli::stderr,
+            "wasi:cli/stdin@0.2.6": crate::wasi::cli::stdin,
+            "wasi:clocks/monotonic-clock@0.2.6": crate::wasi::clocks::monotonic_clock,
+            "wasi:clocks/wall-clock@0.2.6": crate::wasi::clocks::wall_clock,
         },
     });
 }

crates/wasi-http/src/bindings.rs

@@ -47,7 +47,7 @@ pub use self::generated::wasi::*;
 pub use self::generated::exports;
 
 /// Bindings to the `wasi:http/proxy` world.
-pub use self::generated::{Proxy, ProxyIndices, ProxyPre};
+pub use self::generated::{LinkOptions, Proxy, ProxyIndices, ProxyPre};
 
 /// Sync implementation of the `wasi:http/proxy` world.
 pub mod sync {

crates/wasi-http/src/lib.rs

@@ -303,10 +303,13 @@ pub fn add_only_http_to_linker_async<T>(
 where
     T: WasiHttpView + 'static,
 {
+    let options = crate::bindings::LinkOptions::default(); // FIXME: Thread through to the CLI options.
     crate::bindings::http::outgoing_handler::add_to_linker::<_, WasiHttp<T>>(l, |x| {
         WasiHttpImpl(IoImpl(x))
     })?;
-    crate::bindings::http::types::add_to_linker::<_, WasiHttp<T>>(l, |x| WasiHttpImpl(IoImpl(x)))?;
+    crate::bindings::http::types::add_to_linker::<_, WasiHttp<T>>(l, &options.into(), |x| {
+        WasiHttpImpl(IoImpl(x))
+    })?;
 
     Ok(())
 }
@@ -374,10 +377,11 @@ pub fn add_only_http_to_linker_sync<T>(l: &mut Linker<T>) -> anyhow::Result<()>
 where
     T: WasiHttpView + 'static,
 {
+    let options = crate::bindings::LinkOptions::default(); // FIXME: Thread through to the CLI options.
     crate::bindings::sync::http::outgoing_handler::add_to_linker::<_, WasiHttp<T>>(l, |x| {
         WasiHttpImpl(IoImpl(x))
     })?;
-    crate::bindings::sync::http::types::add_to_linker::<_, WasiHttp<T>>(l, |x| {
+    crate::bindings::sync::http::types::add_to_linker::<_, WasiHttp<T>>(l, &options.into(), |x| {
         WasiHttpImpl(IoImpl(x))
     })?;
 

crates/wasi-http/src/types_impl.rs

@@ -1,7 +1,7 @@
 //! Implementation for the `wasi:http/types` interface.
 
 use crate::{
-    WasiHttpImpl, WasiHttpView,
+    HttpResult, WasiHttpImpl, WasiHttpView,
     bindings::http::types::{self, Headers, Method, Scheme, StatusCode, Trailers},
     body::{HostFutureTrailers, HostIncomingBody, HostOutgoingBody, StreamContext},
     types::{
@@ -580,6 +580,15 @@ where
         let _ = resp.result.send(val);
         Ok(())
     }
+
+    fn send_informational(
+        &mut self,
+        _id: Resource<HostResponseOutparam>,
+        _status: u16,
+        _headers: Resource<Headers>,
+    ) -> HttpResult<()> {
+        unimplemented!()
+    }
 }
 
 impl<T> crate::bindings::http::types::HostIncomingResponse for WasiHttpImpl<T>

crates/wasi-http/wit/deps/cli/command.wit

@@ -1,4 +1,4 @@
-package wasi:cli@0.2.3;
+package wasi:cli@0.2.6;
 
 @since(version = 0.2.0)
 world command {

crates/wasi-http/wit/deps/cli/imports.wit

@@ -1,17 +1,17 @@
-package wasi:cli@0.2.3;
+package wasi:cli@0.2.6;
 
 @since(version = 0.2.0)
 world imports {
   @since(version = 0.2.0)
-  include wasi:clocks/imports@0.2.3;
+  include wasi:clocks/imports@0.2.6;
   @since(version = 0.2.0)
-  include wasi:filesystem/imports@0.2.3;
+  include wasi:filesystem/imports@0.2.6;
   @since(version = 0.2.0)
-  include wasi:sockets/imports@0.2.3;
+  include wasi:sockets/imports@0.2.6;
   @since(version = 0.2.0)
-  include wasi:random/imports@0.2.3;
+  include wasi:random/imports@0.2.6;
   @since(version = 0.2.0)
-  include wasi:io/imports@0.2.3;
+  include wasi:io/imports@0.2.6;
 
   @since(version = 0.2.0)
   import environment;

crates/wasi-http/wit/deps/cli/stdio.wit

@@ -1,7 +1,7 @@
 @since(version = 0.2.0)
 interface stdin {
   @since(version = 0.2.0)
-  use wasi:io/streams@0.2.3.{input-stream};
+  use wasi:io/streams@0.2.6.{input-stream};
 
   @since(version = 0.2.0)
   get-stdin: func() -> input-stream;
@@ -10,7 +10,7 @@ interface stdin {
 @since(version = 0.2.0)
 interface stdout {
   @since(version = 0.2.0)
-  use wasi:io/streams@0.2.3.{output-stream};
+  use wasi:io/streams@0.2.6.{output-stream};
 
   @since(version = 0.2.0)
   get-stdout: func() -> output-stream;
@@ -19,7 +19,7 @@ interface stdout {
 @since(version = 0.2.0)
 interface stderr {
   @since(version = 0.2.0)
-  use wasi:io/streams@0.2.3.{output-stream};
+  use wasi:io/streams@0.2.6.{output-stream};
 
   @since(version = 0.2.0)
   get-stderr: func() -> output-stream;

crates/wasi-http/wit/deps/clocks/monotonic-clock.wit

@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.3;
+package wasi:clocks@0.2.6;
 /// WASI Monotonic Clock is a clock API intended to let users measure elapsed
 /// time.
 ///
@@ -10,7 +10,7 @@ package wasi:clocks@0.2.3;
 @since(version = 0.2.0)
 interface monotonic-clock {
     @since(version = 0.2.0)
-    use wasi:io/poll@0.2.3.{pollable};
+    use wasi:io/poll@0.2.6.{pollable};
 
     /// An instant in time, in nanoseconds. An instant is relative to an
     /// unspecified initial value, and can only be compared to instances from

crates/wasi-http/wit/deps/clocks/timezone.wit

@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.3;
+package wasi:clocks@0.2.6;
 
 @unstable(feature = clocks-timezone)
 interface timezone {