T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to cap-std 0.17.0. (#3198)

Browse Source 
This completes the posish->rsix rename, and contains a number of other
minor cleanups, including avoiding the `cstr` dependency.
This commit is contained in:
Dan Gohman
2021-08-17 16:08:03 -07:00
committed by GitHub
parent e8aa7bb53b
commit fde767fedc
9 changed files with 79 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/wasi-common/Cargo.toml
View File

@@ -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.16.0"
cap-rand = "0.16.0"
cap-std = "0.17.0"
cap-rand = "0.17.0"
bitflags = "1.2"
io-lifetimes = "0.2.0"
io-lifetimes = { version = "0.2.3", default-features = false }
[target.'cfg(unix)'.dependencies]
posish = "0.16.0"
rsix = "0.18.0"
[target.'cfg(windows)'.dependencies]
winapi = "0.3"

16
crates/wasi-common/cap-std-sync/Cargo.toml
View File

@@ -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.16.0"
cap-fs-ext = "0.16.0"
cap-time-ext = "0.16.0"
cap-rand = "0.16.0"
fs-set-times = "0.6.0"
system-interface = { version = "0.8.0", features = ["cap_std_impls"] }
cap-std = "0.17.0"
cap-fs-ext = "0.17.0"
cap-time-ext = "0.17.0"
cap-rand = "0.17.0"
fs-set-times = "0.7.0"
system-interface = { version = "0.11.0", features = ["cap_std_impls"] }
tracing = "0.1.19"
bitflags = "1.2"
io-lifetimes = "0.2.0"
io-lifetimes = { version = "0.2.3", default-features = false }
[target.'cfg(unix)'.dependencies]
posish = "0.16.0"
rsix = "0.18.0"
[target.'cfg(windows)'.dependencies]
winapi = "0.3"

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

@@ -1,6 +1,6 @@
use cap_std::time::Duration;
use io_lifetimes::{AsFd, BorrowedFd};
use posish::io::{PollFd, PollFdVec, PollFlags};
use rsix::io::{PollFd, PollFdVec, PollFlags};
use std::convert::TryInto;
use wasi_common::{
file::WasiFile,
@@ -51,7 +51,7 @@ pub async fn poll_oneoff<'a>(poll: &mut Poll<'a>) -> Result<(), Error> {
);
match pollfds.poll(poll_timeout) {
Ok(ready) => break ready,
Err(posish::io::Error::INTR) => continue,
Err(rsix::io::Error::INTR) => continue,
Err(err) => return Err(err.into()),
}
};

2
crates/wasi-common/src/snapshots/preview_1.rs
View File

@@ -112,7 +112,7 @@ impl TryFrom<std::io::Error> for types::Errno {
fn try_from(err: std::io::Error) -> Result<types::Errno, Error> {
#[cfg(unix)]
fn raw_error_code(err: &std::io::Error) -> Option<types::Errno> {
use posish::io::Error;
use rsix::io::Error;
match Error::from_io_error(err) {
Some(Error::PIPE) => Some(types::Errno::Pipe),
Some(Error::PERM) => Some(types::Errno::Perm),

16
crates/wasi-common/tokio/Cargo.toml
View File

@@ -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.16.0"
cap-fs-ext = "0.16.0"
cap-time-ext = "0.16.0"
fs-set-times = "0.6.0"
system-interface = { version = "0.8.0", features = ["cap_std_impls"] }
cap-std = "0.17.0"
cap-fs-ext = "0.17.0"
cap-time-ext = "0.17.0"
fs-set-times = "0.7.0"
system-interface = { version = "0.11.0", features = ["cap_std_impls"] }
tracing = "0.1.19"
bitflags = "1.2"
anyhow = "1"
io-lifetimes = "0.2.0"
io-lifetimes = { version = "0.2.3", default-features = false }
[target.'cfg(unix)'.dependencies]
posish = "0.16.0"
rsix = "0.18.0"
[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.16.0"
cap-tempfile = "0.17.0"