Update to cap-std 0.19.0 and rsix 0.22.4. (#3331)

This pulls in the s390x fix needed by #3330.

Also a small `rsix` API update; `PollFdVec` has been removed in favor of
just using `Vec<PollFd>`.

crates/bench-api/Cargo.toml

@@ -22,7 +22,7 @@ wasmtime-wasi = { path = "../wasi" }
 wasmtime-wasi-crypto = { path = "../wasi-crypto", optional = true }
 wasmtime-wasi-nn = { path = "../wasi-nn", optional = true }
 wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync" }
-cap-std = "0.18.0"
+cap-std = "0.19.0"
 
 [dev-dependencies]
 wat = "1.0"

crates/c-api/Cargo.toml

@@ -30,7 +30,7 @@ wat = { version = "1.0.36", optional = true }
 wasi-common = { path = "../wasi-common", optional = true }
 wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync", optional = true }
 wasmtime-wasi = { path = "../wasi", optional = true }
-cap-std = { version = "0.18.0", optional = true }
+cap-std = { version = "0.19.0", optional = true }
 
 [features]
 default = ['jitdump', 'wat', 'wasi', 'cache']

crates/test-programs/Cargo.toml

@@ -21,7 +21,7 @@ tempfile = "3.1.0"
 os_pipe = "0.9"
 anyhow = "1.0.19"
 wat = "1.0.37"
-cap-std = "0.18.0"
+cap-std = "0.19.0"
 tokio = { version = "1.8.0", features = ["rt-multi-thread"] }
 
 [features]

crates/wasi-common/Cargo.toml

@@ -22,13 +22,13 @@ anyhow = "1.0"
 thiserror = "1.0"
 wiggle = { path = "../wiggle", default-features = false, version = "0.29.0" }
 tracing = "0.1.19"
-cap-std = "0.18.0"
-cap-rand = "0.18.0"
+cap-std = "0.19.0"
+cap-rand = "0.19.0"
 bitflags = "1.2"
 io-lifetimes = { version = "0.3.0", default-features = false }
 
 [target.'cfg(unix)'.dependencies]
-rsix = "0.20.4"
+rsix = "0.22.4"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"

crates/wasi-common/cap-std-sync/Cargo.toml

@@ -15,18 +15,18 @@ include = ["src/**/*", "README.md", "LICENSE" ]
 wasi-common = { path = "../", version = "0.29.0" }
 async-trait = "0.1"
 anyhow = "1.0"
-cap-std = "0.18.0"
-cap-fs-ext = "0.18.0"
-cap-time-ext = "0.18.0"
-cap-rand = "0.18.0"
-fs-set-times = "0.9.0"
-system-interface = { version = "0.12.0", features = ["cap_std_impls"] }
+cap-std = "0.19.0"
+cap-fs-ext = "0.19.0"
+cap-time-ext = "0.19.0"
+cap-rand = "0.19.0"
+fs-set-times = "0.11.0"
+system-interface = { version = "0.14.0", features = ["cap_std_impls"] }
 tracing = "0.1.19"
 bitflags = "1.2"
 io-lifetimes = { version = "0.3.0", default-features = false }
 
 [target.'cfg(unix)'.dependencies]
-rsix = "0.20.4"
+rsix = "0.22.4"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"

crates/wasi-common/cap-std-sync/src/sched/unix.rs

@@ -1,6 +1,6 @@
 use cap_std::time::Duration;
 use io_lifetimes::{AsFd, BorrowedFd};
-use rsix::io::{PollFd, PollFdVec, PollFlags};
+use rsix::io::{PollFd, PollFlags};
 use std::convert::TryInto;
 use wasi_common::{
     file::WasiFile,
@@ -15,7 +15,7 @@ pub async fn poll_oneoff<'a>(poll: &mut Poll<'a>) -> Result<(), Error> {
     if poll.is_empty() {
         return Ok(());
     }
-    let mut pollfds = PollFdVec::new();
+    let mut pollfds = Vec::new();
     for s in poll.rw_subscriptions() {
         match s {
             Subscription::Read(f) => {
@@ -49,7 +49,7 @@ pub async fn poll_oneoff<'a>(poll: &mut Poll<'a>) -> Result<(), Error> {
             poll_fds = tracing::field::debug(&pollfds),
             "poll"
         );
-        match pollfds.poll(poll_timeout) {
+        match rsix::io::poll(&mut pollfds, poll_timeout) {
             Ok(ready) => break ready,
             Err(rsix::io::Error::INTR) => continue,
             Err(err) => return Err(err.into()),

crates/wasi-common/tokio/Cargo.toml

@@ -15,18 +15,18 @@ wasi-common = { path = "../", version = "0.29.0" }
 wasi-cap-std-sync = { path = "../cap-std-sync", version = "0.29.0" }
 wiggle = { path = "../../wiggle", version = "0.29.0" }
 tokio = { version = "1.8.0", features = [ "rt", "fs", "time", "io-util", "net", "io-std", "rt-multi-thread"] }
-cap-std = "0.18.0"
-cap-fs-ext = "0.18.0"
-cap-time-ext = "0.18.0"
-fs-set-times = "0.9.0"
-system-interface = { version = "0.12.0", features = ["cap_std_impls"] }
+cap-std = "0.19.0"
+cap-fs-ext = "0.19.0"
+cap-time-ext = "0.19.0"
+fs-set-times = "0.11.0"
+system-interface = { version = "0.14.0", features = ["cap_std_impls"] }
 tracing = "0.1.19"
 bitflags = "1.2"
 anyhow = "1"
 io-lifetimes = { version = "0.3.0", default-features = false }
 
 [target.'cfg(unix)'.dependencies]
-rsix = "0.20.4"
+rsix = "0.22.4"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"
@@ -36,4 +36,4 @@ lazy_static = "1.4"
 tempfile = "3.1.0"
 tokio = { version = "1.8.0", features = [ "macros" ] }
 anyhow = "1"
-cap-tempfile = "0.18.0"
+cap-tempfile = "0.19.0"