Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Bump wasm-tools to 261 (#14471)

Alex Crichton5baf18d5508a
diff --git a/Cargo.lock b/Cargo.lock
index 3ff3e719d2..3e5221ffef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -197,12 +197,6 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
-
[[package]]
name = "bindgen"
version = "0.72.1"
@@ -560,7 +554,7 @@ dependencies = [
"test-programs-artifacts",
"tokio",
"wasm-compose",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime",
"wasmtime-wasi",
]
@@ -2158,14 +2152,14 @@ dependencies = [
[[package]]
name = "json-from-wast"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a16aab436cd31d583a6bfaa27fd43264f15df0843f6f7a4673e99928434c88"
+checksum = "07be2f697959e1e392693aae1f44434cecae943bb0c3e10933378224b731c010"
dependencies = [
"anyhow",
"serde",
"serde_derive",
- "wast 260.0.0",
+ "wast 261.0.0",
]
[[package]]
@@ -2256,34 +2250,32 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
[[package]]
name = "logos"
-version = "0.15.1"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff472f899b4ec2d99161c51f60ff7075eeb3097069a36050d8037a6325eb8154"
+checksum = "eb2c55a318a87600ea870ff8c2012148b44bf18b74fad48d0f835c38c7d07c5f"
dependencies = [
"logos-derive",
]
[[package]]
name = "logos-codegen"
-version = "0.15.1"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "192a3a2b90b0c05b27a0b2c43eecdb7c415e29243acc3f89cc8247a5b693045c"
+checksum = "58b3ffaa284e1350d017a57d04ada118c4583cf260c8fb01e0fe28a2e9cf8970"
dependencies = [
- "beef",
"fnv",
- "lazy_static",
"proc-macro2",
"quote",
+ "regex-automata 0.4.11",
"regex-syntax 0.8.5",
- "rustc_version",
"syn 2.0.106",
]
[[package]]
name = "logos-derive"
-version = "0.15.1"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605d9697bcd5ef3a42d38efc51541aa3d6a4a25f7ab6d1ed0da5ac632a26b470"
+checksum = "52d3a9855747c17eaf4383823f135220716ab49bea5fbea7dd42cc9a92f8aa31"
dependencies = [
"logos-codegen",
]
@@ -3200,15 +3192,6 @@ version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
[[package]]
name = "rustix"
version = "0.38.43"
@@ -3755,7 +3738,7 @@ dependencies = [
"wasmtime",
"wasmtime-test-util",
"wat",
- "wit-component 0.260.0",
+ "wit-component 0.261.0",
]
[[package]]
@@ -4222,7 +4205,7 @@ name = "verify-component-adapter"
version = "50.0.0-dev"
dependencies = [
"anyhow",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wat",
]
@@ -4299,7 +4282,7 @@ dependencies = [
"byte-array-literals",
"object 0.40.0",
"wasip1",
- "wasm-encoder 0.260.0",
+ "wasm-encoder 0.261.0",
"wit-bindgen-rust-macro 0.62.0",
]
@@ -4329,17 +4312,17 @@ dependencies = [
[[package]]
name = "wasm-compose"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05106c4f0b304aee92d905c9b915d1042abb7245c1f53dbcd610f34b3c8d0ad2"
+checksum = "df7deb87d659b1df555d3195e3df56d1f03b73d165c5a1bc3a0bad24274ea147"
dependencies = [
"anyhow",
"indexmap 2.14.0",
"log",
"petgraph",
"smallvec 1.15.1",
- "wasm-encoder 0.260.0",
- "wasmparser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasmparser 0.261.0",
"wat",
]
@@ -4365,12 +4348,12 @@ dependencies = [
[[package]]
name = "wasm-encoder"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e9692da9ef627c5ee12b45378f68ac2689ce306f88078f5cf849b7c3444ed8"
+checksum = "2608e8bb6d67fd68f5a8d0eb1363d6e7bcbc1f8ded5a0bd3a1e382462b876b22"
dependencies = [
"leb128fmt",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
]
[[package]]
@@ -4399,42 +4382,42 @@ dependencies = [
[[package]]
name = "wasm-metadata"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b777ac62b820a7e0fd6b1d6beb2712bfa15a89f611e6cd792ec60468f66d6fa"
+checksum = "b88de21560ecd49deb8d8f1616b9b695f66fc312c5eca503f43accdc5795339e"
dependencies = [
"anyhow",
"indexmap 2.14.0",
- "wasm-encoder 0.260.0",
- "wasmparser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasmparser 0.261.0",
]
[[package]]
name = "wasm-mutate"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6582a2a8fd4449b4923fdcfbf821cdd24f937ce73fc6e54d8e5efbb7ce7c07"
+checksum = "aa9552deaae387628faee297428a1a58a1b76d13931f594ef1a4337fc9aa3d88"
dependencies = [
"egg",
"log",
"rand 0.10.1",
"thiserror 2.0.17",
- "wasm-encoder 0.260.0",
- "wasmparser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasmparser 0.261.0",
]
[[package]]
name = "wasm-smith"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576a083245b0179210f505204c5cc65f81fe45d7c79b28d78378d3e57a96469b"
+checksum = "62b25880fd539272f995efa87235c61a4c36c7e87a5624601ac0c06d6dc25f9a"
dependencies = [
"anyhow",
"arbitrary",
"flagset",
"serde",
"serde_derive",
- "wasm-encoder 0.260.0",
+ "wasm-encoder 0.261.0",
"wat",
]
@@ -4448,14 +4431,14 @@ dependencies = [
[[package]]
name = "wasm-wave"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a95c97b7d741570e7b58758b1debddff3d8c714f4266f78a4f5906544ef60ead"
+checksum = "2c3077ed029568755b5d3557bc27688360f7daa19cb182aa32ff2a1035c818d0"
dependencies = [
"anyhow",
"logos",
"thiserror 2.0.17",
- "wit-parser 0.260.0",
+ "wit-parser 0.261.0",
]
[[package]]
@@ -4534,9 +4517,9 @@ dependencies = [
[[package]]
name = "wasmparser"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c94519d78304dc4a4bb5925eda6ff153bf06167467cff9233dc9593bae28fdd"
+checksum = "4f20f20e44f7e8aeb6744823ea9d869ede51e51be4fdaedede2852282e54d2d8"
dependencies = [
"bitflags 2.11.1",
"hashbrown 0.17.0",
@@ -4547,13 +4530,13 @@ dependencies = [
[[package]]
name = "wasmprinter"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7933315fe78398c862b85af65002a2e331031fbddcfe74f1f52b863fe51208e0"
+checksum = "86a21c9e3325655ba02de3e645bc8357a8b3651a2e3ada25b6dbc37560deb9b7"
dependencies = [
"anyhow",
"termcolor",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
]
[[package]]
@@ -4595,9 +4578,9 @@ dependencies = [
"tempfile",
"tokio",
"wasm-compose",
- "wasm-encoder 0.260.0",
+ "wasm-encoder 0.261.0",
"wasm-wave",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime-environ",
"wasmtime-internal-cache",
"wasmtime-internal-component-macro",
@@ -4614,7 +4597,7 @@ dependencies = [
"wasmtime-test-util",
"wat",
"windows-sys 0.61.2",
- "wit-parser 0.260.0",
+ "wit-parser 0.261.0",
]
[[package]]
@@ -4706,8 +4689,8 @@ dependencies = [
"toml",
"tracing",
"walkdir",
- "wasm-encoder 0.260.0",
- "wasmparser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasmparser 0.261.0",
"wasmprinter",
"wasmtime",
"wasmtime-cli-flags",
@@ -4729,10 +4712,10 @@ dependencies = [
"wasmtime-wasi-tls",
"wasmtime-wast",
"wasmtime-wizer",
- "wast 260.0.0",
+ "wast 261.0.0",
"wat",
"windows-sys 0.61.2",
- "wit-component 0.260.0",
+ "wit-component 0.261.0",
]
[[package]]
@@ -4776,8 +4759,8 @@ dependencies = [
"sha2",
"smallvec 1.15.1",
"target-lexicon 0.13.5",
- "wasm-encoder 0.260.0",
- "wasmparser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasmparser 0.261.0",
"wasmprinter",
"wasmtime-internal-component-util",
"wasmtime-internal-core",
@@ -4791,7 +4774,7 @@ dependencies = [
"arbitrary",
"env_logger 0.11.5",
"libfuzzer-sys",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmprinter",
"wasmtime-environ",
"wasmtime-test-util",
@@ -4823,7 +4806,7 @@ dependencies = [
"rand 0.10.1",
"smallvec 1.15.1",
"target-lexicon 0.13.5",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime",
"wasmtime-fuzzing",
"wasmtime-internal-core",
@@ -4851,12 +4834,12 @@ dependencies = [
"tempfile",
"tokio",
"v8",
- "wasm-encoder 0.260.0",
+ "wasm-encoder 0.261.0",
"wasm-mutate",
"wasm-smith",
"wasm-spec-interpreter",
"wasmi",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmprinter",
"wasmtime",
"wasmtime-cli-flags",
@@ -4913,7 +4896,7 @@ dependencies = [
"wasmtime",
"wasmtime-internal-component-util",
"wasmtime-internal-wit-bindgen",
- "wit-parser 0.260.0",
+ "wit-parser 0.261.0",
]
[[package]]
@@ -4947,7 +4930,7 @@ dependencies = [
"smallvec 1.15.1",
"target-lexicon 0.13.5",
"thiserror 2.0.17",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime-environ",
"wasmtime-internal-core",
"wasmtime-internal-unwinder",
@@ -5063,7 +5046,7 @@ dependencies = [
"log",
"object 0.40.0",
"target-lexicon 0.13.5",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime-environ",
"wasmtime-internal-cranelift",
"winch-codegen",
@@ -5077,8 +5060,8 @@ dependencies = [
"bitflags 2.11.1",
"heck",
"indexmap 2.14.0",
- "wit-component 0.260.0",
- "wit-parser 0.260.0",
+ "wit-component 0.261.0",
+ "wit-parser 0.261.0",
]
[[package]]
@@ -5122,7 +5105,7 @@ dependencies = [
"serde_derive",
"target-lexicon 0.13.5",
"toml",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmprinter",
"wasmtime",
"wasmtime-environ",
@@ -5269,9 +5252,9 @@ dependencies = [
"object 0.40.0",
"serde_json",
"tokio",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime",
- "wast 260.0.0",
+ "wast 261.0.0",
]
[[package]]
@@ -5285,8 +5268,8 @@ dependencies = [
"rayon",
"test-programs-artifacts",
"tokio",
- "wasm-encoder 0.260.0",
- "wasmparser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasmparser 0.261.0",
"wasmprinter",
"wasmtime",
"wasmtime-wasi",
@@ -5304,25 +5287,25 @@ dependencies = [
[[package]]
name = "wast"
-version = "260.0.0"
+version = "261.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17573754cde137d26852892330414efb6d1d33480adcd10e8825d092b2132229"
+checksum = "776443145731a4062e5b0d392892a2005909b6ab72d9fdc3cad53dd1a714e44a"
dependencies = [
"bumpalo",
"gimli 0.34.0",
"leb128fmt",
"memchr",
"unicode-width 0.2.0",
- "wasm-encoder 0.260.0",
+ "wasm-encoder 0.261.0",
]
[[package]]
name = "wat"
-version = "1.260.0"
+version = "1.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f56de9341c410d04121da51dd16c11d095cb6a914bd2b2850cd3c60558c0c15"
+checksum = "a7b4d1a49ea73a8f3326e74e3a05db667001b16bd1035ed3356fc1a0ed05ca7f"
dependencies = [
- "wast 260.0.0",
+ "wast 261.0.0",
]
[[package]]
@@ -5449,7 +5432,7 @@ dependencies = [
"smallvec 1.15.1",
"target-lexicon 0.13.5",
"thiserror 2.0.17",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
"wasmtime-environ",
"wasmtime-internal-core",
"wasmtime-internal-cranelift",
@@ -5764,9 +5747,9 @@ dependencies = [
[[package]]
name = "wit-component"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389106e4fbac7c5bbece1496c442d2aceb1926c18884a3ad76f7559c160b8883"
+checksum = "2818766842bd2321074c348fb5c15d8fdb105a9eb78374e6d77c7d4127e1f2f9"
dependencies = [
"anyhow",
"bitflags 2.11.1",
@@ -5775,10 +5758,10 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "wasm-encoder 0.260.0",
- "wasm-metadata 0.260.0",
- "wasmparser 0.260.0",
- "wit-parser 0.260.0",
+ "wasm-encoder 0.261.0",
+ "wasm-metadata 0.261.0",
+ "wasmparser 0.261.0",
+ "wit-parser 0.261.0",
]
[[package]]
@@ -5820,9 +5803,9 @@ dependencies = [
[[package]]
name = "wit-parser"
-version = "0.260.0"
+version = "0.261.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3152a979bbe19638bb0655cc919d5a68ba1b7b2258f8f43f7c74430004ae7f5e"
+checksum = "962e43c4db2da607b50839a531e5b63473268b40efdf8028d5c54b572ca4f6f6"
dependencies = [
"anyhow",
"hashbrown 0.17.0",
@@ -5834,7 +5817,7 @@ dependencies = [
"serde_derive",
"serde_json",
"unicode-ident",
- "wasmparser 0.260.0",
+ "wasmparser 0.261.0",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 70a9a2f5e8..8ac4467ba3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -370,18 +370,18 @@ wit-bindgen = { version = "0.62.0", default-features = false }
wit-bindgen-rust-macro = { version = "0.62.0", default-features = false }
# wasm-tools family:
-wasmparser = { version = "0.260.0", default-features = false, features = ['simd'] }
-wat = "1.260.0"
-wast = "260.0.0"
-wasmprinter = "0.260.0"
-wasm-encoder = "0.260.0"
-wasm-smith = "0.260.0"
-wasm-mutate = "0.260.0"
-wit-parser = "0.260.0"
-wit-component = "0.260.0"
-wasm-wave = "0.260.0"
-wasm-compose = { version = "0.260.0", default-features = false }
-json-from-wast = "0.260.0"
+wasmparser = { version = "0.261.0", default-features = false, features = ['simd'] }
+wat = "1.261.0"
+wast = "261.0.0"
+wasmprinter = "0.261.0"
+wasm-encoder = "0.261.0"
+wasm-smith = "0.261.0"
+wasm-mutate = "0.261.0"
+wit-parser = "0.261.0"
+wit-component = "0.261.0"
+wasm-wave = "0.261.0"
+wasm-compose = { version = "0.261.0", default-features = false }
+json-from-wast = "0.261.0"
wstd = "0.6.5"
wasip2 = "1.0"
diff --git a/crates/component-macro/tests/codegen/flags.wit b/crates/component-macro/tests/codegen/flags.wit
index 296c47e65c..d178261d2b 100644
--- a/crates/component-macro/tests/codegen/flags.wit
+++ b/crates/component-macro/tests/codegen/flags.wit
@@ -29,24 +29,12 @@ interface flegs {
b24, b25, b26, b27, b28, b29, b30, b31,
}
- flags flag64 {
- b0, b1, b2, b3, b4, b5, b6, b7,
- b8, b9, b10, b11, b12, b13, b14, b15,
- b16, b17, b18, b19, b20, b21, b22, b23,
- b24, b25, b26, b27, b28, b29, b30, b31,
- b32, b33, b34, b35, b36, b37, b38, b39,
- b40, b41, b42, b43, b44, b45, b46, b47,
- b48, b49, b50, b51, b52, b53, b54, b55,
- b56, b57, b58, b59, b60, b61, b62, b63,
- }
-
roundtrip-flag1: func(x: flag1) -> flag1;
roundtrip-flag2: func(x: flag2) -> flag2;
roundtrip-flag4: func(x: flag4) -> flag4;
roundtrip-flag8: func(x: flag8) -> flag8;
roundtrip-flag16: func(x: flag16) -> flag16;
roundtrip-flag32: func(x: flag32) -> flag32;
- roundtrip-flag64: func(x: flag64) -> flag64;
}
world the-flags {
diff --git a/crates/component-macro/tests/expanded/flags.rs b/crates/component-macro/tests/expanded/flags.rs
index 5e703b3111..e9fc916a7b 100644
--- a/crates/component-macro/tests/expanded/flags.rs
+++ b/crates/component-macro/tests/expanded/flags.rs
@@ -261,48 +261,6 @@ pub mod foo {
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::SIZE32);
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name = "b1")]
- const B1; #[component(name = "b2")] const B2; #[component(name = "b3")]
- const B3; #[component(name = "b4")] const B4; #[component(name = "b5")]
- const B5; #[component(name = "b6")] const B6; #[component(name = "b7")]
- const B7; #[component(name = "b8")] const B8; #[component(name = "b9")]
- const B9; #[component(name = "b10")] const B10; #[component(name =
- "b11")] const B11; #[component(name = "b12")] const B12; #[component(name
- = "b13")] const B13; #[component(name = "b14")] const B14;
- #[component(name = "b15")] const B15; #[component(name = "b16")] const
- B16; #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21; #[component(name
- = "b22")] const B22; #[component(name = "b23")] const B23;
- #[component(name = "b24")] const B24; #[component(name = "b25")] const
- B25; #[component(name = "b26")] const B26; #[component(name = "b27")]
- const B27; #[component(name = "b28")] const B28; #[component(name =
- "b29")] const B29; #[component(name = "b30")] const B30; #[component(name
- = "b31")] const B31; #[component(name = "b32")] const B32;
- #[component(name = "b33")] const B33; #[component(name = "b34")] const
- B34; #[component(name = "b35")] const B35; #[component(name = "b36")]
- const B36; #[component(name = "b37")] const B37; #[component(name =
- "b38")] const B38; #[component(name = "b39")] const B39; #[component(name
- = "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")] const
- B43; #[component(name = "b44")] const B44; #[component(name = "b45")]
- const B45; #[component(name = "b46")] const B46; #[component(name =
- "b47")] const B47; #[component(name = "b48")] const B48; #[component(name
- = "b49")] const B49; #[component(name = "b50")] const B50;
- #[component(name = "b51")] const B51; #[component(name = "b52")] const
- B52; #[component(name = "b53")] const B53; #[component(name = "b54")]
- const B54; #[component(name = "b55")] const B55; #[component(name =
- "b56")] const B56; #[component(name = "b57")] const B57; #[component(name
- = "b58")] const B58; #[component(name = "b59")] const B59;
- #[component(name = "b60")] const B60; #[component(name = "b61")] const
- B61; #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32);
- assert!(4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32);
- };
pub trait HostWithStore<T>: wasmtime::component::HasData {}
impl<H: ?Sized, T> HostWithStore<T> for H
where
@@ -315,7 +273,6 @@ pub mod foo {
fn roundtrip_flag8(&mut self, x: Flag8) -> Flag8;
fn roundtrip_flag16(&mut self, x: Flag16) -> Flag16;
fn roundtrip_flag32(&mut self, x: Flag32) -> Flag32;
- fn roundtrip_flag64(&mut self, x: Flag64) -> Flag64;
}
impl<_T: Host + ?Sized> Host for &mut _T {
fn roundtrip_flag1(&mut self, x: Flag1) -> Flag1 {
@@ -336,9 +293,6 @@ pub mod foo {
fn roundtrip_flag32(&mut self, x: Flag32) -> Flag32 {
Host::roundtrip_flag32(*self, x)
}
- fn roundtrip_flag64(&mut self, x: Flag64) -> Flag64 {
- Host::roundtrip_flag64(*self, x)
- }
}
pub fn add_to_linker_instance<T, D>(
inst: &mut wasmtime::component::LinkerInstance<'_, T>,
@@ -415,17 +369,6 @@ pub mod foo {
Ok((r,))
},
)?;
- inst.func_wrap(
- "roundtrip-flag64",
- move |
- mut caller: wasmtime::StoreContextMut<'_, T>,
- (arg0,): (Flag64,)|
- {
- let host = &mut host_getter(caller.data_mut());
- let r = Host::roundtrip_flag64(host, arg0);
- Ok((r,))
- },
- )?;
Ok(())
}
pub fn add_to_linker<T, D>(
@@ -550,55 +493,6 @@ pub mod exports {
4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32
);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name =
- "b1")] const B1; #[component(name = "b2")] const B2; #[component(name
- = "b3")] const B3; #[component(name = "b4")] const B4;
- #[component(name = "b5")] const B5; #[component(name = "b6")] const
- B6; #[component(name = "b7")] const B7; #[component(name = "b8")]
- const B8; #[component(name = "b9")] const B9; #[component(name =
- "b10")] const B10; #[component(name = "b11")] const B11;
- #[component(name = "b12")] const B12; #[component(name = "b13")]
- const B13; #[component(name = "b14")] const B14; #[component(name =
- "b15")] const B15; #[component(name = "b16")] const B16;
- #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21;
- #[component(name = "b22")] const B22; #[component(name = "b23")]
- const B23; #[component(name = "b24")] const B24; #[component(name =
- "b25")] const B25; #[component(name = "b26")] const B26;
- #[component(name = "b27")] const B27; #[component(name = "b28")]
- const B28; #[component(name = "b29")] const B29; #[component(name =
- "b30")] const B30; #[component(name = "b31")] const B31;
- #[component(name = "b32")] const B32; #[component(name = "b33")]
- const B33; #[component(name = "b34")] const B34; #[component(name =
- "b35")] const B35; #[component(name = "b36")] const B36;
- #[component(name = "b37")] const B37; #[component(name = "b38")]
- const B38; #[component(name = "b39")] const B39; #[component(name =
- "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")]
- const B43; #[component(name = "b44")] const B44; #[component(name =
- "b45")] const B45; #[component(name = "b46")] const B46;
- #[component(name = "b47")] const B47; #[component(name = "b48")]
- const B48; #[component(name = "b49")] const B49; #[component(name =
- "b50")] const B50; #[component(name = "b51")] const B51;
- #[component(name = "b52")] const B52; #[component(name = "b53")]
- const B53; #[component(name = "b54")] const B54; #[component(name =
- "b55")] const B55; #[component(name = "b56")] const B56;
- #[component(name = "b57")] const B57; #[component(name = "b58")]
- const B58; #[component(name = "b59")] const B59; #[component(name =
- "b60")] const B60; #[component(name = "b61")] const B61;
- #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(
- 8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32
- );
- assert!(
- 4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32
- );
- };
#[derive(Clone)]
pub struct Guest {
roundtrip_flag1: wasmtime::component::Func,
@@ -607,7 +501,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::Func,
roundtrip_flag16: wasmtime::component::Func,
roundtrip_flag32: wasmtime::component::Func,
- roundtrip_flag64: wasmtime::component::Func,
}
#[derive(Clone)]
pub struct GuestIndices {
@@ -617,7 +510,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::ComponentExportIndex,
roundtrip_flag16: wasmtime::component::ComponentExportIndex,
roundtrip_flag32: wasmtime::component::ComponentExportIndex,
- roundtrip_flag64: wasmtime::component::ComponentExportIndex,
}
impl GuestIndices {
/// Constructor for [`GuestIndices`] which takes a
@@ -644,7 +536,7 @@ pub mod exports {
.ok_or_else(|| {
wasmtime::format_err!(
"instance export `foo:foo/flegs` does \
- not have export `{name}`"
+ not have export `{name}`"
)
})
};
@@ -655,7 +547,6 @@ pub mod exports {
let roundtrip_flag8 = lookup("roundtrip-flag8")?;
let roundtrip_flag16 = lookup("roundtrip-flag16")?;
let roundtrip_flag32 = lookup("roundtrip-flag32")?;
- let roundtrip_flag64 = lookup("roundtrip-flag64")?;
Ok(GuestIndices {
roundtrip_flag1,
roundtrip_flag2,
@@ -663,7 +554,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
pub fn load(
@@ -712,12 +602,6 @@ pub mod exports {
(Flag32,),
>(&mut store, &self.roundtrip_flag32)?
.func();
- let roundtrip_flag64 = *_instance
- .get_typed_func::<
- (Flag64,),
- (Flag64,),
- >(&mut store, &self.roundtrip_flag64)?
- .func();
Ok(Guest {
roundtrip_flag1,
roundtrip_flag2,
@@ -725,7 +609,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
}
@@ -844,25 +727,6 @@ pub mod exports {
let (ret0,) = callee.call(store.as_context_mut(), (arg0,))?;
Ok(ret0)
}
- pub fn func_roundtrip_flag64(
- &self,
- ) -> wasmtime::component::TypedFunc<(Flag64,), (Flag64,)> {
- unsafe {
- wasmtime::component::TypedFunc::<
- (Flag64,),
- (Flag64,),
- >::new_unchecked(self.roundtrip_flag64)
- }
- }
- pub fn call_roundtrip_flag64<S: wasmtime::AsContextMut>(
- &self,
- mut store: S,
- arg0: Flag64,
- ) -> wasmtime::Result<Flag64> {
- let callee = self.func_roundtrip_flag64();
- let (ret0,) = callee.call(store.as_context_mut(), (arg0,))?;
- Ok(ret0)
- }
}
}
}
diff --git a/crates/component-macro/tests/expanded/flags_async.rs b/crates/component-macro/tests/expanded/flags_async.rs
index 4bb9fc7807..d1ef5afc8d 100644
--- a/crates/component-macro/tests/expanded/flags_async.rs
+++ b/crates/component-macro/tests/expanded/flags_async.rs
@@ -261,48 +261,6 @@ pub mod foo {
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::SIZE32);
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name = "b1")]
- const B1; #[component(name = "b2")] const B2; #[component(name = "b3")]
- const B3; #[component(name = "b4")] const B4; #[component(name = "b5")]
- const B5; #[component(name = "b6")] const B6; #[component(name = "b7")]
- const B7; #[component(name = "b8")] const B8; #[component(name = "b9")]
- const B9; #[component(name = "b10")] const B10; #[component(name =
- "b11")] const B11; #[component(name = "b12")] const B12; #[component(name
- = "b13")] const B13; #[component(name = "b14")] const B14;
- #[component(name = "b15")] const B15; #[component(name = "b16")] const
- B16; #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21; #[component(name
- = "b22")] const B22; #[component(name = "b23")] const B23;
- #[component(name = "b24")] const B24; #[component(name = "b25")] const
- B25; #[component(name = "b26")] const B26; #[component(name = "b27")]
- const B27; #[component(name = "b28")] const B28; #[component(name =
- "b29")] const B29; #[component(name = "b30")] const B30; #[component(name
- = "b31")] const B31; #[component(name = "b32")] const B32;
- #[component(name = "b33")] const B33; #[component(name = "b34")] const
- B34; #[component(name = "b35")] const B35; #[component(name = "b36")]
- const B36; #[component(name = "b37")] const B37; #[component(name =
- "b38")] const B38; #[component(name = "b39")] const B39; #[component(name
- = "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")] const
- B43; #[component(name = "b44")] const B44; #[component(name = "b45")]
- const B45; #[component(name = "b46")] const B46; #[component(name =
- "b47")] const B47; #[component(name = "b48")] const B48; #[component(name
- = "b49")] const B49; #[component(name = "b50")] const B50;
- #[component(name = "b51")] const B51; #[component(name = "b52")] const
- B52; #[component(name = "b53")] const B53; #[component(name = "b54")]
- const B54; #[component(name = "b55")] const B55; #[component(name =
- "b56")] const B56; #[component(name = "b57")] const B57; #[component(name
- = "b58")] const B58; #[component(name = "b59")] const B59;
- #[component(name = "b60")] const B60; #[component(name = "b61")] const
- B61; #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32);
- assert!(4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32);
- };
pub trait HostWithStore<T>: wasmtime::component::HasData + Send {}
impl<H: ?Sized, T> HostWithStore<T> for H
where
@@ -333,10 +291,6 @@ pub mod foo {
&mut self,
x: Flag32,
) -> impl ::core::future::Future<Output = Flag32> + Send;
- fn roundtrip_flag64(
- &mut self,
- x: Flag64,
- ) -> impl ::core::future::Future<Output = Flag64> + Send;
}
impl<_T: Host + ?Sized + Send> Host for &mut _T {
fn roundtrip_flag1(
@@ -375,12 +329,6 @@ pub mod foo {
) -> impl ::core::future::Future<Output = Flag32> + Send {
async move { Host::roundtrip_flag32(*self, x).await }
}
- fn roundtrip_flag64(
- &mut self,
- x: Flag64,
- ) -> impl ::core::future::Future<Output = Flag64> + Send {
- async move { Host::roundtrip_flag64(*self, x).await }
- }
}
pub fn add_to_linker_instance<T, D>(
inst: &mut wasmtime::component::LinkerInstance<'_, T>,
@@ -469,19 +417,6 @@ pub mod foo {
})
},
)?;
- inst.func_wrap_async(
- "roundtrip-flag64",
- move |
- mut caller: wasmtime::StoreContextMut<'_, T>,
- (arg0,): (Flag64,)|
- {
- wasmtime::component::__internal::Box::new(async move {
- let host = &mut host_getter(caller.data_mut());
- let r = Host::roundtrip_flag64(host, arg0).await;
- Ok((r,))
- })
- },
- )?;
Ok(())
}
pub fn add_to_linker<T, D>(
@@ -606,55 +541,6 @@ pub mod exports {
4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32
);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name =
- "b1")] const B1; #[component(name = "b2")] const B2; #[component(name
- = "b3")] const B3; #[component(name = "b4")] const B4;
- #[component(name = "b5")] const B5; #[component(name = "b6")] const
- B6; #[component(name = "b7")] const B7; #[component(name = "b8")]
- const B8; #[component(name = "b9")] const B9; #[component(name =
- "b10")] const B10; #[component(name = "b11")] const B11;
- #[component(name = "b12")] const B12; #[component(name = "b13")]
- const B13; #[component(name = "b14")] const B14; #[component(name =
- "b15")] const B15; #[component(name = "b16")] const B16;
- #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21;
- #[component(name = "b22")] const B22; #[component(name = "b23")]
- const B23; #[component(name = "b24")] const B24; #[component(name =
- "b25")] const B25; #[component(name = "b26")] const B26;
- #[component(name = "b27")] const B27; #[component(name = "b28")]
- const B28; #[component(name = "b29")] const B29; #[component(name =
- "b30")] const B30; #[component(name = "b31")] const B31;
- #[component(name = "b32")] const B32; #[component(name = "b33")]
- const B33; #[component(name = "b34")] const B34; #[component(name =
- "b35")] const B35; #[component(name = "b36")] const B36;
- #[component(name = "b37")] const B37; #[component(name = "b38")]
- const B38; #[component(name = "b39")] const B39; #[component(name =
- "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")]
- const B43; #[component(name = "b44")] const B44; #[component(name =
- "b45")] const B45; #[component(name = "b46")] const B46;
- #[component(name = "b47")] const B47; #[component(name = "b48")]
- const B48; #[component(name = "b49")] const B49; #[component(name =
- "b50")] const B50; #[component(name = "b51")] const B51;
- #[component(name = "b52")] const B52; #[component(name = "b53")]
- const B53; #[component(name = "b54")] const B54; #[component(name =
- "b55")] const B55; #[component(name = "b56")] const B56;
- #[component(name = "b57")] const B57; #[component(name = "b58")]
- const B58; #[component(name = "b59")] const B59; #[component(name =
- "b60")] const B60; #[component(name = "b61")] const B61;
- #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(
- 8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32
- );
- assert!(
- 4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32
- );
- };
#[derive(Clone)]
pub struct Guest {
roundtrip_flag1: wasmtime::component::Func,
@@ -663,7 +549,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::Func,
roundtrip_flag16: wasmtime::component::Func,
roundtrip_flag32: wasmtime::component::Func,
- roundtrip_flag64: wasmtime::component::Func,
}
#[derive(Clone)]
pub struct GuestIndices {
@@ -673,7 +558,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::ComponentExportIndex,
roundtrip_flag16: wasmtime::component::ComponentExportIndex,
roundtrip_flag32: wasmtime::component::ComponentExportIndex,
- roundtrip_flag64: wasmtime::component::ComponentExportIndex,
}
impl GuestIndices {
/// Constructor for [`GuestIndices`] which takes a
@@ -700,7 +584,7 @@ pub mod exports {
.ok_or_else(|| {
wasmtime::format_err!(
"instance export `foo:foo/flegs` does \
- not have export `{name}`"
+ not have export `{name}`"
)
})
};
@@ -711,7 +595,6 @@ pub mod exports {
let roundtrip_flag8 = lookup("roundtrip-flag8")?;
let roundtrip_flag16 = lookup("roundtrip-flag16")?;
let roundtrip_flag32 = lookup("roundtrip-flag32")?;
- let roundtrip_flag64 = lookup("roundtrip-flag64")?;
Ok(GuestIndices {
roundtrip_flag1,
roundtrip_flag2,
@@ -719,7 +602,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
pub fn load(
@@ -768,12 +650,6 @@ pub mod exports {
(Flag32,),
>(&mut store, &self.roundtrip_flag32)?
.func();
- let roundtrip_flag64 = *_instance
- .get_typed_func::<
- (Flag64,),
- (Flag64,),
- >(&mut store, &self.roundtrip_flag64)?
- .func();
Ok(Guest {
roundtrip_flag1,
roundtrip_flag2,
@@ -781,7 +657,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
}
@@ -930,30 +805,6 @@ pub mod exports {
.await?;
Ok(ret0)
}
- pub fn func_roundtrip_flag64(
- &self,
- ) -> wasmtime::component::TypedFunc<(Flag64,), (Flag64,)> {
- unsafe {
- wasmtime::component::TypedFunc::<
- (Flag64,),
- (Flag64,),
- >::new_unchecked(self.roundtrip_flag64)
- }
- }
- pub async fn call_roundtrip_flag64<S: wasmtime::AsContextMut>(
- &self,
- mut store: S,
- arg0: Flag64,
- ) -> wasmtime::Result<Flag64>
- where
- <S as wasmtime::AsContext>::Data: Send,
- {
- let callee = self.func_roundtrip_flag64();
- let (ret0,) = callee
- .call_async(store.as_context_mut(), (arg0,))
- .await?;
- Ok(ret0)
- }
}
}
}
diff --git a/crates/component-macro/tests/expanded/flags_concurrent.rs b/crates/component-macro/tests/expanded/flags_concurrent.rs
index ff3eb8c6f6..2c6d5ccefc 100644
--- a/crates/component-macro/tests/expanded/flags_concurrent.rs
+++ b/crates/component-macro/tests/expanded/flags_concurrent.rs
@@ -261,48 +261,6 @@ pub mod foo {
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::SIZE32);
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name = "b1")]
- const B1; #[component(name = "b2")] const B2; #[component(name = "b3")]
- const B3; #[component(name = "b4")] const B4; #[component(name = "b5")]
- const B5; #[component(name = "b6")] const B6; #[component(name = "b7")]
- const B7; #[component(name = "b8")] const B8; #[component(name = "b9")]
- const B9; #[component(name = "b10")] const B10; #[component(name =
- "b11")] const B11; #[component(name = "b12")] const B12; #[component(name
- = "b13")] const B13; #[component(name = "b14")] const B14;
- #[component(name = "b15")] const B15; #[component(name = "b16")] const
- B16; #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21; #[component(name
- = "b22")] const B22; #[component(name = "b23")] const B23;
- #[component(name = "b24")] const B24; #[component(name = "b25")] const
- B25; #[component(name = "b26")] const B26; #[component(name = "b27")]
- const B27; #[component(name = "b28")] const B28; #[component(name =
- "b29")] const B29; #[component(name = "b30")] const B30; #[component(name
- = "b31")] const B31; #[component(name = "b32")] const B32;
- #[component(name = "b33")] const B33; #[component(name = "b34")] const
- B34; #[component(name = "b35")] const B35; #[component(name = "b36")]
- const B36; #[component(name = "b37")] const B37; #[component(name =
- "b38")] const B38; #[component(name = "b39")] const B39; #[component(name
- = "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")] const
- B43; #[component(name = "b44")] const B44; #[component(name = "b45")]
- const B45; #[component(name = "b46")] const B46; #[component(name =
- "b47")] const B47; #[component(name = "b48")] const B48; #[component(name
- = "b49")] const B49; #[component(name = "b50")] const B50;
- #[component(name = "b51")] const B51; #[component(name = "b52")] const
- B52; #[component(name = "b53")] const B53; #[component(name = "b54")]
- const B54; #[component(name = "b55")] const B55; #[component(name =
- "b56")] const B56; #[component(name = "b57")] const B57; #[component(name
- = "b58")] const B58; #[component(name = "b59")] const B59;
- #[component(name = "b60")] const B60; #[component(name = "b61")] const
- B61; #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32);
- assert!(4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32);
- };
pub trait HostWithStore<T>: wasmtime::component::HasData + Send {
fn roundtrip_flag1(
host: wasmtime::component::Access<T, Self>,
@@ -328,10 +286,6 @@ pub mod foo {
host: wasmtime::component::Access<T, Self>,
x: Flag32,
) -> impl ::core::future::Future<Output = Flag32> + Send;
- fn roundtrip_flag64(
- host: wasmtime::component::Access<T, Self>,
- x: Flag64,
- ) -> impl ::core::future::Future<Output = Flag64> + Send;
}
pub trait Host: Send {}
impl<_T: Host + ?Sized + Send> Host for &mut _T {}
@@ -464,26 +418,6 @@ pub mod foo {
})
},
)?;
- inst.func_wrap_async(
- "roundtrip-flag64",
- move |
- mut caller: wasmtime::StoreContextMut<'_, T>,
- (arg0,): (Flag64,)|
- {
- wasmtime::component::__internal::Box::new(async move {
- let access_cx = wasmtime::AsContextMut::as_context_mut(
- &mut caller,
- );
- let host = wasmtime::component::Access::<
- T,
- D,
- >::new(access_cx, host_getter);
- let r = <D as HostWithStore<T>>::roundtrip_flag64(host, arg0)
- .await;
- Ok((r,))
- })
- },
- )?;
Ok(())
}
pub fn add_to_linker<T, D>(
@@ -608,55 +542,6 @@ pub mod exports {
4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32
);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name =
- "b1")] const B1; #[component(name = "b2")] const B2; #[component(name
- = "b3")] const B3; #[component(name = "b4")] const B4;
- #[component(name = "b5")] const B5; #[component(name = "b6")] const
- B6; #[component(name = "b7")] const B7; #[component(name = "b8")]
- const B8; #[component(name = "b9")] const B9; #[component(name =
- "b10")] const B10; #[component(name = "b11")] const B11;
- #[component(name = "b12")] const B12; #[component(name = "b13")]
- const B13; #[component(name = "b14")] const B14; #[component(name =
- "b15")] const B15; #[component(name = "b16")] const B16;
- #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21;
- #[component(name = "b22")] const B22; #[component(name = "b23")]
- const B23; #[component(name = "b24")] const B24; #[component(name =
- "b25")] const B25; #[component(name = "b26")] const B26;
- #[component(name = "b27")] const B27; #[component(name = "b28")]
- const B28; #[component(name = "b29")] const B29; #[component(name =
- "b30")] const B30; #[component(name = "b31")] const B31;
- #[component(name = "b32")] const B32; #[component(name = "b33")]
- const B33; #[component(name = "b34")] const B34; #[component(name =
- "b35")] const B35; #[component(name = "b36")] const B36;
- #[component(name = "b37")] const B37; #[component(name = "b38")]
- const B38; #[component(name = "b39")] const B39; #[component(name =
- "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")]
- const B43; #[component(name = "b44")] const B44; #[component(name =
- "b45")] const B45; #[component(name = "b46")] const B46;
- #[component(name = "b47")] const B47; #[component(name = "b48")]
- const B48; #[component(name = "b49")] const B49; #[component(name =
- "b50")] const B50; #[component(name = "b51")] const B51;
- #[component(name = "b52")] const B52; #[component(name = "b53")]
- const B53; #[component(name = "b54")] const B54; #[component(name =
- "b55")] const B55; #[component(name = "b56")] const B56;
- #[component(name = "b57")] const B57; #[component(name = "b58")]
- const B58; #[component(name = "b59")] const B59; #[component(name =
- "b60")] const B60; #[component(name = "b61")] const B61;
- #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(
- 8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32
- );
- assert!(
- 4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32
- );
- };
#[derive(Clone)]
pub struct Guest {
roundtrip_flag1: wasmtime::component::Func,
@@ -665,7 +550,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::Func,
roundtrip_flag16: wasmtime::component::Func,
roundtrip_flag32: wasmtime::component::Func,
- roundtrip_flag64: wasmtime::component::Func,
}
#[derive(Clone)]
pub struct GuestIndices {
@@ -675,7 +559,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::ComponentExportIndex,
roundtrip_flag16: wasmtime::component::ComponentExportIndex,
roundtrip_flag32: wasmtime::component::ComponentExportIndex,
- roundtrip_flag64: wasmtime::component::ComponentExportIndex,
}
impl GuestIndices {
/// Constructor for [`GuestIndices`] which takes a
@@ -713,7 +596,6 @@ pub mod exports {
let roundtrip_flag8 = lookup("roundtrip-flag8")?;
let roundtrip_flag16 = lookup("roundtrip-flag16")?;
let roundtrip_flag32 = lookup("roundtrip-flag32")?;
- let roundtrip_flag64 = lookup("roundtrip-flag64")?;
Ok(GuestIndices {
roundtrip_flag1,
roundtrip_flag2,
@@ -721,7 +603,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
pub fn load(
@@ -770,12 +651,6 @@ pub mod exports {
(Flag32,),
>(&mut store, &self.roundtrip_flag32)?
.func();
- let roundtrip_flag64 = *_instance
- .get_typed_func::<
- (Flag64,),
- (Flag64,),
- >(&mut store, &self.roundtrip_flag64)?
- .func();
Ok(Guest {
roundtrip_flag1,
roundtrip_flag2,
@@ -783,7 +658,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
}
@@ -926,29 +800,6 @@ pub mod exports {
let (ret0,) = callee.call_concurrent(accessor, (arg0,)).await?;
Ok(ret0)
}
- pub fn func_roundtrip_flag64(
- &self,
- ) -> wasmtime::component::TypedFunc<(Flag64,), (Flag64,)> {
- unsafe {
- wasmtime::component::TypedFunc::<
- (Flag64,),
- (Flag64,),
- >::new_unchecked(self.roundtrip_flag64)
- }
- }
- pub async fn call_roundtrip_flag64<_T, _D>(
- &self,
- accessor: &wasmtime::component::Accessor<_T, _D>,
- arg0: Flag64,
- ) -> wasmtime::Result<Flag64>
- where
- _T: Send,
- _D: wasmtime::component::HasData,
- {
- let callee = self.func_roundtrip_flag64();
- let (ret0,) = callee.call_concurrent(accessor, (arg0,)).await?;
- Ok(ret0)
- }
}
}
}
diff --git a/crates/component-macro/tests/expanded/flags_tracing_async.rs b/crates/component-macro/tests/expanded/flags_tracing_async.rs
index edef3ee52f..9556654657 100644
--- a/crates/component-macro/tests/expanded/flags_tracing_async.rs
+++ b/crates/component-macro/tests/expanded/flags_tracing_async.rs
@@ -261,48 +261,6 @@ pub mod foo {
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::SIZE32);
assert!(4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name = "b1")]
- const B1; #[component(name = "b2")] const B2; #[component(name = "b3")]
- const B3; #[component(name = "b4")] const B4; #[component(name = "b5")]
- const B5; #[component(name = "b6")] const B6; #[component(name = "b7")]
- const B7; #[component(name = "b8")] const B8; #[component(name = "b9")]
- const B9; #[component(name = "b10")] const B10; #[component(name =
- "b11")] const B11; #[component(name = "b12")] const B12; #[component(name
- = "b13")] const B13; #[component(name = "b14")] const B14;
- #[component(name = "b15")] const B15; #[component(name = "b16")] const
- B16; #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21; #[component(name
- = "b22")] const B22; #[component(name = "b23")] const B23;
- #[component(name = "b24")] const B24; #[component(name = "b25")] const
- B25; #[component(name = "b26")] const B26; #[component(name = "b27")]
- const B27; #[component(name = "b28")] const B28; #[component(name =
- "b29")] const B29; #[component(name = "b30")] const B30; #[component(name
- = "b31")] const B31; #[component(name = "b32")] const B32;
- #[component(name = "b33")] const B33; #[component(name = "b34")] const
- B34; #[component(name = "b35")] const B35; #[component(name = "b36")]
- const B36; #[component(name = "b37")] const B37; #[component(name =
- "b38")] const B38; #[component(name = "b39")] const B39; #[component(name
- = "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")] const
- B43; #[component(name = "b44")] const B44; #[component(name = "b45")]
- const B45; #[component(name = "b46")] const B46; #[component(name =
- "b47")] const B47; #[component(name = "b48")] const B48; #[component(name
- = "b49")] const B49; #[component(name = "b50")] const B50;
- #[component(name = "b51")] const B51; #[component(name = "b52")] const
- B52; #[component(name = "b53")] const B53; #[component(name = "b54")]
- const B54; #[component(name = "b55")] const B55; #[component(name =
- "b56")] const B56; #[component(name = "b57")] const B57; #[component(name
- = "b58")] const B58; #[component(name = "b59")] const B59;
- #[component(name = "b60")] const B60; #[component(name = "b61")] const
- B61; #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32);
- assert!(4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32);
- };
pub trait HostWithStore<T>: wasmtime::component::HasData + Send {}
impl<H: ?Sized, T> HostWithStore<T> for H
where
@@ -333,10 +291,6 @@ pub mod foo {
&mut self,
x: Flag32,
) -> impl ::core::future::Future<Output = Flag32> + Send;
- fn roundtrip_flag64(
- &mut self,
- x: Flag64,
- ) -> impl ::core::future::Future<Output = Flag64> + Send;
}
impl<_T: Host + ?Sized + Send> Host for &mut _T {
fn roundtrip_flag1(
@@ -375,12 +329,6 @@ pub mod foo {
) -> impl ::core::future::Future<Output = Flag32> + Send {
async move { Host::roundtrip_flag32(*self, x).await }
}
- fn roundtrip_flag64(
- &mut self,
- x: Flag64,
- ) -> impl ::core::future::Future<Output = Flag64> + Send {
- async move { Host::roundtrip_flag64(*self, x).await }
- }
}
pub fn add_to_linker_instance<T, D>(
inst: &mut wasmtime::component::LinkerInstance<'_, T>,
@@ -565,35 +513,6 @@ pub mod foo {
)
},
)?;
- inst.func_wrap_async(
- "roundtrip-flag64",
- move |
- mut caller: wasmtime::StoreContextMut<'_, T>,
- (arg0,): (Flag64,)|
- {
- use tracing::Instrument;
- let span = tracing::span!(
- tracing::Level::TRACE, "wit-bindgen import", module =
- "flegs", function = "roundtrip-flag64",
- );
- wasmtime::component::__internal::Box::new(
- async move {
- tracing::event!(
- tracing::Level::TRACE, x = tracing::field::debug(& arg0),
- "call"
- );
- let host = &mut host_getter(caller.data_mut());
- let r = Host::roundtrip_flag64(host, arg0).await;
- tracing::event!(
- tracing::Level::TRACE, result = tracing::field::debug(& r),
- "return"
- );
- Ok((r,))
- }
- .instrument(span),
- )
- },
- )?;
Ok(())
}
pub fn add_to_linker<T, D>(
@@ -718,55 +637,6 @@ pub mod exports {
4 == < Flag32 as wasmtime::component::ComponentType >::ALIGN32
);
};
- wasmtime::component::flags!(
- Flag64 { #[component(name = "b0")] const B0; #[component(name =
- "b1")] const B1; #[component(name = "b2")] const B2; #[component(name
- = "b3")] const B3; #[component(name = "b4")] const B4;
- #[component(name = "b5")] const B5; #[component(name = "b6")] const
- B6; #[component(name = "b7")] const B7; #[component(name = "b8")]
- const B8; #[component(name = "b9")] const B9; #[component(name =
- "b10")] const B10; #[component(name = "b11")] const B11;
- #[component(name = "b12")] const B12; #[component(name = "b13")]
- const B13; #[component(name = "b14")] const B14; #[component(name =
- "b15")] const B15; #[component(name = "b16")] const B16;
- #[component(name = "b17")] const B17; #[component(name = "b18")]
- const B18; #[component(name = "b19")] const B19; #[component(name =
- "b20")] const B20; #[component(name = "b21")] const B21;
- #[component(name = "b22")] const B22; #[component(name = "b23")]
- const B23; #[component(name = "b24")] const B24; #[component(name =
- "b25")] const B25; #[component(name = "b26")] const B26;
- #[component(name = "b27")] const B27; #[component(name = "b28")]
- const B28; #[component(name = "b29")] const B29; #[component(name =
- "b30")] const B30; #[component(name = "b31")] const B31;
- #[component(name = "b32")] const B32; #[component(name = "b33")]
- const B33; #[component(name = "b34")] const B34; #[component(name =
- "b35")] const B35; #[component(name = "b36")] const B36;
- #[component(name = "b37")] const B37; #[component(name = "b38")]
- const B38; #[component(name = "b39")] const B39; #[component(name =
- "b40")] const B40; #[component(name = "b41")] const B41;
- #[component(name = "b42")] const B42; #[component(name = "b43")]
- const B43; #[component(name = "b44")] const B44; #[component(name =
- "b45")] const B45; #[component(name = "b46")] const B46;
- #[component(name = "b47")] const B47; #[component(name = "b48")]
- const B48; #[component(name = "b49")] const B49; #[component(name =
- "b50")] const B50; #[component(name = "b51")] const B51;
- #[component(name = "b52")] const B52; #[component(name = "b53")]
- const B53; #[component(name = "b54")] const B54; #[component(name =
- "b55")] const B55; #[component(name = "b56")] const B56;
- #[component(name = "b57")] const B57; #[component(name = "b58")]
- const B58; #[component(name = "b59")] const B59; #[component(name =
- "b60")] const B60; #[component(name = "b61")] const B61;
- #[component(name = "b62")] const B62; #[component(name = "b63")]
- const B63; }
- );
- const _: () = {
- assert!(
- 8 == < Flag64 as wasmtime::component::ComponentType >::SIZE32
- );
- assert!(
- 4 == < Flag64 as wasmtime::component::ComponentType >::ALIGN32
- );
- };
#[derive(Clone)]
pub struct Guest {
roundtrip_flag1: wasmtime::component::Func,
@@ -775,7 +645,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::Func,
roundtrip_flag16: wasmtime::component::Func,
roundtrip_flag32: wasmtime::component::Func,
- roundtrip_flag64: wasmtime::component::Func,
}
#[derive(Clone)]
pub struct GuestIndices {
@@ -785,7 +654,6 @@ pub mod exports {
roundtrip_flag8: wasmtime::component::ComponentExportIndex,
roundtrip_flag16: wasmtime::component::ComponentExportIndex,
roundtrip_flag32: wasmtime::component::ComponentExportIndex,
- roundtrip_flag64: wasmtime::component::ComponentExportIndex,
}
impl GuestIndices {
/// Constructor for [`GuestIndices`] which takes a
@@ -812,7 +680,7 @@ pub mod exports {
.ok_or_else(|| {
wasmtime::format_err!(
"instance export `foo:foo/flegs` does \
- not have export `{name}`"
+ not have export `{name}`"
)
})
};
@@ -823,7 +691,6 @@ pub mod exports {
let roundtrip_flag8 = lookup("roundtrip-flag8")?;
let roundtrip_flag16 = lookup("roundtrip-flag16")?;
let roundtrip_flag32 = lookup("roundtrip-flag32")?;
- let roundtrip_flag64 = lookup("roundtrip-flag64")?;
Ok(GuestIndices {
roundtrip_flag1,
roundtrip_flag2,
@@ -831,7 +698,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
pub fn load(
@@ -880,12 +746,6 @@ pub mod exports {
(Flag32,),
>(&mut store, &self.roundtrip_flag32)?
.func();
- let roundtrip_flag64 = *_instance
- .get_typed_func::<
- (Flag64,),
- (Flag64,),
- >(&mut store, &self.roundtrip_flag64)?
- .func();
Ok(Guest {
roundtrip_flag1,
roundtrip_flag2,
@@ -893,7 +753,6 @@ pub mod exports {
roundtrip_flag8,
roundtrip_flag16,
roundtrip_flag32,
- roundtrip_flag64,
})
}
}
@@ -1078,36 +937,6 @@ pub mod exports {
.await?;
Ok(ret0)
}
- pub fn func_roundtrip_flag64(
- &self,
- ) -> wasmtime::component::TypedFunc<(Flag64,), (Flag64,)> {
- unsafe {
- wasmtime::component::TypedFunc::<
- (Flag64,),
- (Flag64,),
- >::new_unchecked(self.roundtrip_flag64)
- }
- }
- pub async fn call_roundtrip_flag64<S: wasmtime::AsContextMut>(
- &self,
- mut store: S,
- arg0: Flag64,
- ) -> wasmtime::Result<Flag64>
- where
- <S as wasmtime::AsContext>::Data: Send,
- {
- use tracing::Instrument;
- let span = tracing::span!(
- tracing::Level::TRACE, "wit-bindgen export", module =
- "foo:foo/flegs", function = "roundtrip-flag64",
- );
- let callee = self.func_roundtrip_flag64();
- let (ret0,) = callee
- .call_async(store.as_context_mut(), (arg0,))
- .instrument(span.clone())
- .await?;
- Ok(ret0)
- }
}
}
}
diff --git a/crates/test-util/src/component_fuzz.rs b/crates/test-util/src/component_fuzz.rs
index 44cd68b2f6..df1334b131 100644
--- a/crates/test-util/src/component_fuzz.rs
+++ b/crates/test-util/src/component_fuzz.rs
@@ -213,7 +213,7 @@ impl Type {
// - No Float32/Float64 (NaN comparison issues)
// - No complex types (Record, Tuple, Variant, etc.) as they might contain floats
// - String is allowed as it implements Hash + Eq
- Ok(match u.int_in_range(0..=11)? {
+ Ok(match u.int_in_range(0..=10)? {
0 => Type::Bool,
1 => Type::S8,
2 => Type::U8,
@@ -225,11 +225,6 @@ impl Type {
8 => Type::U64,
9 => Type::Char,
10 => Type::String,
- 11 => {
- let amt = u.int_in_range(1..=(*fuel).max(1).min(257))?;
- *fuel = fuel.saturating_sub(amt);
- Type::Enum(amt)
- }
_ => unreachable!(),
})
}
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 99854d332d..5dcc666697 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -333,17 +333,17 @@ version = "0.7.3"
criteria = "safe-to-deploy"
[[exemptions.logos]]
-version = "0.15.1"
+version = "0.16.1"
criteria = "safe-to-deploy"
notes = "safe when forbid_unsafe feature enabled, which it is in our dep through wasm-wave"
[[exemptions.logos-codegen]]
-version = "0.15.1"
+version = "0.16.1"
criteria = "safe-to-deploy"
notes = "safe when forbid_unsafe feature enabled, which it is in our dep through wasm-wave"
[[exemptions.logos-derive]]
-version = "0.15.1"
+version = "0.16.1"
criteria = "safe-to-deploy"
notes = "safe when forbid_unsafe feature enabled, which it is in our dep through wasm-wave"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index ba877dfc1a..568482d53e 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -922,8 +922,8 @@ user-login = "alexcrichton"
user-name = "Alex Crichton"
[[publisher.json-from-wast]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.libc]]
@@ -1409,8 +1409,8 @@ user-login = "alexcrichton"
user-name = "Alex Crichton"
[[publisher.wasm-compose]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasm-encoder]]
@@ -1424,8 +1424,8 @@ when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasm-encoder]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasm-metadata]]
@@ -1440,13 +1440,13 @@ when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasm-metadata]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasm-wave]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasmparser]]
@@ -1460,13 +1460,13 @@ when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasmparser]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasmprinter]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasmtime]]
@@ -1620,13 +1620,13 @@ when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasmtime"
[[publisher.wast]]
-version = "260.0.0"
-when = "2026-09-30"
+version = "261.0.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wat]]
-version = "1.260.0"
-when = "2026-09-30"
+version = "1.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wiggle]]
@@ -1845,8 +1845,8 @@ when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wit-component]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wit-parser]]
@@ -1860,8 +1860,8 @@ when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wit-parser]]
-version = "0.260.0"
-when = "2026-09-30"
+version = "0.261.0"
+when = "2026-10-02"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.witx]]