From 5cfca3a13619b4732c21e09b3630d32d0227b39c Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 9 Feb 2022 15:44:56 -0800 Subject: [PATCH] Update to cap-std 0.24.1, fixing compilation on Right nightly. Other than doc updates, this just contains bytecodealliance/cap-std#235, a fix for compilation errors on Rust nightly that look like this: ``` error[E0308]: mismatched types --> cap-primitives/src/fs/via_parent/rename.rs:22:58 | 22 | let (old_dir, old_basename) = open_parent(old_start, &old_path)?; | ^^^^^^^^^ expected struct `Path`, found opaque type | ::: cap-primitives/src/rustix/fs/dir_utils.rs:67:48 | 67 | pub(crate) fn strip_dir_suffix(path: &Path) -> impl Deref + '_ { | ------------------------------ the found opaque type | = note: expected struct `Path` found opaque type `impl Deref` ``` --- Cargo.lock | 24 +++++++++++----------- crates/bench-api/Cargo.toml | 2 +- crates/c-api/Cargo.toml | 2 +- crates/test-programs/Cargo.toml | 2 +- crates/wasi-common/Cargo.toml | 4 ++-- crates/wasi-common/cap-std-sync/Cargo.toml | 8 ++++---- crates/wasi-common/tokio/Cargo.toml | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a4f522ac62f5..38a575a17c85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -269,9 +269,9 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" [[package]] name = "cap-fs-ext" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fbe6525273163d9cfea432d3f3e4edc3a52ec571f5d8ffd7ea0f95f3f3a6e9" +checksum = "71f5b22f0dc04ed3404bfae102654978bfd425c5568851a89eb4d4b8f58e9590" dependencies = [ "cap-primitives", "cap-std", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fc128b736b17903e7cdfa753073bdf27e0c6fce26bc098205128550bfc2eac" +checksum = "defd283f080043a702c362203c2646a4e0a2fff99baede1eea1416239f0af220" dependencies = [ "ambient-authority", "errno", @@ -300,9 +300,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d30bc2b78678712bab13bc0260cf6f909c40240ac9f4d0fd53a26c606665195" +checksum = "12627a93bdbbe4fb32c1ea2b2c2665ba54c49eb48f1139440ce4c6a279701461" dependencies = [ "ambient-authority", "rand 0.8.3", @@ -310,9 +310,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b8c96d0db4735e144eeb51e04fb4d6cb2477c47d023822e84a98e5cdf77881" +checksum = "7cbe56c8ed4cdf8360deb80dcced538968d3bac45e71befee65e95a0e262caf2" dependencies = [ "cap-primitives", "io-extras", @@ -323,9 +323,9 @@ dependencies = [ [[package]] name = "cap-tempfile" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2cc4af777567ad4932df16056906a0bc0c7a7b1e6d7b94e5f7e6cfc648758a" +checksum = "f92b21a6075b9e31c8eefe76c6985392a00c5cd2f2d466e45e1eba90ea029c0c" dependencies = [ "cap-std", "rand 0.8.3", @@ -334,9 +334,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad739b69f94a64b4e72840ec720ae8f65cc99a72ed979cc196def5821ead5d6" +checksum = "7a34e5a4375b768b3acaec25dd7b53bcc15c801258c43a0ef2da2027f2028e46" dependencies = [ "cap-primitives", "once_cell", diff --git a/crates/bench-api/Cargo.toml b/crates/bench-api/Cargo.toml index 9b84ca8a2897..fef31aa9c8f7 100644 --- a/crates/bench-api/Cargo.toml +++ b/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.24.0" +cap-std = "0.24.1" [dev-dependencies] wat = "1.0" diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml index 5eac1f781b3e..e431da2c8ba8 100644 --- a/crates/c-api/Cargo.toml +++ b/crates/c-api/Cargo.toml @@ -29,7 +29,7 @@ wat = { version = "1.0.36", optional = true } # Optional dependencies for the `wasi` feature wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync", optional = true } wasmtime-wasi = { path = "../wasi", optional = true } -cap-std = { version = "0.24.0", optional = true } +cap-std = { version = "0.24.1", optional = true } [features] default = ['jitdump', 'wat', 'wasi', 'cache'] diff --git a/crates/test-programs/Cargo.toml b/crates/test-programs/Cargo.toml index 8a4f1ba28097..d9c1be1ba8f6 100644 --- a/crates/test-programs/Cargo.toml +++ b/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.24.0" +cap-std = "0.24.1" tokio = { version = "1.8.0", features = ["rt-multi-thread"] } [features] diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml index 4e0c60e043a0..b22d9d959bdb 100644 --- a/crates/wasi-common/Cargo.toml +++ b/crates/wasi-common/Cargo.toml @@ -22,8 +22,8 @@ anyhow = "1.0" thiserror = "1.0" wiggle = { path = "../wiggle", default-features = false, version = "=0.34.0" } tracing = "0.1.19" -cap-std = "0.24.0" -cap-rand = "0.24.0" +cap-std = "0.24.1" +cap-rand = "0.24.1" bitflags = "1.2" [target.'cfg(unix)'.dependencies] diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml index cf3ee5846cbb..eb9bb9edbaed 100644 --- a/crates/wasi-common/cap-std-sync/Cargo.toml +++ b/crates/wasi-common/cap-std-sync/Cargo.toml @@ -15,10 +15,10 @@ include = ["src/**/*", "README.md", "LICENSE" ] wasi-common = { path = "../", version = "=0.34.0" } async-trait = "0.1" anyhow = "1.0" -cap-std = "0.24.0" -cap-fs-ext = "0.24.0" -cap-time-ext = "0.24.0" -cap-rand = "0.24.0" +cap-std = "0.24.1" +cap-fs-ext = "0.24.1" +cap-time-ext = "0.24.1" +cap-rand = "0.24.1" fs-set-times = "0.15.0" system-interface = { version = "0.20.0", features = ["cap_std_impls"] } tracing = "0.1.19" diff --git a/crates/wasi-common/tokio/Cargo.toml b/crates/wasi-common/tokio/Cargo.toml index 902dc89789ba..faea76ebf518 100644 --- a/crates/wasi-common/tokio/Cargo.toml +++ b/crates/wasi-common/tokio/Cargo.toml @@ -15,7 +15,7 @@ wasi-common = { path = "../", version = "=0.34.0" } wasi-cap-std-sync = { path = "../cap-std-sync", version = "=0.34.0" } wiggle = { path = "../../wiggle", version = "=0.34.0" } tokio = { version = "1.8.0", features = [ "rt", "fs", "time", "io-util", "net", "io-std", "rt-multi-thread"] } -cap-std = "0.24.0" +cap-std = "0.24.1" anyhow = "1" io-lifetimes = { version = "0.5.0", default-features = false } @@ -31,4 +31,4 @@ io-extras = "0.13.0" tempfile = "3.1.0" tokio = { version = "1.8.0", features = [ "macros" ] } anyhow = "1" -cap-tempfile = "0.24.0" +cap-tempfile = "0.24.1"