From 85ffc394a77d06bea15f460c78251651d154aaae Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 13 Feb 2024 16:45:04 -0600 Subject: [PATCH] Update the cap-std family of crates (#7931) This is to get #7638 passing CI, but I wanted to separate this out from that to have it go through the queue in isolation in case any issues arise. --- Cargo.lock | 44 ++++++++++----------- Cargo.toml | 25 ++++++------ supply-chain/audits.toml | 6 +++ supply-chain/config.toml | 6 --- supply-chain/imports.lock | 81 +++++++++++++++++++++++++++++++-------- 5 files changed, 106 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32b9f103c898..600b2e2a5e97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "cap-fs-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866" +checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747" dependencies = [ "cap-primitives", "cap-std", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9" +checksum = "59ff6d3fb274292a9af283417e383afe6ded1fe66f6472d2c781216d3d80c218" dependencies = [ "cap-primitives", "cap-std", @@ -280,9 +280,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb" +checksum = "90a0b44fc796b1a84535a63753d50ba3972c4db55c7255c186f79140e63d56d0" dependencies = [ "ambient-authority", "fs-set-times", @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca" +checksum = "4327f08daac33a99bb03c54ae18c8f32c3ba31c728a33ddf683c6c6a5043de68" dependencies = [ "ambient-authority", "rand", @@ -307,9 +307,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" +checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f" dependencies = [ "cap-primitives", "io-extras", @@ -319,9 +319,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b" +checksum = "e1353421ba83c19da60726e35db0a89abef984b3be183ff6f58c5b8084fcd0c5" dependencies = [ "ambient-authority", "cap-primitives", @@ -1535,9 +1535,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "ipnet" @@ -1651,9 +1651,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libfuzzer-sys" @@ -2234,9 +2234,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.1", "errno", @@ -2535,9 +2535,9 @@ dependencies = [ [[package]] name = "system-interface" -version = "0.26.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" +checksum = "9aef1f9d4c1dbdd1cb3a63be9efd2f04d8ddbc919d46112982c76818ffc2f1a7" dependencies = [ "bitflags 2.4.1", "cap-fs-ext", @@ -2551,9 +2551,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" diff --git a/Cargo.toml b/Cargo.toml index e8eaa9b0f98b..c5802b707699 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -218,19 +218,18 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra regalloc2 = "0.9.3" # cap-std family: -target-lexicon = { version = "0.12.12", default-features = false, features = ["std"] } -cap-std = "2.0.0" -cap-rand = { version = "2.0.0", features = ["small_rng"] } -cap-fs-ext = "2.0.0" -cap-net-ext = "2.0.0" -cap-time-ext = "2.0.0" -cap-tempfile = "2.0.0" -fs-set-times = "0.20.0" -system-interface = { version = "0.26.0", features = ["cap_std_impls"] } -io-lifetimes = { version = "2.0.2", default-features = false } -io-extras = "0.18.0" -rustix = "0.38.21" -is-terminal = "0.4.0" +target-lexicon = { version = "0.12.13", default-features = false, features = ["std"] } +cap-std = "3.0.0" +cap-rand = { version = "3.0.0", features = ["small_rng"] } +cap-fs-ext = "3.0.0" +cap-net-ext = "3.0.0" +cap-time-ext = "3.0.0" +cap-tempfile = "3.0.0" +fs-set-times = "0.20.1" +system-interface = { version = "0.27.1", features = ["cap_std_impls"] } +io-lifetimes = { version = "2.0.3", default-features = false } +io-extras = "0.18.1" +rustix = "0.38.31" # wit-bindgen: wit-bindgen = { version = "0.17.0", default-features = false } diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index ee97d63d95d5..44c8bf49e803 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -1625,6 +1625,12 @@ criteria = "safe-to-deploy" delta = "0.2.149 -> 0.2.151" notes = "More new functions, types, and constants, as is usual for the `libc` crate, as well as various minor code cleanups." +[[audits.libc]] +who = "Alex Crichton " +criteria = "safe-to-deploy" +delta = "0.2.151 -> 0.2.153" +notes = "More bindings for more platforms. I have not verified that everything is exactly as-is on the platform as specified but nothing major is otherwise introduced as part of this bump." + [[audits.libfuzzer-sys]] who = "Nick Fitzgerald " criteria = "safe-to-run" diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 87a237931e51..2cc3fe8d89e8 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -76,15 +76,9 @@ audit-as-crates-io = true [policy.isle-fuzz] criteria = "safe-to-run" -[policy.wasi-cap-std-sync] -audit-as-crates-io = true - [policy.wasi-common] audit-as-crates-io = true -[policy.wasi-tokio] -audit-as-crates-io = true - [policy.wasmtime] audit-as-crates-io = true diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index fd7a42fef762..d1e9fe4ef1d4 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -487,6 +487,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-fs-ext]] +version = "3.0.0" +when = "2024-01-11" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-net-ext]] version = "2.0.1" when = "2024-01-02" @@ -494,6 +501,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-net-ext]] +version = "3.0.0" +when = "2024-01-11" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-primitives]] version = "2.0.1" when = "2024-01-02" @@ -501,6 +515,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-primitives]] +version = "3.0.0" +when = "2024-01-11" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-rand]] version = "2.0.1" when = "2024-01-02" @@ -508,6 +529,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-rand]] +version = "3.0.0" +when = "2024-01-11" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-std]] version = "2.0.1" when = "2024-01-02" @@ -515,9 +543,9 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" -[[publisher.cap-tempfile]] -version = "2.0.1" -when = "2024-01-02" +[[publisher.cap-std]] +version = "3.0.0" +when = "2024-01-11" user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" @@ -529,6 +557,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-time-ext]] +version = "3.0.0" +when = "2024-01-11" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.clap]] version = "4.3.12" when = "2023-07-14" @@ -743,6 +778,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.io-lifetimes]] +version = "2.0.3" +when = "2023-12-01" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.is-terminal]] version = "0.4.10" when = "2023-12-28" @@ -848,6 +890,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.rustix]] +version = "0.38.31" +when = "2024-02-01" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.ryu]] version = "1.0.9" when = "2021-12-12" @@ -924,6 +973,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.system-interface]] +version = "0.27.1" +when = "2024-02-13" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.target-lexicon]] version = "0.12.12" when = "2023-10-19" @@ -931,6 +987,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.target-lexicon]] +version = "0.12.13" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.termcolor]] version = "1.1.3" when = "2022-03-02" @@ -1001,24 +1064,12 @@ user-id = 189 user-login = "BurntSushi" user-name = "Andrew Gallant" -[[publisher.wasi-cap-std-sync]] -version = "17.0.0" -when = "2024-01-25" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasi-common]] version = "17.0.0" when = "2024-01-25" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasi-tokio]] -version = "17.0.0" -when = "2024-01-25" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasm-bindgen]] version = "0.2.87" when = "2023-06-12"