A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Update wasm-tools/wit-bindgen deps (#14199)
Alex Crichton82e0aed17344
diff --git a/Cargo.lock b/Cargo.lockindex 4245646356..2202f6137d 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -609,7 +609,7 @@ dependencies = ["test-programs-artifacts","tokio","wasm-compose",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime","wasmtime-wasi",]@@ -1376,7 +1376,7 @@ dependencies = [name = "example-component-wasm"version = "0.0.0"dependencies = [- "wit-bindgen 0.60.0",+ "wit-bindgen 0.61.1",][[package]]@@ -1387,7 +1387,7 @@ version = "0.0.0"name = "example-resource-component-wasm"version = "0.1.0"dependencies = [- "wit-bindgen 0.60.0",+ "wit-bindgen 0.61.1",][[package]]@@ -2247,14 +2247,14 @@ dependencies = [[[package]]name = "json-from-wast"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d3864e5a6e08aeab6da27eca9dedaefe8c27fd9e28dd402ee00ea66416023a9f"+checksum = "c74cef75a485ea9c18b6f7c1928bda2ef3a5727227fe7ebab4260626bc75f98e"dependencies = ["anyhow","serde","serde_derive",- "wast 254.0.0",+ "wast 258.0.0",][[package]]@@ -3805,7 +3805,7 @@ dependencies = ["wasi-nn","wasip1","wasip2",- "wit-bindgen 0.60.0",+ "wit-bindgen 0.61.1",][[package]]@@ -3820,7 +3820,7 @@ dependencies = ["wasmtime","wasmtime-test-util","wat",- "wit-component 0.254.0",+ "wit-component 0.258.0",][[package]]@@ -4287,7 +4287,7 @@ name = "verify-component-adapter"version = "49.0.0-dev"dependencies = ["anyhow",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wat",]@@ -4364,8 +4364,8 @@ dependencies = ["byte-array-literals","object 0.40.0","wasip1",- "wasm-encoder 0.254.0",- "wit-bindgen-rust-macro 0.60.0",+ "wasm-encoder 0.258.0",+ "wit-bindgen-rust-macro 0.61.1",][[package]]@@ -4394,9 +4394,9 @@ dependencies = [[[package]]name = "wasm-compose"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8fd717357bff09b5f1ea49aea8ed1cd149b0c521823a1cc70bc2ac16b90b651a"+checksum = "7dd08e5283f98238f2f16f5f978188a33af9901b81186bb549faad306a7b5388"dependencies = ["anyhow","heck",@@ -4404,8 +4404,8 @@ dependencies = ["log","petgraph","smallvec 1.15.1",- "wasm-encoder 0.254.0",- "wasmparser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasmparser 0.258.0","wat",]@@ -4421,12 +4421,12 @@ dependencies = [[[package]]name = "wasm-encoder"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "09480d646178e5fdd12bb06e812d0af9a3a191dbc9cd697fdc86687beade7393"+checksum = "e974fe6821a8cf64575d51ea2194e2c8f77e7b66e9afe7419ce8a97f9ee0d251"dependencies = ["leb128fmt",- "wasmparser 0.254.0",+ "wasmparser 0.258.0",][[package]]@@ -4443,42 +4443,42 @@ dependencies = [[[package]]name = "wasm-metadata"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b01df5f3b4ca7881e843f3bc0fb8a3905d79c68692250dcb8e33e698705ccdb6"+checksum = "18a11585adb92fe9b55ad1d760e8d8fb5d87e0d2e303cb8eed57f078d54293a2"dependencies = ["anyhow","indexmap 2.14.0",- "wasm-encoder 0.254.0",- "wasmparser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasmparser 0.258.0",][[package]]name = "wasm-mutate"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0ceea435895a94a7c1dcbcfce7c2612007daebfafdf9851a86d0c7b8fb15aaf3"+checksum = "5ae9cac04ab7c539efa6b4288726ced0d423c95f1bb63659d74506142ff0499b"dependencies = ["egg","log","rand 0.10.1","thiserror 2.0.17",- "wasm-encoder 0.254.0",- "wasmparser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasmparser 0.258.0",][[package]]name = "wasm-smith"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "310b05df4f1aede74489c0e206d8ea39d884095f708ae2728538f64df4a78665"+checksum = "a84b31d645ea084a94e1a7c410e30219c165a0960b336f535f99162caf2cfd0c"dependencies = ["anyhow","arbitrary","flagset","serde","serde_derive",- "wasm-encoder 0.254.0",+ "wasm-encoder 0.258.0","wat",]@@ -4492,14 +4492,14 @@ dependencies = [[[package]]name = "wasm-wave"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e112fc0db85e7edf9258a9a0fa07566540c19a6a2af3fbf45a4d45d886bfd7df"+checksum = "ce1d8cbc89bc22dac012f5fd56fca419330cb88d8d2c8f6ccb313f08ec4a6836"dependencies = ["anyhow","logos","thiserror 2.0.17",- "wit-parser 0.254.0",+ "wit-parser 0.258.0",][[package]]@@ -4566,9 +4566,9 @@ dependencies = [[[package]]name = "wasmparser"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d5769a29f799fbab136aaf65b4fe5384cd7d93fe6fc9ba0dcb6c8382a1f16e27"+checksum = "d9a61719f93a87b16d325921e251800c4833f8fab50fa21c7de73aed50086313"dependencies = ["bitflags 2.11.1","hashbrown 0.17.0",@@ -4579,13 +4579,13 @@ dependencies = [[[package]]name = "wasmprinter"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "64e3ba11e024f504698f87b629b2b66c22a1231758de7607754963f7d198be39"+checksum = "3a65e30fb2cd3cc5cb7761a6064787b2abf017e6566d8d0dedf2bb7f55ad5383"dependencies = ["anyhow","termcolor",- "wasmparser 0.254.0",+ "wasmparser 0.258.0",][[package]]@@ -4627,9 +4627,9 @@ dependencies = ["tempfile","tokio","wasm-compose",- "wasm-encoder 0.254.0",+ "wasm-encoder 0.258.0","wasm-wave",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime-environ","wasmtime-internal-cache","wasmtime-internal-component-macro",@@ -4646,7 +4646,7 @@ dependencies = ["wasmtime-test-util","wat","windows-sys 0.61.2",- "wit-parser 0.254.0",+ "wit-parser 0.258.0",][[package]]@@ -4737,8 +4737,8 @@ dependencies = ["toml","tracing","walkdir",- "wasm-encoder 0.254.0",- "wasmparser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasmparser 0.258.0","wasmprinter","wasmtime","wasmtime-cli-flags",@@ -4760,10 +4760,10 @@ dependencies = ["wasmtime-wasi-tls","wasmtime-wast","wasmtime-wizer",- "wast 254.0.0",+ "wast 258.0.0","wat","windows-sys 0.61.2",- "wit-component 0.254.0",+ "wit-component 0.258.0",][[package]]@@ -4806,8 +4806,8 @@ dependencies = ["sha2","smallvec 1.15.1","target-lexicon 0.13.5",- "wasm-encoder 0.254.0",- "wasmparser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasmparser 0.258.0","wasmprinter","wasmtime-internal-component-util","wasmtime-internal-core",@@ -4821,7 +4821,7 @@ dependencies = ["arbitrary","env_logger 0.11.5","libfuzzer-sys",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmprinter","wasmtime-environ","wasmtime-test-util",@@ -4853,7 +4853,7 @@ dependencies = ["rand 0.10.1","smallvec 1.15.1","target-lexicon 0.13.5",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime","wasmtime-fuzzing","wasmtime-internal-core",@@ -4881,12 +4881,12 @@ dependencies = ["tempfile","tokio","v8",- "wasm-encoder 0.254.0",+ "wasm-encoder 0.258.0","wasm-mutate","wasm-smith","wasm-spec-interpreter","wasmi",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmprinter","wasmtime","wasmtime-cli-flags",@@ -4943,7 +4943,7 @@ dependencies = ["wasmtime","wasmtime-internal-component-util","wasmtime-internal-wit-bindgen",- "wit-parser 0.254.0",+ "wit-parser 0.258.0",][[package]]@@ -4977,7 +4977,7 @@ dependencies = ["smallvec 1.15.1","target-lexicon 0.13.5","thiserror 2.0.17",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime-environ","wasmtime-internal-core","wasmtime-internal-unwinder",@@ -5036,7 +5036,7 @@ dependencies = ["gdbstub_arch","log","wasip2",- "wit-bindgen 0.60.0",+ "wit-bindgen 0.61.1","wstd",]@@ -5091,7 +5091,7 @@ dependencies = ["log","object 0.40.0","target-lexicon 0.13.5",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime-environ","wasmtime-internal-cranelift","winch-codegen",@@ -5105,8 +5105,8 @@ dependencies = ["bitflags 2.11.1","heck","indexmap 2.14.0",- "wit-component 0.254.0",- "wit-parser 0.254.0",+ "wit-component 0.258.0",+ "wit-parser 0.258.0",][[package]]@@ -5150,7 +5150,7 @@ dependencies = ["serde_derive","target-lexicon 0.13.5","toml",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmprinter","wasmtime","wasmtime-environ",@@ -5298,9 +5298,9 @@ dependencies = ["object 0.40.0","serde_json","tokio",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime",- "wast 254.0.0",+ "wast 258.0.0",][[package]]@@ -5314,8 +5314,8 @@ dependencies = ["rayon","test-programs-artifacts","tokio",- "wasm-encoder 0.254.0",- "wasmparser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasmparser 0.258.0","wasmprinter","wasmtime","wasmtime-wasi",@@ -5333,25 +5333,25 @@ dependencies = [[[package]]name = "wast"-version = "254.0.0"+version = "258.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e7ed4dfc8f6b9fc38b231065e2cdfbf7359af5ab945990abf09658dcc63c3e32"+checksum = "97f7defc7ecca8b19ac7f824598eadd0c53985ee00c74060d65051e9da5b58a1"dependencies = ["bumpalo","gimli 0.32.3","leb128fmt","memchr","unicode-width 0.2.0",- "wasm-encoder 0.254.0",+ "wasm-encoder 0.258.0",][[package]]name = "wat"-version = "1.254.0"+version = "1.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7127f7f9b8f127c879991cecd35f494e4628bae1b0874c681414d8d8831e952c"+checksum = "7555c008cca87f2ac58d9f83ccda7e7b44611093ce28eb28f052e7c78024b9bf"dependencies = [- "wast 254.0.0",+ "wast 258.0.0",][[package]]@@ -5478,7 +5478,7 @@ dependencies = ["smallvec 1.15.1","target-lexicon 0.13.5","thiserror 2.0.17",- "wasmparser 0.254.0",+ "wasmparser 0.258.0","wasmtime-environ","wasmtime-internal-core","wasmtime-internal-cranelift",@@ -5660,13 +5660,13 @@ dependencies = [[[package]]name = "wit-bindgen"-version = "0.60.0"+version = "0.61.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a301904d6657d6364c758d869e5389d05d393b16d5b65db60b4f03cbe71bb80d"+checksum = "e473fd0095479f9689ac7d2a52c427cc96bb2b973ace50238dfcc1ab1cd52d93"dependencies = ["bitflags 2.11.1","futures",- "wit-bindgen-rust-macro 0.60.0",+ "wit-bindgen-rust-macro 0.61.1",][[package]]@@ -5682,13 +5682,13 @@ dependencies = [[[package]]name = "wit-bindgen-core"-version = "0.60.0"+version = "0.61.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "48521bb96e56cbb9e031ad306c80dc20e89e69e49ada02781ee06f60fbcb545f"+checksum = "87445680dfe6d6b5369e884bd63c03a3335268e855365b2fc3f7bcdce96a630e"dependencies = ["anyhow","heck",- "wit-parser 0.254.0",+ "wit-parser 0.258.0",][[package]]@@ -5718,18 +5718,18 @@ dependencies = [[[package]]name = "wit-bindgen-rust"-version = "0.60.0"+version = "0.61.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3df3fe9b9a0066f82fd0c2f07f79d0ffc0f85c53fa5f998516d8722712479042"+checksum = "72f2fe494de0d898216caf0fd0ae76af75753fcb3ff4f465b46131537cf24cf8"dependencies = ["anyhow","heck","indexmap 2.14.0","prettyplease","syn",- "wasm-metadata 0.254.0",- "wit-bindgen-core 0.60.0",- "wit-component 0.254.0",+ "wasm-metadata 0.258.0",+ "wit-bindgen-core 0.61.1",+ "wit-component 0.258.0",][[package]]@@ -5749,9 +5749,9 @@ dependencies = [[[package]]name = "wit-bindgen-rust-macro"-version = "0.60.0"+version = "0.61.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d689c4bc9d6af067c651cfba444766343c9a4bdef15fad1e2efab95c0c277af0"+checksum = "59283a01aec94f60f92ada22ffe182a5cea8acfce43be3be688de8d52df55312"dependencies = ["anyhow","macro-string",@@ -5759,8 +5759,8 @@ dependencies = ["proc-macro2","quote","syn",- "wit-bindgen-core 0.60.0",- "wit-bindgen-rust 0.60.0",+ "wit-bindgen-core 0.61.1",+ "wit-bindgen-rust 0.61.1",][[package]]@@ -5784,9 +5784,9 @@ dependencies = [[[package]]name = "wit-component"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b0e65bb94c369b3c4741ce3d1d2704b1fec93db7c540df0e521a097e7ceeb5be"+checksum = "481b5c47b2ecce0389b5e08a05557d6a190c9cd761773b8880a8017ee04dc7ef"dependencies = ["anyhow","bitflags 2.11.1",@@ -5795,10 +5795,10 @@ dependencies = ["serde","serde_derive","serde_json",- "wasm-encoder 0.254.0",- "wasm-metadata 0.254.0",- "wasmparser 0.254.0",- "wit-parser 0.254.0",+ "wasm-encoder 0.258.0",+ "wasm-metadata 0.258.0",+ "wasmparser 0.258.0",+ "wit-parser 0.258.0",][[package]]@@ -5821,9 +5821,9 @@ dependencies = [[[package]]name = "wit-parser"-version = "0.254.0"+version = "0.258.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1655131e4f7d3f0cb141f6eca71315ca40eff0f3d4de7cff0a82bacedd8c89b4"+checksum = "ff4daaa3cd97ae49ecd0a99dc009d453f93e0f083dd3be38c0f24a83a93e37ac"dependencies = ["anyhow","hashbrown 0.17.0",@@ -5835,7 +5835,7 @@ dependencies = ["serde_derive","serde_json","unicode-ident",- "wasmparser 0.254.0",+ "wasmparser 0.258.0",][[package]]diff --git a/Cargo.toml b/Cargo.tomlindex d3c89c665d..8af2632f61 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -372,22 +372,22 @@ cap-primitives = "4.0.3"cap-fs-ext-avoid-using-this = { version = "4.0.3", package = 'cap-fs-ext' }rustix = "1.1.4"# wit-bindgen:-wit-bindgen = { version = "0.60.0", default-features = false }-wit-bindgen-rust-macro = { version = "0.60.0", default-features = false }+wit-bindgen = { version = "0.61.1", default-features = false }+wit-bindgen-rust-macro = { version = "0.61.1", default-features = false }# wasm-tools family:-wasmparser = { version = "0.254.0", default-features = false, features = ['simd'] }-wat = "1.254.0"-wast = "254.0.0"-wasmprinter = "0.254.0"-wasm-encoder = "0.254.0"-wasm-smith = "0.254.0"-wasm-mutate = "0.254.0"-wit-parser = "0.254.0"-wit-component = "0.254.0"-wasm-wave = "0.254.0"-wasm-compose = { version = "0.254.0", default-features = false }-json-from-wast = "0.254.0"+wasmparser = { version = "0.258.0", default-features = false, features = ['simd'] }+wat = "1.258.0"+wast = "258.0.0"+wasmprinter = "0.258.0"+wasm-encoder = "0.258.0"+wasm-smith = "0.258.0"+wasm-mutate = "0.258.0"+wit-parser = "0.258.0"+wit-component = "0.258.0"+wasm-wave = "0.258.0"+wasm-compose = { version = "0.258.0", default-features = false }+json-from-wast = "0.258.0"wstd = "0.6.5"wasip2 = "1.0"diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rsindex c93057f432..b722c22b3b 100644--- a/crates/cranelift/src/func_environ.rs+++ b/crates/cranelift/src/func_environ.rs@@ -236,7 +236,7 @@ pub struct FuncEnvironment<'module_environment> {/// carries no hints.branch_hints: Option<Peekable<SectionLimitedIntoIter<'module_environment, BranchHint>>>,/// Module-relative byte offset of the current function body's start.- func_body_offset: usize,+ func_body_offset: u64,/// Cached alias regions for alias analysis.pub(crate) alias_regions: AliasRegions<VMOffsets<u8>>,@@ -250,7 +250,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {wasm_func_ty: &'module_environment WasmFuncType,key: FuncKey,func_index: Option<FuncIndex>,- func_body_offset: usize,+ func_body_offset: u64,) -> Self {let tunables = compiler.tunables();let builtin_functions = BuiltinFunctions::new(compiler);@@ -316,7 +316,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {/// Consume the branch hint for the instruction at module-relative `offset`/// (i.e. `builder.srcloc().bits()`), if any. The lazy decoder only moves/// forward, making this O(n) over a function body.- pub(crate) fn take_branch_hint(&mut self, offset: usize) -> Option<BranchHint> {+ pub(crate) fn take_branch_hint(&mut self, offset: u64) -> Option<BranchHint> {// Fast path: no hints (always so when the proposal is off), and this// runs for every `if`/`br_if`.let hints = self.branch_hints.as_mut()?;diff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rsindex 088e0f2bd4..6a1f0dac2a 100644--- a/crates/cranelift/src/translate/code_translator.rs+++ b/crates/cranelift/src/translate/code_translator.rs@@ -289,7 +289,7 @@ pub fn translate_operator(}Operator::If { blockty } => {// Read the hint before `environ` is borrowed mutably below.- let branch_hint = environ.take_branch_hint(builder.srcloc().bits() as usize);+ let branch_hint = environ.take_branch_hint(builder.srcloc().bits().into());let val = environ.stacks.pop1();@@ -4108,7 +4108,7 @@ fn translate_br_if(env: &mut FuncEnvironment<'_>,) {// Read the hint before `env` is borrowed mutably below.- let branch_hint = env.take_branch_hint(builder.srcloc().bits() as usize);+ let branch_hint = env.take_branch_hint(builder.srcloc().bits().into());let val = env.stacks.pop1();let (br_destination, inputs) = translate_br_if_args(relative_depth, env);diff --git a/crates/cranelift/src/translate/func_translator.rs b/crates/cranelift/src/translate/func_translator.rsindex f26bb700b9..f220d1195d 100644--- a/crates/cranelift/src/translate/func_translator.rs+++ b/crates/cranelift/src/translate/func_translator.rs@@ -344,7 +344,7 @@ fn validate_op_and_get_operand_types<'a>(environ: &mut FuncEnvironment<'_>,operand_types: &'a mut Vec<wasmtime_environ::WasmValType>,op: &wasmparser::Operator<'_>,- pos: usize,+ pos: u64,) -> WasmResult<Option<&'a [wasmtime_environ::WasmValType]>> {// Get the operand types for this operator.//diff --git a/crates/environ/src/compile/module_environ.rs b/crates/environ/src/compile/module_environ.rsindex ed18770b73..373308e0bc 100644--- a/crates/environ/src/compile/module_environ.rs+++ b/crates/environ/src/compile/module_environ.rs@@ -820,7 +820,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {self.validator.code_section_start(&range)?;let cnt = usize::try_from(count).unwrap();self.result.function_body_inputs.reserve_exact(cnt);- self.result.debuginfo.wasm_file.code_section_offset = range.start as u64;+ self.result.debuginfo.wasm_file.code_section_offset = range.start;}Payload::CodeSectionEntry(body) => {diff --git a/crates/environ/src/component/translate.rs b/crates/environ/src/component/translate.rsindex 1a8c313627..4db699a8d5 100644--- a/crates/environ/src/component/translate.rs+++ b/crates/environ/src/component/translate.rs@@ -1367,7 +1367,7 @@ impl<'a, 'data> Translator<'a, 'data> {.translate(parser,component- .get(unchecked_range.start..unchecked_range.end)+ .get(unchecked_range.start as usize..unchecked_range.end as usize).ok_or_else(|| {format_err!("section range {}..{} is out of bounds (bound = {})",@@ -1379,7 +1379,7 @@ impl<'a, 'data> Translator<'a, 'data> {})?,)?;- translation.wasm_module_offset = u64::try_from(unchecked_range.start).unwrap();+ translation.wasm_module_offset = unchecked_range.start;let static_module_index2 = self.static_modules.push(translation);assert_eq!(static_module_index, static_module_index2);let types = self.validator.types(0).unwrap();@@ -1387,7 +1387,9 @@ impl<'a, 'data> Translator<'a, 'data> {self.result.initializers.push(LocalInitializer::ModuleStatic(static_module_index, ty));- return Ok(Action::Skip(unchecked_range.end - unchecked_range.start));+ return Ok(Action::Skip(+ (unchecked_range.end - unchecked_range.start) as usize,+ ));}// When a sub-component is found then the current translation statediff --git a/crates/environ/src/types.rs b/crates/environ/src/types.rsindex 099d4250af..2f7782e1ea 100644--- a/crates/environ/src/types.rs+++ b/crates/environ/src/types.rs@@ -2098,7 +2098,7 @@ impl ConstOp {pub fn from_wasmparser(env: &dyn TypeConvert,op: wasmparser::Operator<'_>,- offset: usize,+ offset: u64,) -> WasmResult<Self> {use wasmparser::Operator as O;Ok(match op {diff --git a/crates/environ/src/wasm_error.rs b/crates/environ/src/wasm_error.rsindex 22834776d4..47b728bf98 100644--- a/crates/environ/src/wasm_error.rs+++ b/crates/environ/src/wasm_error.rs@@ -16,7 +16,7 @@ pub enum WasmError {/// A string describing the validation error.message: String,/// The bytecode offset where the error occurred.- offset: usize,+ offset: u64,},/// A feature used by the WebAssembly code is not supported by the embedding environment.diff --git a/crates/fuzzing/src/single_module_fuzzer.rs b/crates/fuzzing/src/single_module_fuzzer.rsindex cf24e4b9a0..4043fc2e39 100644--- a/crates/fuzzing/src/single_module_fuzzer.rs+++ b/crates/fuzzing/src/single_module_fuzzer.rs@@ -253,7 +253,7 @@ fn extract_fuzz_input(data: &[u8]) -> wasmtime::Result<FuzzInput<'_>> {// binary format means that we can simply chop off the last custom// section and still have a valid module.if let Payload::CustomSection(s) = §ion {- if s.name() == SECTION_NAME && s.range().end == data.len() {+ if s.name() == SECTION_NAME && s.range().end == data.len() as u64 {return Ok(FuzzInput {module: &data[..prev_end],fuzz_data: s.data(),@@ -264,7 +264,7 @@ fn extract_fuzz_input(data: &[u8]) -> wasmtime::Result<FuzzInput<'_>> {// Record each section's end to record what the end of the module is// up to this point.if let Some((_, range)) = section.as_section() {- prev_end = range.end;+ prev_end = range.end as usize;}}wasmtime::bail!("no input found")diff --git a/crates/wizer/src/component/parse.rs b/crates/wizer/src/component/parse.rsindex 2e1449c509..cac2cbc0c1 100644--- a/crates/wizer/src/component/parse.rs+++ b/crates/wizer/src/component/parse.rs@@ -54,7 +54,7 @@ fn parse_into<'a>({component.push_raw_section(wasm_encoder::RawSection {id,- data: &full_wasm[range],+ data: &full_wasm[range.start as usize..range.end as usize],});}}diff --git a/crates/wizer/src/info.rs b/crates/wizer/src/info.rsindex 76e1a9ea6c..fcd3efad53 100644--- a/crates/wizer/src/info.rs+++ b/crates/wizer/src/info.rs@@ -62,10 +62,10 @@ pub struct ModuleContext<'a> {impl<'a> ModuleContext<'a> {/// Add a new raw section to this module info during parsing.- pub(crate) fn add_raw_section(&mut self, id: u8, range: Range<usize>, full_wasm: &'a [u8]) {+ pub(crate) fn add_raw_section(&mut self, id: u8, range: Range<u64>, full_wasm: &'a [u8]) {self.raw_sections.push(wasm_encoder::RawSection {id,- data: &full_wasm[range.start..range.end],+ data: &full_wasm[range.start as usize..range.end as usize],})}diff --git a/supply-chain/imports.lock b/supply-chain/imports.lockindex a59ece3d3e..2f8b2855d6 100644--- a/supply-chain/imports.lock+++ b/supply-chain/imports.lock@@ -740,8 +740,8 @@ user-login = "alexcrichton"user-name = "Alex Crichton"[[publisher.json-from-wast]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.libc]]@@ -1213,8 +1213,8 @@ user-login = "alexcrichton"user-name = "Alex Crichton"[[publisher.wasm-compose]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasm-encoder]]@@ -1223,8 +1223,8 @@ when = "2026-01-06"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasm-encoder]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasm-metadata]]@@ -1234,13 +1234,13 @@ user-id = 73222user-login = "wasmtime-publish"[[publisher.wasm-metadata]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasm-wave]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasmparser]]@@ -1249,13 +1249,13 @@ when = "2026-01-06"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasmparser]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasmprinter]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wasmtime]]@@ -1409,13 +1409,13 @@ when = "2026-07-31"trusted-publisher = "github:bytecodealliance/wasmtime"[[publisher.wast]]-version = "254.0.0"-when = "2026-07-20"+version = "258.0.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wat]]-version = "1.254.0"-when = "2026-07-20"+version = "1.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wiggle]]@@ -1590,8 +1590,8 @@ when = "2026-01-12"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen]]-version = "0.60.0"-when = "2026-07-22"+version = "0.61.1"+when = "2026-08-25"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen-core]]@@ -1600,8 +1600,8 @@ when = "2026-01-12"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen-core]]-version = "0.60.0"-when = "2026-07-22"+version = "0.61.1"+when = "2026-08-25"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen-rt]]@@ -1616,8 +1616,8 @@ when = "2026-01-12"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen-rust]]-version = "0.60.0"-when = "2026-07-22"+version = "0.61.1"+when = "2026-08-25"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen-rust-macro]]@@ -1626,8 +1626,8 @@ when = "2026-01-12"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-bindgen-rust-macro]]-version = "0.60.0"-when = "2026-07-22"+version = "0.61.1"+when = "2026-08-25"trusted-publisher = "github:bytecodealliance/wit-bindgen"[[publisher.wit-component]]@@ -1636,8 +1636,8 @@ when = "2026-01-06"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wit-component]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wit-parser]]@@ -1646,8 +1646,8 @@ when = "2026-01-06"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.wit-parser]]-version = "0.254.0"-when = "2026-07-20"+version = "0.258.0"+when = "2026-08-24"trusted-publisher = "github:bytecodealliance/wasm-tools"[[publisher.witx]]diff --git a/winch/codegen/src/codegen/mod.rs b/winch/codegen/src/codegen/mod.rsindex 1c37f2ff9d..f668b7206e 100644--- a/winch/codegen/src/codegen/mod.rs+++ b/winch/codegen/src/codegen/mod.rs@@ -415,7 +415,7 @@ whereops.finish()?;return Ok(());- struct ValidateThenVisit<'a, T, U>(T, &'a mut U, usize);+ struct ValidateThenVisit<'a, T, U>(T, &'a mut U, u64);macro_rules! validate_then_visit {($( @$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident $ann:tt)*) => {@@ -448,7 +448,7 @@ where/// operator.trait VisitorHooks {/// Hook prior to visiting an operator.- fn before_visit_op(&mut self, operator: &Operator, offset: usize) -> Result<()>;+ fn before_visit_op(&mut self, operator: &Operator, offset: u64) -> Result<()>;/// Hook after visiting an operator.fn after_visit_op(&mut self) -> Result<()>;@@ -470,7 +470,7 @@ whereself.context.reachable || visit_op_when_unreachable(op)}- fn before_visit_op(&mut self, operator: &Operator, offset: usize) -> Result<()> {+ fn before_visit_op(&mut self, operator: &Operator, offset: u64) -> Result<()> {// Handle source location mapping.self.source_location_before_visit_op(offset)?;@@ -2375,7 +2375,7 @@ where}// Hook to handle source location mapping before visiting an operator.- fn source_location_before_visit_op(&mut self, offset: usize) -> Result<()> {+ fn source_location_before_visit_op(&mut self, offset: u64) -> Result<()> {let loc = SourceLoc::new(offset as u32);let rel = self.source_loc_from(loc);self.source_location.current = self.masm.start_source_loc(rel)?;