From bfb3dae363c0d469acf9ba5c961c50ec30e5934b Mon Sep 17 00:00:00 2001 From: Jeff Charles Date: Tue, 13 Aug 2024 10:45:19 -0400 Subject: [PATCH] Update walrus --- Cargo.lock | 23 +++----------- crates/cli/Cargo.toml | 2 +- crates/cli/src/wasm_generator/dynamic.rs | 3 +- supply-chain/config.toml | 2 +- supply-chain/imports.lock | 40 ------------------------ 5 files changed, 8 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ebfb31a4..1d80dc00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3135,9 +3135,9 @@ dependencies = [ [[package]] name = "walrus" -version = "0.20.3" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7" +checksum = "467611cafbc8a84834b77d2b4bb191fd2f5769752def8340407e924390c6883b" dependencies = [ "anyhow", "gimli 0.26.2", @@ -3145,8 +3145,8 @@ dependencies = [ "leb128", "log", "walrus-macro", - "wasm-encoder 0.29.0", - "wasmparser 0.80.2", + "wasm-encoder 0.212.0", + "wasmparser 0.212.0", ] [[package]] @@ -3247,15 +3247,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-encoder" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.201.0" @@ -3323,12 +3314,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "wasmparser" -version = "0.80.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" - [[package]] name = "wasmparser" version = "0.201.0" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 01d91768..d92c8b87 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -22,7 +22,7 @@ wasmprinter = { version = "0.212.0", optional = true } wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } wasi-common = { workspace = true } -walrus = "0.20.3" +walrus = "0.21.1" swc_core = { version = "0.96.0", features = [ "common_sourcemap", "ecma_ast", diff --git a/crates/cli/src/wasm_generator/dynamic.rs b/crates/cli/src/wasm_generator/dynamic.rs index 72f99d7b..6b4f20b4 100644 --- a/crates/cli/src/wasm_generator/dynamic.rs +++ b/crates/cli/src/wasm_generator/dynamic.rs @@ -87,7 +87,8 @@ pub fn generate( let (eval_bytecode_fn, _) = module.add_import_func(IMPORT_NAMESPACE, "eval_bytecode", eval_bytecode_type); - let (memory, _) = module.add_import_memory(IMPORT_NAMESPACE, "memory", false, 0, None); + let (memory, _) = + module.add_import_memory(IMPORT_NAMESPACE, "memory", false, false, 0, None, None); transform::add_producers_section(&mut module.producers); if no_source_compression { diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 04d3861d..2477a20b 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -713,7 +713,7 @@ version = "8.3.1" criteria = "safe-to-deploy" [[exemptions.walrus]] -version = "0.20.3" +version = "0.21.1" criteria = "safe-to-deploy" [[exemptions.walrus-macro]] diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 039c3a43..a7735803 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -662,13 +662,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-encoder]] -version = "0.29.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-encoder]] version = "0.201.0" when = "2024-02-27" @@ -687,13 +680,6 @@ when = "2024-06-27" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmparser]] -version = "0.80.2" -when = "2021-09-30" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasmparser]] version = "0.201.0" when = "2024-02-27" @@ -1172,19 +1158,6 @@ start = "2021-10-29" end = "2025-07-30" notes = "The Bytecode Alliance is the author of this crate." -[[audits.bytecode-alliance.wildcard-audits.wasm-encoder]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -user-id = 1 # Alex Crichton (alexcrichton) -start = "2020-12-11" -end = "2025-07-30" -notes = """ -This is a Bytecode Alliance authored crate maintained in the `wasm-tools` -repository of which I'm one of the primary maintainers and publishers for. -I am employed by a member of the Bytecode Alliance and plan to continue doing -so and will actively maintain this crate over time. -""" - [[audits.bytecode-alliance.wildcard-audits.wasm-encoder]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -1197,19 +1170,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. """ -[[audits.bytecode-alliance.wildcard-audits.wasmparser]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -user-id = 1 # Alex Crichton (alexcrichton) -start = "2020-07-13" -end = "2025-07-30" -notes = """ -This is a Bytecode Alliance authored crate maintained in the `wasm-tools` -repository of which I'm one of the primary maintainers and publishers for. -I am employed by a member of the Bytecode Alliance and plan to continue doing -so and will actively maintain this crate over time. -""" - [[audits.bytecode-alliance.wildcard-audits.wasmparser]] who = "Alex Crichton " criteria = "safe-to-deploy"