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>`.
This commit is contained in:
@@ -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()),
|
||||
|
||||
Reference in New Issue
Block a user