Update to cap-std 0.26.

This is primarily to pull in bytecodealliance/cap-std#271, the fix for bytecodealliance#4936, compilation on Rust nightly on Windows. It also updates to rustix 0.35.10, to pull in bytecodealliance/rustix#403, the fix for bytecodealliance/rustix#402, compilation on newer versions of the libc crate, which changed a public function from `unsafe` to safe. Fixes bytecodealliance#4936.
sunfishcode · Sep 21, 2022 · 0df42bd · 0df42bd
1 parent e786bda
commit 0df42bd
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ once_cell = "1.12"
 listenfd = "1.0.0"
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.35.6", features = ["mm", "param"] }
+rustix = { version = "0.35.10", features = ["mm", "param"] }
 
 [dev-dependencies]
 # depend again on wasmtime to activate its default features for tests

diff --git a/crates/bench-api/Cargo.toml b/crates/bench-api/Cargo.toml
@@ -25,7 +25,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.25.3"
+cap-std = "0.26.0"
 
 [dev-dependencies]
 wat = "1.0.45"

diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
@@ -29,7 +29,7 @@ wat = { version = "1.0.47", 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.25.3", optional = true }
+cap-std = { version = "0.26.0", optional = true }
 
 [features]
 default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation', 'memory-init-cow']

diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml
@@ -27,7 +27,7 @@ features = [
 ]
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-rustix = { version = "0.35.6", features = ["process"] }
+rustix = { version = "0.35.10", features = ["process"] }
 
 [dev-dependencies]
 filetime = "0.2.7"

diff --git a/crates/fiber/Cargo.toml b/crates/fiber/Cargo.toml
@@ -17,7 +17,7 @@ links = "wasmtime-fiber-shims"
 cfg-if = "1.0"
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.35.6", features = ["mm", "param"] }
+rustix = { version = "0.35.10", features = ["mm", "param"] }
 wasmtime-asm-macros = { version = "=2.0.0", path = "../asm-macros" }
 
 [target.'cfg(windows)'.dependencies.windows-sys]

diff --git a/crates/jit-debug/Cargo.toml b/crates/jit-debug/Cargo.toml
@@ -15,7 +15,7 @@ once_cell = {version = "1.12.0", optional = true }
 object = { version = "0.29.0", default-features = false, features = ["std", "read_core"], optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-rustix = { version = "0.35.6", features = ["mm", "param", "time"], optional = true }
+rustix = { version = "0.35.10", features = ["mm", "param", "time"], optional = true }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
@@ -34,7 +34,7 @@ features = [
 ]
 
 [target.'cfg(target_os = "linux")'.dependencies]
-rustix = { version = "0.35.6", features = ["process"] }
+rustix = { version = "0.35.10", features = ["process"] }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 ittapi = { version = "0.3.0", optional = true  }

diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -31,7 +31,7 @@ encoding_rs = { version = "0.8.31", optional = true }
 mach = "0.3.2"
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.35.6", features = ["mm"] }
+rustix = { version = "0.35.10", features = ["mm"] }
 
 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
 version = "0.36.0"

diff --git 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.47"
-cap-std = "0.25.3"
+cap-std = "0.26.0"
 tokio = { version = "1.8.0", features = ["rt-multi-thread"] }
 
 [features]

diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
@@ -22,12 +22,12 @@ anyhow = "1.0"
 thiserror = "1.0"
 wiggle = { path = "../wiggle", default-features = false, version = "=2.0.0" }
 tracing = "0.1.19"
-cap-std = "0.25.3"
-cap-rand = "0.25.3"
+cap-std = "0.26.0"
+cap-rand = "0.26.0"
 bitflags = "1.2"
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.35.6", features = ["fs"] }
+rustix = { version = "0.35.10", features = ["fs"] }
 
 [target.'cfg(windows)'.dependencies]
 io-extras = "0.15.0"

diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml
@@ -15,23 +15,23 @@ include = ["src/**/*", "README.md", "LICENSE" ]
 wasi-common = { path = "../", version = "=2.0.0" }
 async-trait = "0.1"
 anyhow = "1.0"
-cap-std = "0.25.3"
-cap-fs-ext = "0.25.3"
-cap-time-ext = "0.25.3"
-cap-rand = "0.25.3"
+cap-std = "0.26.0"
+cap-fs-ext = "0.26.0"
+cap-time-ext = "0.26.0"
+cap-rand = "0.26.0"
 fs-set-times = "0.17.0"
-system-interface = { version = "0.22.0", features = ["cap_std_impls"] }
+system-interface = { version = "0.23.0", features = ["cap_std_impls"] }
 tracing = "0.1.19"
 io-lifetimes = { version = "0.7.0", default-features = false }
 is-terminal = "0.3.0"
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.35.6", features = ["fs"] }
+rustix = { version = "0.35.10", features = ["fs"] }
 
 [target.'cfg(windows)'.dependencies]
 once_cell = "1.12.0"
 io-extras = "0.15.0"
-rustix = { version = "0.35.6", features = ["net"] }
+rustix = { version = "0.35.10", features = ["net"] }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.36.0"

diff --git a/crates/wasi-common/tokio/Cargo.toml b/crates/wasi-common/tokio/Cargo.toml
@@ -15,12 +15,12 @@ wasi-common = { path = "../", version = "=2.0.0" }
 wasi-cap-std-sync = { path = "../cap-std-sync", version = "=2.0.0" }
 wiggle = { path = "../../wiggle", version = "=2.0.0" }
 tokio = { version = "1.8.0", features = [ "rt", "fs", "time", "io-util", "net", "io-std", "rt-multi-thread"] }
-cap-std = "0.25.3"
+cap-std = "0.26.0"
 anyhow = "1"
 io-lifetimes = { version = "0.7.0", default-features = false }
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.35.6", features = ["fs"] }
+rustix = { version = "0.35.10", features = ["fs"] }
 
 [target.'cfg(windows)'.dependencies]
 io-extras = "0.15.0"
@@ -29,4 +29,4 @@ io-extras = "0.15.0"
 tempfile = "3.1.0"
 tokio = { version = "1.8.0", features = [ "macros" ] }
 anyhow = "1"
-cap-tempfile = "0.25.3"
+cap-tempfile = "0.26.0"
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -47,37 +47,37 @@ notes = "I am the author of this crate."
 [[audits.cap-fs-ext]]
 who = "Dan Gohman <dev@sunfishcode.online>"
 criteria = "safe-to-deploy"
-version = "0.25.3"
+version = "0.26.0"
 notes = "The Bytecode Alliance is the author of this crate"
 
 [[audits.cap-primitives]]
 who = "Dan Gohman <dev@sunfishcode.online>"
 criteria = "safe-to-deploy"
-version = "0.25.3"
+version = "0.26.0"
 notes = "The Bytecode Alliance is the author of this crate"
 
 [[audits.cap-rand]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
-version = "0.25.3"
+version = "0.26.0"
 notes = "The Bytecode Alliance is the author of this crate"
 
 [[audits.cap-std]]
 who = "Dan Gohman <dev@sunfishcode.online>"
 criteria = "safe-to-deploy"
-version = "0.25.3"
+version = "0.26.0"
 notes = "The Bytecode Alliance is the author of this crate"
 
 [[audits.cap-tempfile]]
 who = "Dan Gohman <dev@sunfishcode.online>"
 criteria = "safe-to-run"
-version = "0.25.3"
+version = "0.26.0"
 notes = "The Bytecode Alliance is the author of this crate"
 
 [[audits.cap-time-ext]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
-version = "0.25.3"
+version = "0.26.0"
 notes = "The Bytecode Alliance is the author of this crate."
 
 [[audits.cc]]

diff --git a/supply-chain/config.toml b/supply-chain/config.toml
@@ -787,7 +787,7 @@ version = "0.4.0"
 criteria = "safe-to-run"
 
 [[exemptions.rustix]]
-version = "0.35.6"
+version = "0.35.10"
 criteria = "safe-to-deploy"
 
 [[exemptions.rusty-fork]]