From 12316348765b45c9191c30b1ed85ce8db1707721 Mon Sep 17 00:00:00 2001 From: Charles Eckman Date: Mon, 11 Aug 2025 15:57:12 -0400 Subject: [PATCH 1/8] Upgrade Rust to 1.84, switch to version-aware resolver Per Dustin's suggestion: update to version-aware resolver in 1.84, to avoid triggering the incompatible SPDX upgrade. This should also let us bisect between 1.84 and 1.83 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 4 ++-- Cargo.toml | 2 +- cli/Cargo.toml | 1 + cli/tests/trap-test/Cargo.toml | 1 + crates/adapter/Cargo.toml | 1 + crates/adapter/byte-array-literals/Cargo.toml | 1 + lib/Cargo.toml | 1 + rust-toolchain | 2 +- test-fixtures/Cargo.toml | 1 + 10 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69eb7a4c..1a57f7c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - rust-toolchain: ["1.83"] + rust-toolchain: ["1.84"] os: [ubuntu-24.04, macos-14, windows-2022] arch: [amd64, arm64] exclude: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 066659bf..059ff882 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update --no-self-update 1.83 && rustup default 1.83 + run: rustup update --no-self-update 1.84 && rustup default 1.84 shell: bash - name: Add wasm32-wasip1 Rust target run: rustup target add wasm32-wasip1 @@ -89,7 +89,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update 1.83 && rustup default 1.83 + run: rustup update 1.84 && rustup default 1.84 shell: bash - name: Check crates can be published run: make package-check diff --git a/Cargo.toml b/Cargo.toml index 731744d7..08fca238 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "crates/adapter", "crates/adapter/byte-array-literals", ] -resolver = "2" +resolver = "3" # Exclude our integration test fixtures, which need to be compiled to wasm # (managed by the Makefile) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ad2b766d..b2f5108b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -26,6 +26,7 @@ include = [ ] # MSRV: 1.78 for wasm32-wasip1 rust-version = "1.78" +resolver = "3" [[bin]] name = "viceroy" diff --git a/cli/tests/trap-test/Cargo.toml b/cli/tests/trap-test/Cargo.toml index c4ebef70..02c829f7 100644 --- a/cli/tests/trap-test/Cargo.toml +++ b/cli/tests/trap-test/Cargo.toml @@ -6,6 +6,7 @@ authors = [] edition = "2021" license = "Apache-2.0 WITH LLVM-exception" publish = false +resolver="3" [dependencies] anyhow = "1.0.31" diff --git a/crates/adapter/Cargo.toml b/crates/adapter/Cargo.toml index 4c5866b1..810019cc 100644 --- a/crates/adapter/Cargo.toml +++ b/crates/adapter/Cargo.toml @@ -3,6 +3,7 @@ name = "viceroy-component-adapter" version = "0.0.0" edition = "2021" publish = false +resolver = "3" [dependencies] wasi = { workspace = true } diff --git a/crates/adapter/byte-array-literals/Cargo.toml b/crates/adapter/byte-array-literals/Cargo.toml index 6f27edb0..aaeb0a03 100644 --- a/crates/adapter/byte-array-literals/Cargo.toml +++ b/crates/adapter/byte-array-literals/Cargo.toml @@ -2,6 +2,7 @@ name = "byte-array-literals" version = "0.0.0" publish = false +resolver = "3" [lib] proc-macro = true diff --git a/lib/Cargo.toml b/lib/Cargo.toml index bbe730d9..7ec95e74 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -25,6 +25,7 @@ include = [ ] # MSRV: 1.82 for is_none_or rust-version = "1.82" +resolver = "3" [dependencies] anyhow = { workspace = true } diff --git a/rust-toolchain b/rust-toolchain index 74c280fb..40671b90 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.83 +1.84 diff --git a/test-fixtures/Cargo.toml b/test-fixtures/Cargo.toml index 582fa596..0dd10cf0 100644 --- a/test-fixtures/Cargo.toml +++ b/test-fixtures/Cargo.toml @@ -6,6 +6,7 @@ authors = ["Fastly"] edition = "2021" license = "Apache-2.0 WITH LLVM-exception" publish = false +resolver = "3" [dependencies] anyhow = "1.0.86" From 9b2593be147b823438fe04a4035f74217c398c1e Mon Sep 17 00:00:00 2001 From: Charles Eckman Date: Mon, 11 Aug 2025 16:19:55 -0400 Subject: [PATCH 2/8] Move up to 1.89; factor test workflow as a matrix of Rust versions --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 7 ++++--- rust-toolchain | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a57f7c7..45e39644 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - rust-toolchain: ["1.84"] + rust-toolchain: ["1.89"] os: [ubuntu-24.04, macos-14, windows-2022] arch: [amd64, arm64] exclude: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 059ff882..1eba022a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,7 @@ jobs: strategy: matrix: platform: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-14, macos-15] + rust-toolchain: ["1.89"] runs-on: ${{ matrix.platform }} env: SCCACHE_GHA_ENABLED: "true" @@ -20,7 +21,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update --no-self-update 1.84 && rustup default 1.84 + run: rustup update --no-self-update ${{ matrix.rust-toolchain }} && rustup default ${{ matrix.rust-toolchain }} shell: bash - name: Add wasm32-wasip1 Rust target run: rustup target add wasm32-wasip1 @@ -63,7 +64,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update --no-self-update 1.83 && rustup default 1.83 + run: rustup update --no-self-update ${{ matrix.rust-toolchain }} && rustup default ${{ matrix.rust-toolchain }} shell: bash - name: Add wasm32-wasip1 Rust target run: rustup target add wasm32-wasip1 @@ -89,7 +90,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update 1.84 && rustup default 1.84 + run: rustup update ${{ matrix.rust-toolchain }} && rustup default ${{ matrix.rust-toolchain }} shell: bash - name: Check crates can be published run: make package-check diff --git a/rust-toolchain b/rust-toolchain index 40671b90..93132999 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.84 +1.89 From 332657f5192638c30c96934d19661698e90d5a6c Mon Sep 17 00:00:00 2001 From: Charles Eckman Date: Mon, 11 Aug 2025 17:06:19 -0400 Subject: [PATCH 3/8] Enable debug info during execution, to see more of the trap --- lib/src/execute.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/execute.rs b/lib/src/execute.rs index e1b05628..cbd08d0c 100644 --- a/lib/src/execute.rs +++ b/lib/src/execute.rs @@ -989,7 +989,7 @@ fn configure_wasmtime( use wasmtime::{Config, InstanceAllocationStrategy, WasmBacktraceDetails}; let mut config = Config::new(); - config.debug_info(false); // Keep this disabled - wasmtime will hang if enabled + config.debug_info(true); config.wasm_backtrace_details(WasmBacktraceDetails::Enable); config.async_support(true); config.epoch_interruption(true); From e218e13c6781ba2c59b199330a1f54850ec8310d Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Tue, 12 Aug 2025 10:04:09 -0700 Subject: [PATCH 4/8] Try windows-2025 --- .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45e39644..6caea627 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: strategy: matrix: rust-toolchain: ["1.89"] - os: [ubuntu-24.04, macos-14, windows-2022] + os: [ubuntu-24.04, macos-14, windows-2025] arch: [amd64, arm64] exclude: - - os: windows-2022 + - os: windows-2025 arch: arm64 include: - os: ubuntu-24.04 @@ -22,7 +22,7 @@ jobs: - os: macos-14 name: darwin rust_abi: apple-darwin - - os: windows-2022 + - os: windows-2025 name: windows rust_abi: pc-windows-msvc extension: .exe diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1eba022a..01921868 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: test: strategy: matrix: - platform: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-14, macos-15] + platform: [ubuntu-22.04, ubuntu-24.04, windows-2025, macos-13, macos-14, macos-15] rust-toolchain: ["1.89"] runs-on: ${{ matrix.platform }} env: @@ -53,7 +53,7 @@ jobs: trap-test: strategy: matrix: - platform: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-14, macos-15] + platform: [ubuntu-22.04, ubuntu-24.04, windows-2025, macos-13, macos-14, macos-15] runs-on: ${{ matrix.platform }} env: SCCACHE_GHA_ENABLED: "true" From 4706fe5951ac58f61976a4de917abfe92c6926b2 Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Tue, 12 Aug 2025 10:40:00 -0700 Subject: [PATCH 5/8] Try `-C force-unwind-tables` --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..2b75d138 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[target.'cfg(not(target_arch = "wasm32"))'] +rustflags = [ + "-C", + "force-unwind-tables", +] From e2abe95e50e9c25af6145d755555507a03334aad Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Tue, 12 Aug 2025 11:10:22 -0700 Subject: [PATCH 6/8] Do it for wasm32 too? --- .cargo/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 2b75d138..090aad3f 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1,4 @@ -[target.'cfg(not(target_arch = "wasm32"))'] +[build] rustflags = [ "-C", "force-unwind-tables", From b87edbee3a82ae4fd1e04b6536d766e8662560e6 Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Tue, 12 Aug 2025 11:37:12 -0700 Subject: [PATCH 7/8] Update to wasmtime 26 --- Cargo.lock | 381 +++++++++++++++++---------------- Cargo.toml | 8 +- cli/tests/trap-test/Cargo.lock | 300 +++++++++++++------------- lib/src/linking.rs | 6 +- 4 files changed, 354 insertions(+), 341 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1065a618..e4d6e925 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,22 +2,13 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli 0.29.0", -] - [[package]] name = "addr2line" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.31.1", + "gimli", ] [[package]] @@ -158,7 +149,7 @@ version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.24.2", + "addr2line", "cfg-if", "libc", "miniz_oxide", @@ -239,9 +230,9 @@ checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" [[package]] name = "cap-fs-ext" -version = "3.4.3" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6323b9baffb4d6d9c65bfef3129db62b1391f7fb953fe67c0d7cb0804feb77b" +checksum = "e41cc18551193fe8fa6f15c1e3c799bc5ec9e2cfbfaa8ed46f37013e3e6c173c" dependencies = [ "cap-primitives", "cap-std", @@ -251,21 +242,21 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "3.4.3" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66022e5e076ea27041a05ebd4349022e2133e6f4977974dffd54ceb7b982e871" +checksum = "9f83833816c66c986e913b22ac887cec216ea09301802054316fc5301809702c" dependencies = [ "cap-primitives", "cap-std", - "rustix 0.38.44", + "rustix 1.0.5", "smallvec", ] [[package]] name = "cap-primitives" -version = "3.4.3" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ad0183a9659850877cefe8f5b87d564b2dd1fe78b18945813687f29c0a6878" +checksum = "0a1e394ed14f39f8bc26f59d4c0c010dbe7f0a1b9bafff451b1f98b67c8af62a" dependencies = [ "ambient-authority", "fs-set-times", @@ -273,16 +264,17 @@ dependencies = [ "io-lifetimes", "ipnet", "maybe-owned", - "rustix 0.38.44", + "rustix 1.0.5", + "rustix-linux-procfs", "windows-sys 0.59.0", "winx", ] [[package]] name = "cap-rand" -version = "3.4.3" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab78a9f6301e70c0fe5df7328adbcb9228277fdb7bab36f312fc072f505e38c2" +checksum = "0acb89ccf798a28683f00089d0630dfaceec087234eae0d308c05ddeaa941b40" dependencies = [ "ambient-authority", "rand", @@ -290,27 +282,27 @@ dependencies = [ [[package]] name = "cap-std" -version = "3.4.3" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c41814365b796ed12688026cb90a1e03236a84ccf009628f9c43c8aa3af250a" +checksum = "07c0355ca583dd58f176c3c12489d684163861ede3c9efa6fd8bba314c984189" dependencies = [ "cap-primitives", "io-extras", "io-lifetimes", - "rustix 0.38.44", + "rustix 1.0.5", ] [[package]] name = "cap-time-ext" -version = "3.4.3" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb57b71bb69b97c638ec38b477e9b33fa1c1cff0e437dd55d15c117cf17ed5dc" +checksum = "491af520b8770085daa0466978c75db90368c71896523f2464214e38359b1a5b" dependencies = [ "ambient-authority", "cap-primitives", "iana-time-zone", "once_cell", - "rustix 0.38.44", + "rustix 1.0.5", "winx", ] @@ -359,7 +351,7 @@ version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -428,18 +420,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69792bd40d21be8059f7c709f44200ded3bbd073df7eb3fa3c282b387c7ffa5b" +checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522" dependencies = [ - "cranelift-entity 0.112.3", + "cranelift-entity 0.113.1", ] [[package]] name = "cranelift-bitset" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da1eb6f7d8cdfa92f05acfae63c9a1d7a337e49ce7a2d0769c7fa03a2613a5" +checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279" dependencies = [ "serde", "serde_derive", @@ -447,9 +439,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709f5567a2bff9f06edf911a7cb5ebb091e4c81701714dc6ab574d08b4a69a0d" +checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1" dependencies = [ "bumpalo", "cranelift-bforest", @@ -457,9 +449,9 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.112.3", + "cranelift-entity 0.113.1", "cranelift-isle", - "gimli 0.29.0", + "gimli", "hashbrown 0.14.5", "log", "regalloc2", @@ -470,24 +462,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d39a6b194c069fd091ca1f17b9d86ff1a4627ccad8806095828f61989a691f" +checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f81aefad1f80ed4132ae33f40b92779eeb57edeb1e28bb24424a4098c963a2" +checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65" [[package]] name = "cranelift-control" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adbaac785ad4683c4f199686f9e15c1471f52ae2f4c013a3be039b4719db754" +checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978" dependencies = [ "arbitrary", ] @@ -500,9 +492,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b85ed43567e13782cd1b25baf42a8167ee57169a60dfd3d7307c6ca3839da0" +checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2" dependencies = [ "cranelift-bitset", "serde", @@ -511,9 +503,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8349f71373bb69c6f73992c6c1606236a66c8134e7a60e04e03fbd64b1aa7dcf" +checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5" dependencies = [ "cranelift-codegen", "log", @@ -523,37 +515,21 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a6b958ce05e0c237c8b25508012b6c644e8c37348213a8c786ba29e28cfdb" +checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667" [[package]] name = "cranelift-native" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc4acaf6894ee323ff4e9ce786bec09f0ebbe49941e8012f1c1052f1d965034" +checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de" dependencies = [ "cranelift-codegen", "libc", "target-lexicon", ] -[[package]] -name = "cranelift-wasm" -version = "0.112.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b878860895cca97454ef8d8b12bfda9d0889dd49efee175dba78d54ff8363ec2" -dependencies = [ - "cranelift-codegen", - "cranelift-entity 0.112.3", - "cranelift-frontend", - "itertools 0.12.1", - "log", - "smallvec", - "wasmparser 0.217.1", - "wasmtime-types", -] - [[package]] name = "crc32fast" version = "1.4.2" @@ -1002,21 +978,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "h2" version = "0.3.26" @@ -1055,12 +1025,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1069,9 +1033,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "http" @@ -1857,13 +1821,24 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58e5423e24c18cc840e1c98370b3993c6649cd1678b4d24318bcf0a083cbe88" +checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" dependencies = [ "cc", ] +[[package]] +name = "pulley-interpreter" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26" +dependencies = [ + "cranelift-bitset", + "log", + "sptr", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -2064,10 +2039,8 @@ checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.9.0", "errno", - "itoa", "libc", "linux-raw-sys 0.4.15", - "once_cell", "windows-sys 0.59.0", ] @@ -2084,6 +2057,16 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "rustix-linux-procfs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056" +dependencies = [ + "once_cell", + "rustix 1.0.5", +] + [[package]] name = "rustls" version = "0.21.12" @@ -3012,12 +2995,21 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.229.0" +version = "0.218.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491f7e48672d0a1efdeadf897d98ac1f45942c26c3829cb44a6b828f6f26155f" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-encoder" +version = "0.236.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ba1d491ecacb085a2552025c10a675a6fddcbd03b1fc9b36c536010ce265d2" +checksum = "3108979166ab0d3c7262d2e16a2190ffe784b2a5beb963edef154b5e8e07680b" dependencies = [ "leb128fmt", - "wasmparser 0.229.0", + "wasmparser 0.236.0", ] [[package]] @@ -3052,9 +3044,23 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.229.0" +version = "0.218.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059739c2eac26eea736389a7d6d30b41a8201490bea204d0facde19183359849" +dependencies = [ + "ahash", + "bitflags 2.9.0", + "hashbrown 0.14.5", + "indexmap", + "semver 1.0.26", + "serde", +] + +[[package]] +name = "wasmparser" +version = "0.236.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc3b1f053f5d41aa55640a1fa9b6d1b8a9e4418d118ce308d20e24ff3575a8c" +checksum = "16d1eee846a705f6f3cb9d7b9f79b54583810f1fb57a1e3aea76d1742db2e3d2" dependencies = [ "bitflags 2.9.0", "indexmap", @@ -3063,22 +3069,22 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.217.1" +version = "0.218.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c6782d7b81c01625335d252653b26ea68e835ddb4aef4cb1ed3ea40ae3a49" +checksum = "38b30ceafa77646f56747369b0f2a0296016a40b447d32e6907439f2e4bb7695" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.217.1", + "wasmparser 0.218.1", ] [[package]] name = "wasmtime" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38dbf42dc56a6fe41ccd77211ea8ec90855de05e52cd00df5a0a3bca87d6147" +checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917" dependencies = [ - "addr2line 0.22.0", + "addr2line", "anyhow", "async-trait", "bitflags 2.9.0", @@ -3087,7 +3093,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli 0.29.0", + "gimli", "hashbrown 0.14.5", "indexmap", "ittapi", @@ -3101,6 +3107,7 @@ dependencies = [ "paste", "postcard", "psm", + "pulley-interpreter", "rayon", "rustix 0.38.44", "semver 1.0.26", @@ -3110,8 +3117,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.217.1", - "wasmparser 0.217.1", + "wasm-encoder 0.218.1", + "wasmparser 0.218.1", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -3125,23 +3132,23 @@ dependencies = [ "wasmtime-versioned-export-macros", "wasmtime-winch", "wat", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-asm-macros" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e0c7f9983c2d60109a939d9ab0e0df301901085c3608e1c22c27c98390a027" +checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52eaa50abc14a9a2550d05e99e5e72d43ba75ea99cac1a440b61f1b9b87cd11" +checksum = "c7192f71e3afe32e858729454d9d90d6e927bd92427d688a9507d8220bddb256" dependencies = [ "anyhow", "base64", @@ -3153,15 +3160,15 @@ dependencies = [ "serde_derive", "sha2", "toml 0.8.20", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0929ffffaca32dd8770b56848c94056036963ca05de25fb47cac644e20262168" +checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68" dependencies = [ "anyhow", "proc-macro2", @@ -3169,51 +3176,51 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser", + "wit-parser 0.218.1", ] [[package]] name = "wasmtime-component-util" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc29d2b56629d66d2fd791d1b46471d0016e0d684ed2dc299e870d127082268" +checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad" [[package]] name = "wasmtime-cranelift" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c8af1197703f4de556a274384adf5db36a146f9892bc9607bad16881e75c80" +checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.112.3", + "cranelift-entity 0.113.1", "cranelift-frontend", "cranelift-native", - "cranelift-wasm", - "gimli 0.29.0", + "gimli", + "itertools 0.12.1", "log", "object 0.36.7", "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.217.1", + "wasmparser 0.218.1", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1b5af7bac868c5bce3b78a366a10677caacf6e6467c156301297e36ed31f3e" +checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19" dependencies = [ "anyhow", "cpp_demangle", "cranelift-bitset", - "cranelift-entity 0.112.3", - "gimli 0.29.0", + "cranelift-entity 0.113.1", + "gimli", "indexmap", "log", "object 0.36.7", @@ -3222,19 +3229,19 @@ dependencies = [ "semver 1.0.26", "serde", "serde_derive", + "smallvec", "target-lexicon", - "wasm-encoder 0.217.1", - "wasmparser 0.217.1", + "wasm-encoder 0.218.1", + "wasmparser 0.218.1", "wasmprinter", "wasmtime-component-util", - "wasmtime-types", ] [[package]] name = "wasmtime-fiber" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665ccc1bb0f28496e6fa02e94c575ee9ad6e3202c7df8591e5dda78106d5aa4a" +checksum = "77acabfbcd89a4d47ad117fb31e340c824e2f49597105402c3127457b6230995" dependencies = [ "anyhow", "cc", @@ -3242,14 +3249,14 @@ dependencies = [ "rustix 0.38.44", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-jit-debug" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106731c6ebe1d551362ee8c876d450bdc2d517988b20eb3653dc4837b1949437" +checksum = "f02a0118d471de665565ed200bc56673eaa10cc8e223dfe2cef5d50ed0d9d143" dependencies = [ "object 0.36.7", "once_cell", @@ -3259,41 +3266,27 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7314e32c624f645ad7d6b9fc3ac89eb7d2b9aa06695d6445cec087958ec27d" +checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5" dependencies = [ "anyhow", "cfg-if", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-slab" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75cba1a8cc327839f493cfc3036c9de3d077d59ab76296bc710ee5f95be5391" - -[[package]] -name = "wasmtime-types" -version = "25.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d83a7816947a4974e2380c311eacb1db009b8bad86081dc726b705603c93c7" -dependencies = [ - "anyhow", - "cranelift-entity 0.112.3", - "serde", - "serde_derive", - "smallvec", - "wasmparser 0.217.1", -] +checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6" [[package]] name = "wasmtime-versioned-export-macros" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6879a8e168aef3fe07335343b7fbede12fa494215e83322e173d4018e124a846" +checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7" dependencies = [ "proc-macro2", "quote", @@ -3302,9 +3295,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d042ea66b2834fb03b8a6968ef1a99a4b537211b00f7502a4d6a37f4eb2049b2" +checksum = "f16c8d87a45168131be6815045e6d46d7f6ddf65897c49444ab210488bce10dc" dependencies = [ "anyhow", "async-trait", @@ -3328,14 +3321,14 @@ dependencies = [ "url", "wasmtime", "wiggle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-wasi-nn" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee764a9f573b5d23ba1b8c9c6c5b4e32ec7c18ce8f61ed02937d452e0fb9feed" +checksum = "e0437bb4a6878ab49e4170c55a7d4693d27ed74ab54203dbe143fd8574d0f9b7" dependencies = [ "anyhow", "openvino", @@ -3349,16 +3342,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6baca2a919a288df653246069868b4de80f07e9679a8ef9b78ad79fc658ffd12" +checksum = "4f7a267367382ceec3e7f7ace63a63b83d86f4a680846743dead644e10f08150" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.29.0", + "gimli", "object 0.36.7", "target-lexicon", - "wasmparser 0.217.1", + "wasmparser 0.218.1", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3366,14 +3359,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f571f63ac1d532e986eb3973bbef3a45e4ae83de521a8d573b0fe0594dc9608" +checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933" dependencies = [ "anyhow", - "heck 0.4.1", + "heck", "indexmap", - "wit-parser", + "wit-parser 0.218.1", ] [[package]] @@ -3387,31 +3380,31 @@ dependencies = [ [[package]] name = "wast" -version = "229.0.0" +version = "236.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fcaff613c12225696bb163f79ca38ffb40e9300eff0ff4b8aa8b2f7eadf0d9" +checksum = "11d6b6faeab519ba6fbf9b26add41617ca6f5553f99ebc33d876e591d2f4f3c6" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width", - "wasm-encoder 0.229.0", + "wasm-encoder 0.236.0", ] [[package]] name = "wat" -version = "1.229.0" +version = "1.236.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4189bad08b70455a9e9e67dc126d2dcf91fac143a80f1046747a5dde6d4c33e0" +checksum = "cc31704322400f461f7f31a5f9190d5488aaeafb63ae69ad2b5888d2704dcb08" dependencies = [ - "wast 229.0.0", + "wast 236.0.0", ] [[package]] name = "wiggle" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8fdcd81702e0f46a8ab2ed28a5bf824aabf4a1af1673af496a020aacd0b6f9" +checksum = "b0f25588cf5ea16f56c1af13244486d50c5a2cf67cc0c4e990c665944d741546" dependencies = [ "anyhow", "async-trait", @@ -3425,12 +3418,12 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f745361f0a9071aaabd05de1bb2b782d9f0597f30d9c0f20326224902e64d5" +checksum = "28ff23bed568b335dac6a324b8b167318a0c60555199445fcc89745a5eb42452" dependencies = [ "anyhow", - "heck 0.4.1", + "heck", "proc-macro2", "quote", "shellexpand", @@ -3440,9 +3433,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbdae3574621921ed3c13325edc910388487759d10fb330f656cfc69bee38db" +checksum = "7f13be83541aa0b033ac5ec8a8b59c9a8d8b32305845b8466dd066e722cb0004" dependencies = [ "proc-macro2", "quote", @@ -3483,17 +3476,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.23.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cd1dc56c5a45d509ff06e7ca8817eaa9ec3240096f07e71915d5d528658e8a" +checksum = "07ab957fc71a36c63834b9b51cc2e087c4260d5ff810a5309ab99f7fbeb19567" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.29.0", + "gimli", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.217.1", + "wasmparser 0.218.1", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3772,8 +3765,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc9cfd3f1b4e29e9a90fe04157764f24ae396cfb8530dae5753de140e73f9e56" dependencies = [ "anyhow", - "heck 0.5.0", - "wit-parser", + "heck", + "wit-parser 0.217.1", ] [[package]] @@ -3792,7 +3785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf075ae0c89dc391f7d710d70c69bfd018c029c74a54f7ddfd0266dccc8ff0c5" dependencies = [ "anyhow", - "heck 0.5.0", + "heck", "indexmap", "prettyplease", "syn", @@ -3832,7 +3825,7 @@ dependencies = [ "wasm-encoder 0.217.1", "wasm-metadata", "wasmparser 0.217.1", - "wit-parser", + "wit-parser 0.217.1", ] [[package]] @@ -3853,6 +3846,24 @@ dependencies = [ "wasmparser 0.217.1", ] +[[package]] +name = "wit-parser" +version = "0.218.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f104473e8546f8096f1fa483d337101a98dc9525d67f4275816bcd177fe3e2be" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver 1.0.26", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.218.1", +] + [[package]] name = "witx" version = "0.9.1" diff --git a/Cargo.toml b/Cargo.toml index 08fca238..0de7256c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,10 +41,10 @@ futures = "0.3.24" url = "2.3.1" # Wasmtime dependencies -wasmtime = { version = "25.0.0", features = ["call-hook"] } -wasmtime-wasi = "25.0.0" -wasmtime-wasi-nn = "25.0.0" -wiggle = "25.0.0" +wasmtime = { version = "26.0.0", features = ["call-hook"] } +wasmtime-wasi = "26.0.0" +wasmtime-wasi-nn = "26.0.0" +wiggle = "26.0.0" wat = "1.212.0" wasmparser = "0.217.0" wasm-encoder = { version = "0.217.0", features = ["wasmparser"] } diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index b25ed0e1..8251d835 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -2,22 +2,13 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli 0.29.0", -] - [[package]] name = "addr2line" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.31.1", + "gimli", ] [[package]] @@ -173,7 +164,7 @@ version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.24.2", + "addr2line", "cfg-if", "libc", "miniz_oxide", @@ -367,7 +358,7 @@ version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -436,18 +427,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69792bd40d21be8059f7c709f44200ded3bbd073df7eb3fa3c282b387c7ffa5b" +checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522" dependencies = [ - "cranelift-entity 0.112.3", + "cranelift-entity 0.113.1", ] [[package]] name = "cranelift-bitset" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da1eb6f7d8cdfa92f05acfae63c9a1d7a337e49ce7a2d0769c7fa03a2613a5" +checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279" dependencies = [ "serde", "serde_derive", @@ -455,9 +446,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709f5567a2bff9f06edf911a7cb5ebb091e4c81701714dc6ab574d08b4a69a0d" +checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1" dependencies = [ "bumpalo", "cranelift-bforest", @@ -465,9 +456,9 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.112.3", + "cranelift-entity 0.113.1", "cranelift-isle", - "gimli 0.29.0", + "gimli", "hashbrown 0.14.5", "log", "regalloc2", @@ -478,24 +469,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d39a6b194c069fd091ca1f17b9d86ff1a4627ccad8806095828f61989a691f" +checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f81aefad1f80ed4132ae33f40b92779eeb57edeb1e28bb24424a4098c963a2" +checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65" [[package]] name = "cranelift-control" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adbaac785ad4683c4f199686f9e15c1471f52ae2f4c013a3be039b4719db754" +checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978" dependencies = [ "arbitrary", ] @@ -508,9 +499,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b85ed43567e13782cd1b25baf42a8167ee57169a60dfd3d7307c6ca3839da0" +checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2" dependencies = [ "cranelift-bitset", "serde", @@ -519,9 +510,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8349f71373bb69c6f73992c6c1606236a66c8134e7a60e04e03fbd64b1aa7dcf" +checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5" dependencies = [ "cranelift-codegen", "log", @@ -531,37 +522,21 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a6b958ce05e0c237c8b25508012b6c644e8c37348213a8c786ba29e28cfdb" +checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667" [[package]] name = "cranelift-native" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc4acaf6894ee323ff4e9ce786bec09f0ebbe49941e8012f1c1052f1d965034" +checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de" dependencies = [ "cranelift-codegen", "libc", "target-lexicon", ] -[[package]] -name = "cranelift-wasm" -version = "0.112.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b878860895cca97454ef8d8b12bfda9d0889dd49efee175dba78d54ff8363ec2" -dependencies = [ - "cranelift-codegen", - "cranelift-entity 0.112.3", - "cranelift-frontend", - "itertools 0.12.1", - "log", - "smallvec", - "wasmparser 0.217.1", - "wasmtime-types", -] - [[package]] name = "crc32fast" version = "1.4.2" @@ -991,21 +966,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "h2" version = "0.3.26" @@ -1044,12 +1013,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1812,6 +1775,17 @@ dependencies = [ "cc", ] +[[package]] +name = "pulley-interpreter" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26" +dependencies = [ + "cranelift-bitset", + "log", + "sptr", +] + [[package]] name = "quote" version = "1.0.40" @@ -2877,6 +2851,15 @@ dependencies = [ "wasmparser 0.217.1", ] +[[package]] +name = "wasm-encoder" +version = "0.218.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491f7e48672d0a1efdeadf897d98ac1f45942c26c3829cb44a6b828f6f26155f" +dependencies = [ + "leb128", +] + [[package]] name = "wasm-encoder" version = "0.229.0" @@ -2917,6 +2900,20 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.218.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059739c2eac26eea736389a7d6d30b41a8201490bea204d0facde19183359849" +dependencies = [ + "ahash", + "bitflags 2.9.0", + "hashbrown 0.14.5", + "indexmap", + "semver 1.0.26", + "serde", +] + [[package]] name = "wasmparser" version = "0.229.0" @@ -2930,22 +2927,22 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.217.1" +version = "0.218.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c6782d7b81c01625335d252653b26ea68e835ddb4aef4cb1ed3ea40ae3a49" +checksum = "38b30ceafa77646f56747369b0f2a0296016a40b447d32e6907439f2e4bb7695" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.217.1", + "wasmparser 0.218.1", ] [[package]] name = "wasmtime" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38dbf42dc56a6fe41ccd77211ea8ec90855de05e52cd00df5a0a3bca87d6147" +checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917" dependencies = [ - "addr2line 0.22.0", + "addr2line", "anyhow", "async-trait", "bitflags 2.9.0", @@ -2954,7 +2951,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli 0.29.0", + "gimli", "hashbrown 0.14.5", "indexmap", "ittapi", @@ -2968,6 +2965,7 @@ dependencies = [ "paste", "postcard", "psm", + "pulley-interpreter", "rayon", "rustix 0.38.44", "semver 1.0.26", @@ -2977,8 +2975,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.217.1", - "wasmparser 0.217.1", + "wasm-encoder 0.218.1", + "wasmparser 0.218.1", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2992,23 +2990,23 @@ dependencies = [ "wasmtime-versioned-export-macros", "wasmtime-winch", "wat", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-asm-macros" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e0c7f9983c2d60109a939d9ab0e0df301901085c3608e1c22c27c98390a027" +checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52eaa50abc14a9a2550d05e99e5e72d43ba75ea99cac1a440b61f1b9b87cd11" +checksum = "c7192f71e3afe32e858729454d9d90d6e927bd92427d688a9507d8220bddb256" dependencies = [ "anyhow", "base64", @@ -3020,15 +3018,15 @@ dependencies = [ "serde_derive", "sha2", "toml 0.8.20", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0929ffffaca32dd8770b56848c94056036963ca05de25fb47cac644e20262168" +checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68" dependencies = [ "anyhow", "proc-macro2", @@ -3036,51 +3034,51 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser", + "wit-parser 0.218.1", ] [[package]] name = "wasmtime-component-util" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc29d2b56629d66d2fd791d1b46471d0016e0d684ed2dc299e870d127082268" +checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad" [[package]] name = "wasmtime-cranelift" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c8af1197703f4de556a274384adf5db36a146f9892bc9607bad16881e75c80" +checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.112.3", + "cranelift-entity 0.113.1", "cranelift-frontend", "cranelift-native", - "cranelift-wasm", - "gimli 0.29.0", + "gimli", + "itertools 0.12.1", "log", "object", "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.217.1", + "wasmparser 0.218.1", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1b5af7bac868c5bce3b78a366a10677caacf6e6467c156301297e36ed31f3e" +checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19" dependencies = [ "anyhow", "cpp_demangle", "cranelift-bitset", - "cranelift-entity 0.112.3", - "gimli 0.29.0", + "cranelift-entity 0.113.1", + "gimli", "indexmap", "log", "object", @@ -3089,19 +3087,19 @@ dependencies = [ "semver 1.0.26", "serde", "serde_derive", + "smallvec", "target-lexicon", - "wasm-encoder 0.217.1", - "wasmparser 0.217.1", + "wasm-encoder 0.218.1", + "wasmparser 0.218.1", "wasmprinter", "wasmtime-component-util", - "wasmtime-types", ] [[package]] name = "wasmtime-fiber" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665ccc1bb0f28496e6fa02e94c575ee9ad6e3202c7df8591e5dda78106d5aa4a" +checksum = "77acabfbcd89a4d47ad117fb31e340c824e2f49597105402c3127457b6230995" dependencies = [ "anyhow", "cc", @@ -3109,14 +3107,14 @@ dependencies = [ "rustix 0.38.44", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-jit-debug" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106731c6ebe1d551362ee8c876d450bdc2d517988b20eb3653dc4837b1949437" +checksum = "f02a0118d471de665565ed200bc56673eaa10cc8e223dfe2cef5d50ed0d9d143" dependencies = [ "object", "once_cell", @@ -3126,41 +3124,27 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7314e32c624f645ad7d6b9fc3ac89eb7d2b9aa06695d6445cec087958ec27d" +checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5" dependencies = [ "anyhow", "cfg-if", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-slab" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75cba1a8cc327839f493cfc3036c9de3d077d59ab76296bc710ee5f95be5391" - -[[package]] -name = "wasmtime-types" -version = "25.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d83a7816947a4974e2380c311eacb1db009b8bad86081dc726b705603c93c7" -dependencies = [ - "anyhow", - "cranelift-entity 0.112.3", - "serde", - "serde_derive", - "smallvec", - "wasmparser 0.217.1", -] +checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6" [[package]] name = "wasmtime-versioned-export-macros" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6879a8e168aef3fe07335343b7fbede12fa494215e83322e173d4018e124a846" +checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7" dependencies = [ "proc-macro2", "quote", @@ -3169,9 +3153,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d042ea66b2834fb03b8a6968ef1a99a4b537211b00f7502a4d6a37f4eb2049b2" +checksum = "f16c8d87a45168131be6815045e6d46d7f6ddf65897c49444ab210488bce10dc" dependencies = [ "anyhow", "async-trait", @@ -3195,14 +3179,14 @@ dependencies = [ "url", "wasmtime", "wiggle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "wasmtime-wasi-nn" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee764a9f573b5d23ba1b8c9c6c5b4e32ec7c18ce8f61ed02937d452e0fb9feed" +checksum = "e0437bb4a6878ab49e4170c55a7d4693d27ed74ab54203dbe143fd8574d0f9b7" dependencies = [ "anyhow", "openvino", @@ -3216,16 +3200,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6baca2a919a288df653246069868b4de80f07e9679a8ef9b78ad79fc658ffd12" +checksum = "4f7a267367382ceec3e7f7ace63a63b83d86f4a680846743dead644e10f08150" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.29.0", + "gimli", "object", "target-lexicon", - "wasmparser 0.217.1", + "wasmparser 0.218.1", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3233,14 +3217,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f571f63ac1d532e986eb3973bbef3a45e4ae83de521a8d573b0fe0594dc9608" +checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933" dependencies = [ "anyhow", - "heck 0.4.1", + "heck", "indexmap", - "wit-parser", + "wit-parser 0.218.1", ] [[package]] @@ -3276,9 +3260,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8fdcd81702e0f46a8ab2ed28a5bf824aabf4a1af1673af496a020aacd0b6f9" +checksum = "b0f25588cf5ea16f56c1af13244486d50c5a2cf67cc0c4e990c665944d741546" dependencies = [ "anyhow", "async-trait", @@ -3292,12 +3276,12 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f745361f0a9071aaabd05de1bb2b782d9f0597f30d9c0f20326224902e64d5" +checksum = "28ff23bed568b335dac6a324b8b167318a0c60555199445fcc89745a5eb42452" dependencies = [ "anyhow", - "heck 0.4.1", + "heck", "proc-macro2", "quote", "shellexpand", @@ -3307,9 +3291,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "25.0.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbdae3574621921ed3c13325edc910388487759d10fb330f656cfc69bee38db" +checksum = "7f13be83541aa0b033ac5ec8a8b59c9a8d8b32305845b8466dd066e722cb0004" dependencies = [ "proc-macro2", "quote", @@ -3350,17 +3334,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.23.3" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cd1dc56c5a45d509ff06e7ca8817eaa9ec3240096f07e71915d5d528658e8a" +checksum = "07ab957fc71a36c63834b9b51cc2e087c4260d5ff810a5309ab99f7fbeb19567" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.29.0", + "gimli", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.217.1", + "wasmparser 0.218.1", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3657,7 +3641,7 @@ dependencies = [ "wasm-encoder 0.217.1", "wasm-metadata", "wasmparser 0.217.1", - "wit-parser", + "wit-parser 0.217.1", ] [[package]] @@ -3678,6 +3662,24 @@ dependencies = [ "wasmparser 0.217.1", ] +[[package]] +name = "wit-parser" +version = "0.218.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f104473e8546f8096f1fa483d337101a98dc9525d67f4275816bcd177fe3e2be" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver 1.0.26", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.218.1", +] + [[package]] name = "witx" version = "0.9.1" diff --git a/lib/src/linking.rs b/lib/src/linking.rs index 5ad9ecab..fdfa812d 100644 --- a/lib/src/linking.rs +++ b/lib/src/linking.rs @@ -63,9 +63,9 @@ impl wasmtime::ResourceLimiter for Limiter { fn table_growing( &mut self, - current: u32, - desired: u32, - maximum: Option, + current: usize, + desired: usize, + maximum: Option, ) -> anyhow::Result { self.internal.table_growing(current, desired, maximum) } From 13ef41b0e02a467ecc0868bdb22bd9084acb7162 Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Tue, 12 Aug 2025 11:51:17 -0700 Subject: [PATCH 8/8] Update to wasmtime 28 --- Cargo.lock | 292 ++++++++++++++++++--------------- Cargo.toml | 8 +- cli/tests/trap-test/Cargo.lock | 292 ++++++++++++++++++--------------- lib/src/component/mod.rs | 2 +- lib/wit/deps/cli/exit.wit | 13 ++ 5 files changed, 334 insertions(+), 273 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4d6e925..e631c41f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,6 +38,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "ambient-authority" version = "0.0.2" @@ -205,6 +211,9 @@ name = "bumpalo" version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +dependencies = [ + "allocator-api2", +] [[package]] name = "byte-array-literals" @@ -420,18 +429,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522" +checksum = "88c1d02b72b6c411c0a2e92b25ed791ad5d071184193c08a34aa0fdcdf000b72" dependencies = [ - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", ] [[package]] name = "cranelift-bitset" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279" +checksum = "720b93bd86ebbb23ebfb2db1ed44d54b2ecbdbb2d034d485bc64aa605ee787ab" dependencies = [ "serde", "serde_derive", @@ -439,9 +448,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1" +checksum = "aed3d2d9914d30b460eedd7fd507720203023997bef71452ce84873f9c93537c" dependencies = [ "bumpalo", "cranelift-bforest", @@ -449,37 +458,38 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", "cranelift-isle", "gimli", "hashbrown 0.14.5", "log", "regalloc2", "rustc-hash", + "serde", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082" +checksum = "888c188d32263ec9e048873ff0b68c700933600d553f4412417916828be25f8e" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65" +checksum = "4ddd5f4114d04ce7e073dd74e2ad16541fc61970726fcc8b2d5644a154ee4127" [[package]] name = "cranelift-control" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978" +checksum = "92cc4c98d6a4256a1600d93ccd3536f3e77da9b4ca2c279de786ac22876e67d6" dependencies = [ "arbitrary", ] @@ -492,9 +502,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2" +checksum = "760af4b5e051b5f82097a27274b917e3751736369fa73660513488248d27f23d" dependencies = [ "cranelift-bitset", "serde", @@ -503,9 +513,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5" +checksum = "c0bf77ec0f470621655ec7539860b5c620d4f91326654ab21b075b83900f8831" dependencies = [ "cranelift-codegen", "log", @@ -515,15 +525,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667" +checksum = "4b665d0a6932c421620be184f9fc7f7adaf1b0bc2fa77bb7ac5177c49abf645b" [[package]] name = "cranelift-native" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de" +checksum = "bb2e75d1bd43dfec10924798f15e6474f1dbf63b0024506551aa19394dbe72ab" dependencies = [ "cranelift-codegen", "libc", @@ -695,16 +705,26 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "env_filter" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] @@ -1023,6 +1043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "foldhash", + "serde", ] [[package]] @@ -1031,12 +1052,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" - [[package]] name = "http" version = "0.2.12" @@ -1082,12 +1097,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" - [[package]] name = "hyper" version = "0.14.26" @@ -1314,17 +1323,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "is-terminal" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -1375,6 +1373,30 @@ dependencies = [ "cc", ] +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "jobserver" version = "0.1.33" @@ -1627,9 +1649,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openvino" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fccecf8cfd130d6a4cd7198b980909714e2fdea60a96e1692fc3a8f9987dc8" +checksum = "8f03a664ab0b6917131f5c1a787795fa4d19ad6a334caf9c96284453abdf23fd" dependencies = [ "openvino-finder", "openvino-sys", @@ -1637,9 +1659,9 @@ dependencies = [ [[package]] name = "openvino-finder" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03720ab039bd133362bb9767c6bd586ea4d0168adb01bc9f695f03c2422fdfa1" +checksum = "34d6bbb3e00d9ad3cd60bca1341665a9cfb2b6764df37c58d921627368ae32fc" dependencies = [ "cfg-if", "log", @@ -1647,9 +1669,9 @@ dependencies = [ [[package]] name = "openvino-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d70e8103d2b9b52236efd8d785ef5fed04963ebfcfd7fbfa35aeea9d7d79f92" +checksum = "04315994236727c3573f7e8d8bf857e93ff373ee2e063f08aa78aceac58e3bc5" dependencies = [ "env_logger", "libloading", @@ -1748,6 +1770,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "postcard" version = "1.1.1" @@ -1830,9 +1861,9 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26" +checksum = "8324e531de91a3c25021a30fb7862d39cc516b61fbb801176acb5ff279ea887b" dependencies = [ "cranelift-bitset", "log", @@ -1941,14 +1972,15 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" +checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a" dependencies = [ - "hashbrown 0.14.5", + "allocator-api2", + "bumpalo", + "hashbrown 0.15.2", "log", "rustc-hash", - "slice-group-by", "smallvec", ] @@ -2340,12 +2372,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - [[package]] name = "smallvec" version = "1.15.0" @@ -2995,11 +3021,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491f7e48672d0a1efdeadf897d98ac1f45942c26c3829cb44a6b828f6f26155f" +checksum = "dc8444fe4920de80a4fe5ab564fff2ae58b6b73166b89751f8c6c93509da32e5" dependencies = [ "leb128", + "wasmparser 0.221.3", ] [[package]] @@ -3044,13 +3071,12 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059739c2eac26eea736389a7d6d30b41a8201490bea204d0facde19183359849" +checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185" dependencies = [ - "ahash", "bitflags 2.9.0", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "indexmap", "semver 1.0.26", "serde", @@ -3069,20 +3095,20 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b30ceafa77646f56747369b0f2a0296016a40b447d32e6907439f2e4bb7695" +checksum = "7343c42a97f2926c7819ff81b64012092ae954c5d83ddd30c9fcdefd97d0b283" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.218.1", + "wasmparser 0.221.3", ] [[package]] name = "wasmtime" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917" +checksum = "edd30973c65eceb0f37dfcc430d83abd5eb24015fdfcab6912f52949287e04f0" dependencies = [ "addr2line", "anyhow", @@ -3117,8 +3143,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.218.1", - "wasmparser 0.218.1", + "wasm-encoder 0.221.3", + "wasmparser 0.221.3", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -3137,18 +3163,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812" +checksum = "c6c21dd30d1f3f93ee390ac1a7ec304ecdbfdab6390e1add41a1f52727b0992b" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7192f71e3afe32e858729454d9d90d6e927bd92427d688a9507d8220bddb256" +checksum = "cabd563cfbfe75c5bf514081f624ca8d18391a37520d8c794abce702474e688c" dependencies = [ "anyhow", "base64", @@ -3166,9 +3192,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68" +checksum = "9f948a6ef3119d52c9f12936970de28ddf3f9bea04bc65571f4a92d2e5ab38f4" dependencies = [ "anyhow", "proc-macro2", @@ -3176,26 +3202,26 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.218.1", + "wit-parser 0.221.3", ] [[package]] name = "wasmtime-component-util" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad" +checksum = "b9275aa01ceaaa2fa6c0ecaa5267518d80b9d6e9ae7c7ea42f4c6e073e6a69ef" [[package]] name = "wasmtime-cranelift" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f" +checksum = "0701a44a323267aae4499672dae422b266cee3135a23b640972ec8c0e10a44a2" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", "cranelift-frontend", "cranelift-native", "gimli", @@ -3205,21 +3231,21 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.218.1", + "wasmparser 0.221.3", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19" +checksum = "264c968c1b81d340355ece2be0bc31a10f567ccb6ce08512c3b7d10e26f3cbe5" dependencies = [ "anyhow", "cpp_demangle", "cranelift-bitset", - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", "gimli", "indexmap", "log", @@ -3231,17 +3257,17 @@ dependencies = [ "serde_derive", "smallvec", "target-lexicon", - "wasm-encoder 0.218.1", - "wasmparser 0.218.1", + "wasm-encoder 0.221.3", + "wasmparser 0.221.3", "wasmprinter", "wasmtime-component-util", ] [[package]] name = "wasmtime-fiber" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77acabfbcd89a4d47ad117fb31e340c824e2f49597105402c3127457b6230995" +checksum = "78505221fd5bd7b07b4e1fa2804edea49dc231e626ad6861adc8f531812973e6" dependencies = [ "anyhow", "cc", @@ -3254,21 +3280,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02a0118d471de665565ed200bc56673eaa10cc8e223dfe2cef5d50ed0d9d143" +checksum = "0cec0a8e5620ae71bfcaaec78e3076be5b6ebf869f4e6191925d73242224a915" dependencies = [ "object 0.36.7", - "once_cell", "rustix 0.38.44", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5" +checksum = "9bedb677ca1b549d98f95e9e1f9251b460090d99a2c196a0614228c064bf2e59" dependencies = [ "anyhow", "cfg-if", @@ -3278,15 +3303,15 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6" +checksum = "564905638c132c275d365c1fa074f0b499790568f43148d29de84ccecfb5cb31" [[package]] name = "wasmtime-versioned-export-macros" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7" +checksum = "1e91092e6cf77390eeccee273846a9327f3e8f91c3c6280f60f37809f0e62d29" dependencies = [ "proc-macro2", "quote", @@ -3295,9 +3320,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16c8d87a45168131be6815045e6d46d7f6ddf65897c49444ab210488bce10dc" +checksum = "1a8e04b9a4c68ad018b330a4f4914b82b01dc3582d715ce21a93564c7f26b19f" dependencies = [ "anyhow", "async-trait", @@ -3312,7 +3337,6 @@ dependencies = [ "futures", "io-extras", "io-lifetimes", - "once_cell", "rustix 0.38.44", "system-interface", "thiserror", @@ -3326,9 +3350,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-nn" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0437bb4a6878ab49e4170c55a7d4693d27ed74ab54203dbe143fd8574d0f9b7" +checksum = "affd292b0b0ef3872a0e702e862d2046e3eb4b1e9b311d67faa2bfaa9155cc25" dependencies = [ "anyhow", "openvino", @@ -3342,16 +3366,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7a267367382ceec3e7f7ace63a63b83d86f4a680846743dead644e10f08150" +checksum = "b111d909dc604c741bd8ac2f4af373eaa5c68c34b5717271bcb687688212cef8" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object 0.36.7", "target-lexicon", - "wasmparser 0.218.1", + "wasmparser 0.221.3", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3359,14 +3383,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933" +checksum = "5f38f7a5eb2f06f53fe943e7fb8bf4197f7cf279f1bc52c0ce56e9d3ffd750a4" dependencies = [ "anyhow", "heck", "indexmap", - "wit-parser 0.218.1", + "wit-parser 0.221.3", ] [[package]] @@ -3402,9 +3426,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f25588cf5ea16f56c1af13244486d50c5a2cf67cc0c4e990c665944d741546" +checksum = "3b23e3dc273d1e35cab9f38a5f76487aeeedcfa6a3fb594e209ee7b6f8b41dcc" dependencies = [ "anyhow", "async-trait", @@ -3418,9 +3442,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ff23bed568b335dac6a324b8b167318a0c60555199445fcc89745a5eb42452" +checksum = "8738c5a7ef3a9de0fae10f8b84091a2aa4e059d8fef23de202ab689812b6bc6e" dependencies = [ "anyhow", "heck", @@ -3433,9 +3457,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f13be83541aa0b033ac5ec8a8b59c9a8d8b32305845b8466dd066e722cb0004" +checksum = "e882267ac583e013a38a5aaeb83a49b219456ba3aa6e6772440f7213b176e8ff" dependencies = [ "proc-macro2", "quote", @@ -3476,9 +3500,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ab957fc71a36c63834b9b51cc2e087c4260d5ff810a5309ab99f7fbeb19567" +checksum = "6232f40a795be2ce10fc761ed3b403825126a60d12491ac556ea104a932fd18a" dependencies = [ "anyhow", "cranelift-codegen", @@ -3486,7 +3510,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.218.1", + "wasmparser 0.221.3", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3848,9 +3872,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104473e8546f8096f1fa483d337101a98dc9525d67f4275816bcd177fe3e2be" +checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac" dependencies = [ "anyhow", "id-arena", @@ -3861,7 +3885,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.218.1", + "wasmparser 0.221.3", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0de7256c..df5fbc03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,10 +41,10 @@ futures = "0.3.24" url = "2.3.1" # Wasmtime dependencies -wasmtime = { version = "26.0.0", features = ["call-hook"] } -wasmtime-wasi = "26.0.0" -wasmtime-wasi-nn = "26.0.0" -wiggle = "26.0.0" +wasmtime = { version = "28.0.0", features = ["call-hook"] } +wasmtime-wasi = "28.0.0" +wasmtime-wasi-nn = "28.0.0" +wiggle = "28.0.0" wat = "1.212.0" wasmparser = "0.217.0" wasm-encoder = { version = "0.217.0", features = ["wasmparser"] } diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index 8251d835..5038f44b 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -38,6 +38,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "ambient-authority" version = "0.0.2" @@ -205,6 +211,9 @@ name = "bumpalo" version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +dependencies = [ + "allocator-api2", +] [[package]] name = "byteorder" @@ -427,18 +436,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522" +checksum = "88c1d02b72b6c411c0a2e92b25ed791ad5d071184193c08a34aa0fdcdf000b72" dependencies = [ - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", ] [[package]] name = "cranelift-bitset" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279" +checksum = "720b93bd86ebbb23ebfb2db1ed44d54b2ecbdbb2d034d485bc64aa605ee787ab" dependencies = [ "serde", "serde_derive", @@ -446,9 +455,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1" +checksum = "aed3d2d9914d30b460eedd7fd507720203023997bef71452ce84873f9c93537c" dependencies = [ "bumpalo", "cranelift-bforest", @@ -456,37 +465,38 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", "cranelift-isle", "gimli", "hashbrown 0.14.5", "log", "regalloc2", "rustc-hash", + "serde", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082" +checksum = "888c188d32263ec9e048873ff0b68c700933600d553f4412417916828be25f8e" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65" +checksum = "4ddd5f4114d04ce7e073dd74e2ad16541fc61970726fcc8b2d5644a154ee4127" [[package]] name = "cranelift-control" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978" +checksum = "92cc4c98d6a4256a1600d93ccd3536f3e77da9b4ca2c279de786ac22876e67d6" dependencies = [ "arbitrary", ] @@ -499,9 +509,9 @@ checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" [[package]] name = "cranelift-entity" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2" +checksum = "760af4b5e051b5f82097a27274b917e3751736369fa73660513488248d27f23d" dependencies = [ "cranelift-bitset", "serde", @@ -510,9 +520,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5" +checksum = "c0bf77ec0f470621655ec7539860b5c620d4f91326654ab21b075b83900f8831" dependencies = [ "cranelift-codegen", "log", @@ -522,15 +532,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667" +checksum = "4b665d0a6932c421620be184f9fc7f7adaf1b0bc2fa77bb7ac5177c49abf645b" [[package]] name = "cranelift-native" -version = "0.113.1" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de" +checksum = "bb2e75d1bd43dfec10924798f15e6474f1dbf63b0024506551aa19394dbe72ab" dependencies = [ "cranelift-codegen", "libc", @@ -689,16 +699,26 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "env_filter" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] @@ -1011,6 +1031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "foldhash", + "serde", ] [[package]] @@ -1019,12 +1040,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" - [[package]] name = "http" version = "0.2.12" @@ -1070,12 +1085,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" - [[package]] name = "hyper" version = "0.14.26" @@ -1302,17 +1311,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "is-terminal" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -1363,6 +1361,30 @@ dependencies = [ "cc", ] +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "jobserver" version = "0.1.33" @@ -1615,9 +1637,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openvino" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fccecf8cfd130d6a4cd7198b980909714e2fdea60a96e1692fc3a8f9987dc8" +checksum = "8f03a664ab0b6917131f5c1a787795fa4d19ad6a334caf9c96284453abdf23fd" dependencies = [ "openvino-finder", "openvino-sys", @@ -1625,9 +1647,9 @@ dependencies = [ [[package]] name = "openvino-finder" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03720ab039bd133362bb9767c6bd586ea4d0168adb01bc9f695f03c2422fdfa1" +checksum = "34d6bbb3e00d9ad3cd60bca1341665a9cfb2b6764df37c58d921627368ae32fc" dependencies = [ "cfg-if", "log", @@ -1635,9 +1657,9 @@ dependencies = [ [[package]] name = "openvino-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d70e8103d2b9b52236efd8d785ef5fed04963ebfcfd7fbfa35aeea9d7d79f92" +checksum = "04315994236727c3573f7e8d8bf857e93ff373ee2e063f08aa78aceac58e3bc5" dependencies = [ "env_logger", "libloading", @@ -1736,6 +1758,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "postcard" version = "1.1.1" @@ -1777,9 +1808,9 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26" +checksum = "8324e531de91a3c25021a30fb7862d39cc516b61fbb801176acb5ff279ea887b" dependencies = [ "cranelift-bitset", "log", @@ -1873,14 +1904,15 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" +checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a" dependencies = [ - "hashbrown 0.14.5", + "allocator-api2", + "bumpalo", + "hashbrown 0.15.2", "log", "rustc-hash", - "slice-group-by", "smallvec", ] @@ -2227,12 +2259,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - [[package]] name = "smallvec" version = "1.15.0" @@ -2853,11 +2879,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491f7e48672d0a1efdeadf897d98ac1f45942c26c3829cb44a6b828f6f26155f" +checksum = "dc8444fe4920de80a4fe5ab564fff2ae58b6b73166b89751f8c6c93509da32e5" dependencies = [ "leb128", + "wasmparser 0.221.3", ] [[package]] @@ -2902,13 +2929,12 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059739c2eac26eea736389a7d6d30b41a8201490bea204d0facde19183359849" +checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185" dependencies = [ - "ahash", "bitflags 2.9.0", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "indexmap", "semver 1.0.26", "serde", @@ -2927,20 +2953,20 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b30ceafa77646f56747369b0f2a0296016a40b447d32e6907439f2e4bb7695" +checksum = "7343c42a97f2926c7819ff81b64012092ae954c5d83ddd30c9fcdefd97d0b283" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.218.1", + "wasmparser 0.221.3", ] [[package]] name = "wasmtime" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917" +checksum = "edd30973c65eceb0f37dfcc430d83abd5eb24015fdfcab6912f52949287e04f0" dependencies = [ "addr2line", "anyhow", @@ -2975,8 +3001,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.218.1", - "wasmparser 0.218.1", + "wasm-encoder 0.221.3", + "wasmparser 0.221.3", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2995,18 +3021,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812" +checksum = "c6c21dd30d1f3f93ee390ac1a7ec304ecdbfdab6390e1add41a1f52727b0992b" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7192f71e3afe32e858729454d9d90d6e927bd92427d688a9507d8220bddb256" +checksum = "cabd563cfbfe75c5bf514081f624ca8d18391a37520d8c794abce702474e688c" dependencies = [ "anyhow", "base64", @@ -3024,9 +3050,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68" +checksum = "9f948a6ef3119d52c9f12936970de28ddf3f9bea04bc65571f4a92d2e5ab38f4" dependencies = [ "anyhow", "proc-macro2", @@ -3034,26 +3060,26 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.218.1", + "wit-parser 0.221.3", ] [[package]] name = "wasmtime-component-util" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad" +checksum = "b9275aa01ceaaa2fa6c0ecaa5267518d80b9d6e9ae7c7ea42f4c6e073e6a69ef" [[package]] name = "wasmtime-cranelift" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f" +checksum = "0701a44a323267aae4499672dae422b266cee3135a23b640972ec8c0e10a44a2" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", "cranelift-frontend", "cranelift-native", "gimli", @@ -3063,21 +3089,21 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.218.1", + "wasmparser 0.221.3", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19" +checksum = "264c968c1b81d340355ece2be0bc31a10f567ccb6ce08512c3b7d10e26f3cbe5" dependencies = [ "anyhow", "cpp_demangle", "cranelift-bitset", - "cranelift-entity 0.113.1", + "cranelift-entity 0.115.1", "gimli", "indexmap", "log", @@ -3089,17 +3115,17 @@ dependencies = [ "serde_derive", "smallvec", "target-lexicon", - "wasm-encoder 0.218.1", - "wasmparser 0.218.1", + "wasm-encoder 0.221.3", + "wasmparser 0.221.3", "wasmprinter", "wasmtime-component-util", ] [[package]] name = "wasmtime-fiber" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77acabfbcd89a4d47ad117fb31e340c824e2f49597105402c3127457b6230995" +checksum = "78505221fd5bd7b07b4e1fa2804edea49dc231e626ad6861adc8f531812973e6" dependencies = [ "anyhow", "cc", @@ -3112,21 +3138,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02a0118d471de665565ed200bc56673eaa10cc8e223dfe2cef5d50ed0d9d143" +checksum = "0cec0a8e5620ae71bfcaaec78e3076be5b6ebf869f4e6191925d73242224a915" dependencies = [ "object", - "once_cell", "rustix 0.38.44", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5" +checksum = "9bedb677ca1b549d98f95e9e1f9251b460090d99a2c196a0614228c064bf2e59" dependencies = [ "anyhow", "cfg-if", @@ -3136,15 +3161,15 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6" +checksum = "564905638c132c275d365c1fa074f0b499790568f43148d29de84ccecfb5cb31" [[package]] name = "wasmtime-versioned-export-macros" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7" +checksum = "1e91092e6cf77390eeccee273846a9327f3e8f91c3c6280f60f37809f0e62d29" dependencies = [ "proc-macro2", "quote", @@ -3153,9 +3178,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16c8d87a45168131be6815045e6d46d7f6ddf65897c49444ab210488bce10dc" +checksum = "1a8e04b9a4c68ad018b330a4f4914b82b01dc3582d715ce21a93564c7f26b19f" dependencies = [ "anyhow", "async-trait", @@ -3170,7 +3195,6 @@ dependencies = [ "futures", "io-extras", "io-lifetimes", - "once_cell", "rustix 0.38.44", "system-interface", "thiserror", @@ -3184,9 +3208,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-nn" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0437bb4a6878ab49e4170c55a7d4693d27ed74ab54203dbe143fd8574d0f9b7" +checksum = "affd292b0b0ef3872a0e702e862d2046e3eb4b1e9b311d67faa2bfaa9155cc25" dependencies = [ "anyhow", "openvino", @@ -3200,16 +3224,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7a267367382ceec3e7f7ace63a63b83d86f4a680846743dead644e10f08150" +checksum = "b111d909dc604c741bd8ac2f4af373eaa5c68c34b5717271bcb687688212cef8" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser 0.218.1", + "wasmparser 0.221.3", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3217,14 +3241,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933" +checksum = "5f38f7a5eb2f06f53fe943e7fb8bf4197f7cf279f1bc52c0ce56e9d3ffd750a4" dependencies = [ "anyhow", "heck", "indexmap", - "wit-parser 0.218.1", + "wit-parser 0.221.3", ] [[package]] @@ -3260,9 +3284,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f25588cf5ea16f56c1af13244486d50c5a2cf67cc0c4e990c665944d741546" +checksum = "3b23e3dc273d1e35cab9f38a5f76487aeeedcfa6a3fb594e209ee7b6f8b41dcc" dependencies = [ "anyhow", "async-trait", @@ -3276,9 +3300,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ff23bed568b335dac6a324b8b167318a0c60555199445fcc89745a5eb42452" +checksum = "8738c5a7ef3a9de0fae10f8b84091a2aa4e059d8fef23de202ab689812b6bc6e" dependencies = [ "anyhow", "heck", @@ -3291,9 +3315,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f13be83541aa0b033ac5ec8a8b59c9a8d8b32305845b8466dd066e722cb0004" +checksum = "e882267ac583e013a38a5aaeb83a49b219456ba3aa6e6772440f7213b176e8ff" dependencies = [ "proc-macro2", "quote", @@ -3334,9 +3358,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "26.0.1" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ab957fc71a36c63834b9b51cc2e087c4260d5ff810a5309ab99f7fbeb19567" +checksum = "6232f40a795be2ce10fc761ed3b403825126a60d12491ac556ea104a932fd18a" dependencies = [ "anyhow", "cranelift-codegen", @@ -3344,7 +3368,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.218.1", + "wasmparser 0.221.3", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3664,9 +3688,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.218.1" +version = "0.221.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104473e8546f8096f1fa483d337101a98dc9525d67f4275816bcd177fe3e2be" +checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac" dependencies = [ "anyhow", "id-arena", @@ -3677,7 +3701,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.218.1", + "wasmparser 0.221.3", ] [[package]] diff --git a/lib/src/component/mod.rs b/lib/src/component/mod.rs index e7fbc5c5..e3024822 100644 --- a/lib/src/component/mod.rs +++ b/lib/src/component/mod.rs @@ -42,7 +42,7 @@ pub fn link_host_functions(linker: &mut component::Linker) -> anyh wasmtime_wasi::bindings::io::streams::add_to_linker_get_host(linker, wrap)?; wasmtime_wasi::bindings::io::poll::add_to_linker_get_host(linker, wrap)?; wasmtime_wasi::bindings::cli::environment::add_to_linker_get_host(linker, wrap)?; - wasmtime_wasi::bindings::cli::exit::add_to_linker_get_host(linker, wrap)?; + wasmtime_wasi::bindings::cli::exit::add_to_linker_get_host(linker, &Default::default(), wrap)?; wasmtime_wasi::bindings::cli::stdin::add_to_linker_get_host(linker, wrap)?; wasmtime_wasi::bindings::cli::stdout::add_to_linker_get_host(linker, wrap)?; wasmtime_wasi::bindings::cli::stderr::add_to_linker_get_host(linker, wrap)?; diff --git a/lib/wit/deps/cli/exit.wit b/lib/wit/deps/cli/exit.wit index d0c2b82a..427935c8 100644 --- a/lib/wit/deps/cli/exit.wit +++ b/lib/wit/deps/cli/exit.wit @@ -1,4 +1,17 @@ +@since(version = 0.2.0) interface exit { /// Exit the current instance and any linked instances. + @since(version = 0.2.0) exit: func(status: result); + + /// Exit the current instance and any linked instances, reporting the + /// specified status code to the host. + /// + /// The meaning of the code depends on the context, with 0 usually meaning + /// "success", and other values indicating various types of failure. + /// + /// This function does not return; the effect is analogous to a trap, but + /// without the connotation that something bad has happened. + @unstable(feature = cli-exit-with-code) + exit-with-code: func(status-code: u8); }