chore(deps): bump rust dependencies

tests/rust/wasm32-wasip1/BUCK

@@ -11,7 +11,7 @@ _WASI_RUST = wasi_manifest(
 _RUST_DEPS = [
     ":wasi_tests",
     "//third-party/rust:libc",
-    "//third-party/rust:wasi",
+    "//third-party/rust:wasip1",
 ]
 
 rust_library(
@@ -27,7 +27,7 @@ rust_library(
     deps = [
         "//third-party/rust:libc",
         "//third-party/rust:once_cell",
-        "//third-party/rust:wasi",
+        "//third-party/rust:wasip1",
     ],
     _cxx_toolchain = "toolchains//:rust_linker",
     _rust_toolchain = "toolchains//:rust_wasi_p1",

tests/rust/wasm32-wasip1/src/bin/big_random_buf.rs

@@ -1,3 +1,5 @@
+use wasip1 as wasi;
+
 fn test_big_random_buf() {
     let mut buf = Vec::new();
     buf.resize(1024, 0);

tests/rust/wasm32-wasip1/src/bin/clock_time_get.rs

@@ -1,3 +1,5 @@
+use wasip1 as wasi;
+
 unsafe fn test_clock_time_get() {
     // Test that clock_time_get succeeds. Even in environments where it's not
     // desirable to expose high-precision timers, it should still succeed.

tests/rust/wasm32-wasip1/src/bin/close_preopen.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_close_preopen(dir_fd: wasi::Fd) {
     let pre_fd: wasi::Fd = (libc::STDERR_FILENO + 1) as wasi::Fd;

tests/rust/wasm32-wasip1/src/bin/dangling_fd.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{TESTCONFIG, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_dangling_fd(dir_fd: wasi::Fd) {
     if TESTCONFIG.support_dangling_filesystem() {

tests/rust/wasm32-wasip1/src/bin/dangling_symlink.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{TESTCONFIG, assert_errno, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_dangling_symlink(dir_fd: wasi::Fd) {
     if TESTCONFIG.support_dangling_filesystem() {

tests/rust/wasm32-wasip1/src/bin/dir_fd_op_failures.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_fd_dir_ops(dir_fd: wasi::Fd) {
     let stat = wasi::fd_filestat_get(dir_fd).expect("failed to fdstat");

tests/rust/wasm32-wasip1/src/bin/directory_seek.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_directory_seek(dir_fd: wasi::Fd) {
     const DIR_NAME: &str = "directory_seek_dir.cleanup";

tests/rust/wasm32-wasip1/src/bin/fd_advise.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::root_directory;
+use wasip1 as wasi;
 
 unsafe fn test_fd_advise(dir_fd: wasi::Fd) {
     const FILE_NAME: &str = "fd_advise_file.cleanup";

tests/rust/wasm32-wasip1/src/bin/fd_fdstat_set_rights.rs

@@ -2,6 +2,7 @@ use std::{env, process};
 use wasi_tests::{
     assert_errno, create_tmp_dir, drop_rights, fd_get_rights, root_directory, supports_rights,
 };
+use wasip1 as wasi;
 
 const TEST_FILENAME: &'static str = "file.cleanup";
 

tests/rust/wasm32-wasip1/src/bin/fd_filestat_set.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::root_directory;
+use wasip1 as wasi;
 
 unsafe fn test_fd_filestat_set(dir_fd: wasi::Fd) {
     const FILE_NAME: &str = "fd_filestat_set_file.cleanup";

tests/rust/wasm32-wasip1/src/bin/fd_flags_set.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::root_directory;
+use wasip1 as wasi;
 
 unsafe fn test_fd_fdstat_set_flags(dir_fd: wasi::Fd) {
     const FILE_NAME: &str = "fd_flags_set_file.cleanup";

tests/rust/wasm32-wasip1/src/bin/fd_readdir.rs

@@ -1,5 +1,6 @@
 use std::{env, mem, process, slice, str};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 const BUF_LEN: usize = 256;
 

tests/rust/wasm32-wasip1/src/bin/file_allocate.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_file_allocate(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/file_pread_pwrite.rs

@@ -1,6 +1,7 @@
 use std::convert::TryInto;
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_file_pread_pwrite(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/file_seek_tell.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_file_seek_tell(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/file_truncation.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_file_truncation(dir_fd: wasi::Fd) {
     const FILENAME: &str = "test.txt";

tests/rust/wasm32-wasip1/src/bin/file_unbuffered_write.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_file_unbuffered_write(dir_fd: wasi::Fd) {
     // Create and open file for reading

tests/rust/wasm32-wasip1/src/bin/fstflags_validate.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::root_directory;
+use wasip1 as wasi;
 
 unsafe fn test_fstflags_validate(dir_fd: wasi::Fd) {
     const FILE_NAME: &str = "fstflags_validate.cleanup";

tests/rust/wasm32-wasip1/src/bin/interesting_paths.rs

@@ -1,6 +1,7 @@
 use std::{env, process};
 use wasi::path_create_directory;
 use wasi_tests::{assert_errno, create_file, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_interesting_paths(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/isatty.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_isatty(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory and test if it's a tty.

tests/rust/wasm32-wasip1/src/bin/nofollow_errors.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_nofollow_errors(dir_fd: wasi::Fd) {
     // Create a directory for the symlink to point to.

tests/rust/wasm32-wasip1/src/bin/overwrite_preopen.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_overwrite_preopen(dir_fd: wasi::Fd) {
     let pre_fd: wasi::Fd = (libc::STDERR_FILENO + 1) as wasi::Fd;

tests/rust/wasm32-wasip1/src/bin/path_exists.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_exists(dir_fd: wasi::Fd) {
     // Create a temporary directory

tests/rust/wasm32-wasip1/src/bin/path_filestat.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
     let mut fdstat = wasi::fd_fdstat_get(dir_fd).expect("fd_fdstat_get");

tests/rust/wasm32-wasip1/src/bin/path_link.rs

@@ -2,6 +2,7 @@ use std::{env, process};
 use wasi_tests::{
     TESTCONFIG, assert_errno, create_file, create_tmp_dir, root_directory, supports_rights,
 };
+use wasip1 as wasi;
 
 const TEST_RIGHTS: wasi::Rights = wasi::RIGHTS_FD_READ
     | wasi::RIGHTS_PATH_LINK_SOURCE

tests/rust/wasm32-wasip1/src/bin/path_open_create_existing.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_open_create_existing(dir_fd: wasi::Fd) {
     create_file(dir_fd, "file");

tests/rust/wasm32-wasip1/src/bin/path_open_dirfd_not_dir.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_dirfd_not_dir(dir_fd: wasi::Fd) {
     // Open a file.

tests/rust/wasm32-wasip1/src/bin/path_open_missing.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_open_missing(dir_fd: wasi::Fd) {
     assert_errno!(

tests/rust/wasm32-wasip1/src/bin/path_open_nonblock.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::root_directory;
+use wasip1 as wasi;
 
 unsafe fn try_path_open(dir_fd: wasi::Fd) {
     let _fd =

tests/rust/wasm32-wasip1/src/bin/path_open_preopen.rs

@@ -1,3 +1,4 @@
+use wasip1 as wasi;
 unsafe fn find_first_preopened_fd(path: &str) -> Result<wasi::Fd, String> {
     let max_fd = (1 << 31) - 1;
 

tests/rust/wasm32-wasip1/src/bin/path_open_read_write.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_file, root_directory};
+use wasip1 as wasi;
 
 const TEST_FILENAME: &'static str = "file.cleanup";
 

tests/rust/wasm32-wasip1/src/bin/path_rename.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{TESTCONFIG, assert_errno, create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_rename(dir_fd: wasi::Fd) {
     // First, try renaming a dir to nonexistent path

tests/rust/wasm32-wasip1/src/bin/path_rename_dir_trailing_slashes.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_rename_trailing_slashes(dir_fd: wasi::Fd) {
     // Test renaming a directory with a trailing slash in the name.

tests/rust/wasm32-wasip1/src/bin/path_symlink_trailing_slashes.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{TESTCONFIG, assert_errno, create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_symlink_trailing_slashes(dir_fd: wasi::Fd) {
     if TESTCONFIG.support_dangling_filesystem() {

tests/rust/wasm32-wasip1/src/bin/poll_oneoff_stdio.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::mem::MaybeUninit;
 use wasi_tests::{STDERR_FD, STDIN_FD, STDOUT_FD, assert_errno};
+use wasip1 as wasi;
 
 const TIMEOUT: u64 = 200_000_000u64; // 200 milliseconds, required to satisfy slow execution in CI
 const CLOCK_ID: wasi::Userdata = 0x0123_45678;

tests/rust/wasm32-wasip1/src/bin/readlink.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_readlink(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/remove_directory_trailing_slashes.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_file, root_directory};
+use wasip1 as wasi;
 
 const TEST_FILENAME: &'static str = "file.cleanup";
 const TEST_DIRNAME: &'static str = "dir.cleanup";

tests/rust/wasm32-wasip1/src/bin/remove_nonempty_directory.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_remove_nonempty_directory(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/renumber.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_renumber(dir_fd: wasi::Fd) {
     let pre_fd: wasi::Fd = (libc::STDERR_FILENO + 1) as wasi::Fd;

tests/rust/wasm32-wasip1/src/bin/sched_yield.rs

@@ -1,3 +1,4 @@
+use wasip1 as wasi;
 unsafe fn test_sched_yield() {
     wasi::sched_yield().expect("sched_yield");
 }

tests/rust/wasm32-wasip1/src/bin/stdio.rs

@@ -1,4 +1,5 @@
 use std::{env, process};
+use wasip1 as wasi;
 
 use wasi_tests::{STDERR_FD, STDIN_FD, STDOUT_FD, create_tmp_dir, root_directory};
 

tests/rust/wasm32-wasip1/src/bin/symlink_create.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn create_symlink_to_file(dir_fd: wasi::Fd) {
     // Create a directory for the symlink to point to.

tests/rust/wasm32-wasip1/src/bin/symlink_filestat.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
     let fdstat = wasi::fd_fdstat_get(dir_fd).expect("fd_fdstat_get");

tests/rust/wasm32-wasip1/src/bin/symlink_loop.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{TESTCONFIG, assert_errno, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_symlink_loop(dir_fd: wasi::Fd) {
     if TESTCONFIG.support_dangling_filesystem()

tests/rust/wasm32-wasip1/src/bin/truncation_rights.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_truncation_rights(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.

tests/rust/wasm32-wasip1/src/bin/unlink_file_trailing_slashes.rs

@@ -1,5 +1,6 @@
 use std::{env, process};
 use wasi_tests::{assert_errno, create_file, create_tmp_dir, root_directory};
+use wasip1 as wasi;
 
 unsafe fn test_unlink_file_trailing_slashes(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.

tests/rust/wasm32-wasip1/src/lib.rs

@@ -1,3 +1,4 @@
+use wasip1 as wasi;
 pub mod config;
 use once_cell::sync::Lazy;
 use wasi::path_create_directory;

tests/rust/wasm32-wasip3/src/bin/http-service.rs

@@ -40,7 +40,7 @@ impl Guest for Component {
                 .append("content-length", &bytes.len().to_string().into_bytes())
                 .unwrap();
             let (mut body_tx, body_rx) = wit_stream::new();
-            wit_bindgen::spawn(async move {
+            wit_bindgen::spawn_local(async move {
                 let remaining = body_tx.write_all(bytes).await;
                 assert!(remaining.is_empty());
                 drop(body_tx);