diff --git a/Cargo.lock b/Cargo.lock index ff513b6..724c796 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "aho-corasick" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" +dependencies = [ + "memchr", +] + [[package]] name = "allocator-api2" version = "0.2.21" @@ -108,12 +117,6 @@ dependencies = [ "topological-sort", ] -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - [[package]] name = "bitflags" version = "2.13.2" @@ -215,12 +218,12 @@ version = "0.1.0-dev" dependencies = [ "anyhow", "test-harness", - "wasm-encoder 0.259.0", - "wasm-metadata 0.259.0", + "wasm-encoder 0.261.0", + "wasm-metadata 0.261.0", "wasm-wave", "wasmtime", - "wit-component 0.259.0", - "wit-parser 0.259.0", + "wit-component 0.261.0", + "wit-parser 0.261.0", ] [[package]] @@ -511,8 +514,8 @@ dependencies = [ "test-harness", "wasmtime", "wit-bindgen", - "wit-component 0.259.0", - "wit-parser 0.259.0", + "wit-component 0.261.0", + "wit-parser 0.261.0", ] [[package]] @@ -817,12 +820,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "leb128fmt" version = "0.1.0" @@ -861,34 +858,32 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[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", "regex-syntax", - "rustc_version", "syn 2.0.119", ] [[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", ] @@ -1064,6 +1059,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regex-automata" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + [[package]] name = "regex-syntax" version = "0.8.11" @@ -1082,15 +1088,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" -[[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 = "1.1.5" @@ -1388,6 +1385,16 @@ dependencies = [ "wasmparser 0.259.0", ] +[[package]] +name = "wasm-encoder" +version = "0.261.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2608e8bb6d67fd68f5a8d0eb1363d6e7bcbc1f8ded5a0bd3a1e382462b876b22" +dependencies = [ + "leb128fmt", + "wasmparser 0.261.0", +] + [[package]] name = "wasm-metadata" version = "0.258.0" @@ -1405,6 +1412,18 @@ name = "wasm-metadata" version = "0.259.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7bf119eb01f4a246864c10bd87c8f26c566350abb25aa4d5273c415bbab338" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder 0.259.0", + "wasmparser 0.259.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.261.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88de21560ecd49deb8d8f1616b9b695f66fc312c5eca503f43accdc5795339e" dependencies = [ "anyhow", "auditable-serde", @@ -1415,15 +1434,15 @@ dependencies = [ "serde_json", "spdx", "url", - "wasm-encoder 0.259.0", - "wasmparser 0.259.0", + "wasm-encoder 0.261.0", + "wasmparser 0.261.0", ] [[package]] name = "wasm-wave" -version = "0.259.0" +version = "0.261.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583b7203d031ad7b426e12147042e49bc6abee8dfce21f76ceefcaa4121aae09" +checksum = "2c3077ed029568755b5d3557bc27688360f7daa19cb182aa32ff2a1035c818d0" dependencies = [ "logos", "thiserror", @@ -1454,6 +1473,18 @@ dependencies = [ "semver", ] +[[package]] +name = "wasmparser" +version = "0.261.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f20f20e44f7e8aeb6744823ea9d869ede51e51be4fdaedede2852282e54d2d8" +dependencies = [ + "bitflags", + "hashbrown 0.17.1", + "indexmap", + "semver", +] + [[package]] name = "wasmprinter" version = "0.258.0" @@ -1783,6 +1814,25 @@ dependencies = [ "wit-parser 0.259.0", ] +[[package]] +name = "wit-component" +version = "0.261.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2818766842bd2321074c348fb5c15d8fdb105a9eb78374e6d77c7d4127e1f2f9" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder 0.261.0", + "wasm-metadata 0.261.0", + "wasmparser 0.261.0", + "wit-parser 0.261.0", +] + [[package]] name = "wit-parser" version = "0.258.0" @@ -1821,6 +1871,25 @@ dependencies = [ "wasmparser 0.259.0", ] +[[package]] +name = "wit-parser" +version = "0.261.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e43c4db2da607b50839a531e5b63473268b40efdf8028d5c54b572ca4f6f6" +dependencies = [ + "anyhow", + "hashbrown 0.17.1", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-ident", + "wasmparser 0.261.0", +] + [[package]] name = "writeable" version = "0.6.4" diff --git a/Cargo.toml b/Cargo.toml index f4a8a2e..56696e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,8 +46,8 @@ futures = { version = "0.3", default-features = false, features = ["executor"] } test-harness = { path = "./crates/test-harness" } wasmtime = { version = "49", default-features = false, features = ["anyhow", "component-model", "component-model-async", "cranelift", "runtime"] } wit-bindgen = "0.62" -wit-component = "0.259.0" -wit-parser = "0.259.0" +wit-component = "0.261.0" +wit-parser = "0.261.0" [dependencies] anyhow = { workspace = true } diff --git a/components/factory/tests/factory.rs b/components/factory/tests/factory.rs index 5234421..c5afd8c 100644 --- a/components/factory/tests/factory.rs +++ b/components/factory/tests/factory.rs @@ -184,7 +184,7 @@ fn encode(wit: &str) -> Result> { true => resolve.push_str("input.wit", wit)?, false => resolve.push_path(workspace_dir().join(wit))?.0, }; - wit_component::encode(&resolve, pkg) + wit_component::encode(&resolve, pkg, true) } const WIT: &str = r#" diff --git a/crates/componentized-constants/Cargo.toml b/crates/componentized-constants/Cargo.toml index 119e441..da40817 100644 --- a/crates/componentized-constants/Cargo.toml +++ b/crates/componentized-constants/Cargo.toml @@ -16,9 +16,9 @@ include = [ [dependencies] anyhow = { workspace = true } -wasm-encoder = "0.259.0" -wasm-metadata = "0.259.0" -wasm-wave = { version = "0.259.0", default-features = false, features = ["std"] } +wasm-encoder = "0.261.0" +wasm-metadata = "0.261.0" +wasm-wave = { version = "0.261.0", default-features = false, features = ["std"] } wit-component = { workspace = true } wit-parser = { workspace = true } diff --git a/crates/componentized-constants/src/lib.rs b/crates/componentized-constants/src/lib.rs index ffb917b..fe3e166 100644 --- a/crates/componentized-constants/src/lib.rs +++ b/crates/componentized-constants/src/lib.rs @@ -342,7 +342,8 @@ fn create_module( "componentized-constants", env!("CARGO_PKG_VERSION"), ); - let component_type = metadata::encode(resolve, world, StringEncoding::UTF8, Some(&producers))?; + let component_type = + metadata::encode(resolve, world, StringEncoding::UTF8, Some(&producers), true)?; let mut module = Module::new(); module.section(&types);