diff --git a/.github/actions/install-cargo-vet/action.yml b/.github/actions/install-cargo-vet/action.yml index 7757f78956b5..0357e8ed6aa5 100644 --- a/.github/actions/install-cargo-vet/action.yml +++ b/.github/actions/install-cargo-vet/action.yml @@ -5,7 +5,7 @@ inputs: version: description: 'Version to install' required: false - default: '0.9.0' + default: '0.10.0' runs: using: composite diff --git a/Cargo.lock b/Cargo.lock index f3fa59b15917..7bec134cc7f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -586,7 +586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", - "unicode-width", + "unicode-width 0.1.9", ] [[package]] @@ -642,7 +642,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.9", "windows-sys 0.52.0", ] @@ -3427,6 +3427,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.2.3" @@ -3679,9 +3685,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" +checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" dependencies = [ "leb128", "wasmparser", @@ -3689,9 +3695,9 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af5a8e37a5e996861e1813f8de30911c47609c9ff51a7284f7dbd754dc3a9f3" +checksum = "3f3e5f5920c5abfc45573c89b07b38efdaae1515ef86f83dad12d60e50ecd62b" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -3705,9 +3711,9 @@ dependencies = [ [[package]] name = "wasm-mutate" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf7f56e470118baa73eb16a0e8dc6d2af8766b7b32d61450c7a5e4fceb150a4" +checksum = "553a9e14f4ee7b428b52a4d4b226f919231ccf59a2977dfaa0f1709905eb7578" dependencies = [ "egg", "log", @@ -3719,9 +3725,9 @@ dependencies = [ [[package]] name = "wasm-smith" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b526e4c6eed409b619960258ba5bd8a3b44dfb30c75c12fce80b750a4487fcc" +checksum = "3f7d273cf1df3c10f9067cb48796d1a6d1daa3ceb99c3f07d822e5bdeefb34f9" dependencies = [ "anyhow", "arbitrary", @@ -3785,9 +3791,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" +checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" dependencies = [ "ahash", "bitflags 2.6.0", @@ -3808,9 +3814,9 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228cdc1f30c27816da225d239ce4231f28941147d34713dee8f1fff7cb330e54" +checksum = "ae749f2c66587777ce9ad0e8c632e72c77574336b17d2f040a47cffbd92198c7" dependencies = [ "anyhow", "termcolor", @@ -4018,7 +4024,7 @@ dependencies = [ "wasmtime-wasi-threads", "wasmtime-wast", "wasmtime-wast-util", - "wast 219.0.1", + "wast 220.0.0", "wat", "windows-sys 0.59.0", "wit-component", @@ -4375,7 +4381,7 @@ dependencies = [ "anyhow", "log", "wasmtime", - "wast 219.0.1", + "wast 220.0.0", ] [[package]] @@ -4428,24 +4434,24 @@ dependencies = [ [[package]] name = "wast" -version = "219.0.1" +version = "220.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f79a9d9df79986a68689a6b40bcc8d5d40d807487b235bebc2ac69a242b54a1" +checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165" dependencies = [ "bumpalo", "leb128", "memchr", - "unicode-width", + "unicode-width 0.2.0", "wasm-encoder", ] [[package]] name = "wat" -version = "1.219.1" +version = "1.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc3cf014fb336883a411cd662f987abf6a1d2a27f2f0008616a0070bbf6bd0d" +checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3" dependencies = [ - "wast 219.0.1", + "wast 220.0.0", ] [[package]] @@ -4809,9 +4815,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e11ad55616555605a60a8b2d1d89e006c2076f46c465c892cc2c153b20d4b30" +checksum = "c966692b6d8c4bb3c1aee3313e0930f44457a5763cfffb666f814506124e4691" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -4819,9 +4825,9 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163cee59d3d5ceec0b256735f3ab0dccac434afb0ec38c406276de9c5a11e906" +checksum = "19857cff2a480fece56ea43f9199322ee5014688a3539ebf8d29ae62d75a3a1f" dependencies = [ "anyhow", "heck 0.5.0", @@ -4830,18 +4836,18 @@ dependencies = [ [[package]] name = "wit-bindgen-rt" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744845cde309b8fa32408d6fb67456449278c66ea4dcd96de29797b302721f02" +checksum = "605d5562e971a823cf5a550a9d69cb7144e9b4969a810043127175517a4e1865" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "wit-bindgen-rust" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6919521fc7807f927a739181db93100ca7ed03c29509b84d5f96b27b2e49a9a" +checksum = "6d894e599c161d71acb6a78e8ec8a609a09c2bb227de50829f5afbd03b844a69" dependencies = [ "anyhow", "heck 0.5.0", @@ -4855,9 +4861,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c967731fc5d50244d7241ecfc9302a8929db508eea3c601fbc5371b196ba38a5" +checksum = "a723cf943bba3bf34f437eb101e5a78180971e25dfb0085d80dbe4e73afb2854" dependencies = [ "anyhow", "prettyplease", @@ -4870,9 +4876,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1673163c0cb14a6a19ddbf44dd4efe6f015ec1ebb8156710ac32501f19fba2" +checksum = "73ccedf54cc65f287da268d64d2bf4f7530d2cfb2296ffbe3ad5f65567e4cf53" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -4889,9 +4895,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a86f669283257e8e424b9a4fc3518e3ade0b95deb9fbc0f93a1876be3eda598" +checksum = "5b7117ce3adc0b4354b46dc1cf3190b00b333e65243d244c613ffcc58bdec84d" dependencies = [ "anyhow", "id-arena", diff --git a/Cargo.toml b/Cargo.toml index cf7b2da6950e..d768885424c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -271,19 +271,19 @@ io-lifetimes = { version = "2.0.3", default-features = false } io-extras = "0.18.1" rustix = "0.38.31" # wit-bindgen: -wit-bindgen = { version = "0.34.0", default-features = false } -wit-bindgen-rust-macro = { version = "0.34.0", default-features = false } +wit-bindgen = { version = "0.35.0", default-features = false } +wit-bindgen-rust-macro = { version = "0.35.0", default-features = false } # wasm-tools family: -wasmparser = { version = "0.219.1", default-features = false } -wat = "1.219.1" -wast = "219.0.1" -wasmprinter = "0.219.1" -wasm-encoder = "0.219.1" -wasm-smith = "0.219.1" -wasm-mutate = "0.219.1" -wit-parser = "0.219.1" -wit-component = "0.219.1" +wasmparser = { version = "0.220.0", default-features = false } +wat = "1.220.0" +wast = "220.0.0" +wasmprinter = "0.220.0" +wasm-encoder = "0.220.0" +wasm-smith = "0.220.0" +wasm-mutate = "0.220.0" +wit-parser = "0.220.0" +wit-component = "0.220.0" # Non-Bytecode Alliance maintained dependencies: # -------------------------- diff --git a/crates/component-macro/src/bindgen.rs b/crates/component-macro/src/bindgen.rs index 9c5b7dc88cb5..b33bbc5bcb7c 100644 --- a/crates/component-macro/src/bindgen.rs +++ b/crates/component-macro/src/bindgen.rs @@ -205,7 +205,7 @@ fn parse_source( }; let (pkg, sources) = resolve.push_path(normalized_path)?; pkgs.push(pkg); - files.extend(sources); + files.extend(sources.paths().map(|p| p.to_owned())); } Ok(()) }; diff --git a/crates/fuzzing/src/oracles.rs b/crates/fuzzing/src/oracles.rs index 168c267ef49f..b66558d31a33 100644 --- a/crates/fuzzing/src/oracles.rs +++ b/crates/fuzzing/src/oracles.rs @@ -1277,7 +1277,8 @@ mod tests { | WasmFeatures::WIDE_ARITHMETIC | WasmFeatures::MEMORY64 | WasmFeatures::GC_TYPES - | WasmFeatures::CUSTOM_PAGE_SIZES; + | WasmFeatures::CUSTOM_PAGE_SIZES + | WasmFeatures::EXTENDED_CONST; // All other features that wasmparser supports, which is presumably a // superset of the features that wasm-smith supports, are listed here as diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml index 5d0818df1e80..2704e80e4d06 100644 --- a/crates/wasmtime/Cargo.toml +++ b/crates/wasmtime/Cargo.toml @@ -57,7 +57,7 @@ gimli = { workspace = true, optional = true } addr2line = { workspace = true, optional = true } semver = { workspace = true, optional = true } smallvec = { workspace = true, optional = true } -hashbrown = { workspace = true } +hashbrown = { workspace = true, features = ["ahash"] } libm = "0.2.7" bitflags = { workspace = true } diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs index 1286f264abf6..e0f8abb69dc5 100644 --- a/crates/wast/src/wast.rs +++ b/crates/wast/src/wast.rs @@ -186,7 +186,7 @@ where .iter() .map(|v| match v { WastArg::Core(v) => core::val(&mut self.store, v), - WastArg::Component(_) => bail!("expected component function, found core"), + _ => bail!("expected core function, found other other argument {v:?}"), }) .collect::>>()?; @@ -203,7 +203,7 @@ where .iter() .map(|v| match v { WastArg::Component(v) => component::val(v), - WastArg::Core(_) => bail!("expected core function, found component"), + _ => bail!("expected component function, found other argument {v:?}"), }) .collect::>>()?; @@ -347,9 +347,7 @@ where for (i, (v, e)) in values.iter().zip(results).enumerate() { let e = match e { WastRet::Core(core) => core, - WastRet::Component(_) => { - bail!("expected component value found core value") - } + _ => bail!("expected core value found other value {e:?}"), }; core::match_val(&mut self.store, v, e) .with_context(|| format!("result {i} didn't match"))?; @@ -362,10 +360,8 @@ where } for (i, (v, e)) in values.iter().zip(results).enumerate() { let e = match e { - WastRet::Core(_) => { - bail!("expected component value found core value") - } WastRet::Component(val) => val, + _ => bail!("expected component value found other value {e:?}"), }; component::match_val(e, v) .with_context(|| format!("result {i} didn't match"))?; diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index a4b0252b7d6e..a0d8ea3acb38 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -263,13 +263,6 @@ publication of this crate from CI. This repository requires all PRs are reviewed by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself. """ -[[wildcard-audits.wasm-mutate]] -who = "Nick Fitzgerald " -criteria = "safe-to-deploy" -user-id = 696 # Nick Fitzgerald (fitzgen) -start = "2022-02-17" -end = "2025-07-30" - [[wildcard-audits.wasm-mutate]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -283,6 +276,13 @@ I am employed by a member of the Bytecode Alliance and plan to continue doing so and will actively maintain this crate over time. """ +[[wildcard-audits.wasm-mutate]] +who = "Nick Fitzgerald " +criteria = "safe-to-deploy" +user-id = 696 # Nick Fitzgerald (fitzgen) +start = "2022-02-17" +end = "2025-07-30" + [[wildcard-audits.wasm-smith]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -321,13 +321,6 @@ publication of this crate from CI. This repository requires all PRs are reviewed by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself. """ -[[wildcard-audits.wasmprinter]] -who = "Nick Fitzgerald " -criteria = "safe-to-deploy" -user-id = 696 # Nick Fitzgerald (fitzgen) -start = "2021-04-28" -end = "2025-07-30" - [[wildcard-audits.wasmprinter]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -353,6 +346,13 @@ publication of this crate from CI. This repository requires all PRs are reviewed by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself. """ +[[wildcard-audits.wasmprinter]] +who = "Nick Fitzgerald " +criteria = "safe-to-deploy" +user-id = 696 # Nick Fitzgerald (fitzgen) +start = "2021-04-28" +end = "2025-07-30" + [[wildcard-audits.wasmtime]] who = "Bobby Holley " criteria = "safe-to-deploy" @@ -833,13 +833,6 @@ I am employed by a member of the Bytecode Alliance and plan to continue doing so and will actively maintain this crate over time. """ -[[wildcard-audits.wit-component]] -who = "Nick Fitzgerald " -criteria = "safe-to-deploy" -user-id = 696 # Nick Fitzgerald (fitzgen) -start = "2019-03-16" -end = "2025-07-30" - [[wildcard-audits.wit-component]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -852,6 +845,13 @@ publication of this crate from CI. This repository requires all PRs are reviewed by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself. """ +[[wildcard-audits.wit-component]] +who = "Nick Fitzgerald " +criteria = "safe-to-deploy" +user-id = 696 # Nick Fitzgerald (fitzgen) +start = "2019-03-16" +end = "2025-07-30" + [[wildcard-audits.wit-parser]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -3049,6 +3049,12 @@ throughout the ecosystem and skimming the crate shows no usage of `std::*` APIs and nothing suspicious. """ +[[audits.unicode-width]] +who = "Pat Hickey " +criteria = "safe-to-deploy" +delta = "0.1.12 -> 0.2.0" +notes = "large changes to an auto-generated table file, which contains no unsafe code. code generator is checked-in and looks sensible." + [[audits.ureq]] who = "Andrew Brown " criteria = "safe-to-deploy" @@ -3904,18 +3910,18 @@ user-id = 3618 # David Tolnay (dtolnay) start = "2019-07-23" end = "2024-07-06" -[[trusted.backtrace]] -criteria = "safe-to-deploy" -user-id = 2915 # Amanieu d'Antras (Amanieu) -start = "2023-06-29" -end = "2024-07-14" - [[trusted.backtrace]] criteria = "safe-to-deploy" user-id = 539 # Josh Stone (cuviper) start = "2024-03-21" end = "2025-09-20" +[[trusted.backtrace]] +criteria = "safe-to-deploy" +user-id = 2915 # Amanieu d'Antras (Amanieu) +start = "2023-06-29" +end = "2024-07-14" + [[trusted.bstr]] criteria = "safe-to-deploy" user-id = 189 # Andrew Gallant (BurntSushi) @@ -4276,18 +4282,18 @@ user-id = 1 # Alex Crichton (alexcrichton) start = "2019-03-04" end = "2025-02-15" -[[trusted.target-lexicon]] -criteria = "safe-to-deploy" -user-id = 6825 # Dan Gohman (sunfishcode) -start = "2019-03-06" -end = "2024-07-14" - [[trusted.target-lexicon]] criteria = "safe-to-deploy" user-id = 696 # Nick Fitzgerald (fitzgen) start = "2024-07-30" end = "2025-07-30" +[[trusted.target-lexicon]] +criteria = "safe-to-deploy" +user-id = 6825 # Dan Gohman (sunfishcode) +start = "2019-03-06" +end = "2024-07-14" + [[trusted.termcolor]] criteria = "safe-to-deploy" user-id = 189 # Andrew Gallant (BurntSushi) diff --git a/supply-chain/config.toml b/supply-chain/config.toml index ab5899e06d89..1c764cc5b298 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -2,7 +2,7 @@ # cargo-vet config file [cargo-vet] -version = "0.9" +version = "0.10" [imports.embark-studios] url = "https://raw.githubusercontent.com/EmbarkStudios/rust-ecosystem/main/audits.toml" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index e36343ff6472..26b8811c1771 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -856,6 +856,13 @@ user-id = 1139 user-login = "Manishearth" user-name = "Manish Goregaokar" +[[publisher.unicode-width]] +version = "0.1.12" +when = "2024-04-26" +user-id = 1139 +user-login = "Manishearth" +user-name = "Manish Goregaokar" + [[publisher.unicode-xid]] version = "0.2.3" when = "2022-05-02" @@ -917,21 +924,39 @@ when = "2024-10-10" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasm-encoder]] +version = "0.220.0" +when = "2024-11-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasm-metadata]] version = "0.219.1" when = "2024-10-10" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasm-metadata]] +version = "0.220.0" +when = "2024-11-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasmparser]] version = "0.219.1" when = "2024-10-10" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wasmparser]] +version = "0.220.0" +when = "2024-11-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wasmprinter]] -version = "0.219.1" -when = "2024-10-10" +version = "0.220.0" +when = "2024-11-12" user-id = 73222 user-login = "wasmtime-publish" @@ -1074,14 +1099,14 @@ user-id = 73222 user-login = "wasmtime-publish" [[publisher.wast]] -version = "219.0.1" -when = "2024-10-10" +version = "220.0.0" +when = "2024-11-12" user-id = 73222 user-login = "wasmtime-publish" [[publisher.wat]] -version = "1.219.1" -when = "2024-10-10" +version = "1.220.0" +when = "2024-11-12" user-id = 73222 user-login = "wasmtime-publish" @@ -1299,32 +1324,32 @@ user-login = "sunfishcode" user-name = "Dan Gohman" [[publisher.wit-bindgen]] -version = "0.34.0" -when = "2024-10-08" +version = "0.35.0" +when = "2024-11-13" user-id = 73222 user-login = "wasmtime-publish" [[publisher.wit-bindgen-core]] -version = "0.34.0" -when = "2024-10-08" +version = "0.35.0" +when = "2024-11-13" user-id = 73222 user-login = "wasmtime-publish" [[publisher.wit-bindgen-rt]] -version = "0.34.0" -when = "2024-10-08" +version = "0.35.0" +when = "2024-11-13" user-id = 73222 user-login = "wasmtime-publish" [[publisher.wit-bindgen-rust]] -version = "0.34.0" -when = "2024-10-08" +version = "0.35.0" +when = "2024-11-13" user-id = 73222 user-login = "wasmtime-publish" [[publisher.wit-bindgen-rust-macro]] -version = "0.34.0" -when = "2024-10-08" +version = "0.35.0" +when = "2024-11-13" user-id = 73222 user-login = "wasmtime-publish" @@ -1334,12 +1359,24 @@ when = "2024-10-10" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-component]] +version = "0.220.0" +when = "2024-11-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.wit-parser]] version = "0.219.1" when = "2024-10-10" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.wit-parser]] +version = "0.220.0" +when = "2024-11-12" +user-id = 73222 +user-login = "wasmtime-publish" + [[publisher.witx]] version = "0.9.1" when = "2021-06-22"