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

Update to cap-std 0.24.1, fixing compilation on Right nightly. (#3786)

Browse Source 
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<Target = Path> + '_ {
   |                                                ------------------------------ the found opaque type
   |
   = note:   expected struct `Path`
           found opaque type `impl Deref<Target = Path>`
```
This commit is contained in:
Dan Gohman
2022-02-09 16:22:05 -08:00
committed by GitHub
parent 39a52ceb4f
commit f2bf254a79
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bench-api/Cargo.toml
View File

@@ -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"

2
crates/c-api/Cargo.toml
View File

@@ -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']

2
crates/test-programs/Cargo.toml
View File

@@ -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]

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

@@ -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]

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

@@ -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"

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

@@ -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"