diff --git a/Cargo.lock b/Cargo.lock index 142b83f68..fe5534273 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -475,9 +475,9 @@ dependencies = [ [[package]] name = "id-arena" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "idna" @@ -1015,7 +1015,7 @@ name = "test-helpers" version = "0.0.0" dependencies = [ "codegen-macro", - "wasm-encoder 0.244.0", + "wasm-encoder", "wit-bindgen-core", "wit-component", "wit-parser", @@ -1172,9 +1172,8 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wac-graph" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d511e0c9462a5f6369e7e17e9f0f3b566eab2a235076a23f2db19ca7bf36d32c" +version = "0.9.0-dev" +source = "git+https://github.com/cpetig/wac.git?branch=new_wasm_tools#9d50a16a18d4f2d7dfa497388bd0f0d26df31817" dependencies = [ "anyhow", "id-arena", @@ -1184,16 +1183,15 @@ dependencies = [ "semver", "thiserror", "wac-types", - "wasm-encoder 0.239.0", - "wasm-metadata 0.239.0", - "wasmparser 0.239.0", + "wasm-encoder", + "wasm-metadata", + "wasmparser", ] [[package]] name = "wac-parser" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47c29a894f9f82c4da2d036d410babb3bd5aed0acfb4c3d779b536a4316cba0" +version = "0.9.0-dev" +source = "git+https://github.com/cpetig/wac.git?branch=new_wasm_tools#9d50a16a18d4f2d7dfa497388bd0f0d26df31817" dependencies = [ "anyhow", "id-arena", @@ -1205,23 +1203,22 @@ dependencies = [ "serde", "thiserror", "wac-graph", - "wasm-encoder 0.239.0", - "wasm-metadata 0.239.0", - "wasmparser 0.239.0", + "wasm-encoder", + "wasm-metadata", + "wasmparser", ] [[package]] name = "wac-types" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fdef742a5198856c7c754944b329ed684f703dca477d0a77b474b37d990121" +version = "0.9.0-dev" +source = "git+https://github.com/cpetig/wac.git?branch=new_wasm_tools#9d50a16a18d4f2d7dfa497388bd0f0d26df31817" dependencies = [ "anyhow", "id-arena", "indexmap", "semver", - "wasm-encoder 0.239.0", - "wasmparser 0.239.0", + "wasm-encoder", + "wasmparser", ] [[package]] @@ -1233,8 +1230,7 @@ checksum = "6545ca20bba2f220430c4a97f6b60c48ef14eaa432b04e6b31be547037b4c9ab" [[package]] name = "wasm-compose" version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92cda9c76ca8dcac01a8b497860c2cb15cd6f216dc07060517df5abbe82512ac" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "anyhow", "heck", @@ -1246,36 +1242,24 @@ dependencies = [ "serde_derive", "serde_yaml", "smallvec", - "wasm-encoder 0.244.0", - "wasmparser 0.244.0", + "wasm-encoder", + "wasmparser", "wat", ] -[[package]] -name = "wasm-encoder" -version = "0.239.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be00faa2b4950c76fe618c409d2c3ea5a3c9422013e079482d78544bb2d184c" -dependencies = [ - "leb128fmt", - "wasmparser 0.239.0", -] - [[package]] name = "wasm-encoder" version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "leb128fmt", - "wasmparser 0.244.0", + "wasmparser", ] [[package]] name = "wasm-metadata" -version = "0.239.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b3ec880a9ac69ccd92fbdbcf46ee833071cf09f82bb005b2327c7ae6025ae2" +version = "0.244.0" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "anyhow", "auditable-serde", @@ -1286,40 +1270,14 @@ dependencies = [ "serde_json", "spdx", "url", - "wasm-encoder 0.239.0", - "wasmparser 0.239.0", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder 0.244.0", - "wasmparser 0.244.0", -] - -[[package]] -name = "wasmparser" -version = "0.239.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9d90bb93e764f6beabf1d02028c70a2156a6583e63ac4218dd07ef733368b0" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", - "serde", + "wasm-encoder", + "wasmparser", ] [[package]] name = "wasmparser" version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "bitflags", "hashbrown 0.15.5", @@ -1331,21 +1289,19 @@ dependencies = [ [[package]] name = "wast" version = "244.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e7b9f9e23311275920e3d6b56d64137c160cf8af4f84a7283b36cfecbf4acb" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width 0.2.2", - "wasm-encoder 0.244.0", + "wasm-encoder", ] [[package]] name = "wat" version = "1.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf35b87ed352f9ab6cd0732abde5a67dd6153dfd02c493e61459218b19456fa" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "wast", ] @@ -1467,8 +1423,8 @@ dependencies = [ "clap", "heck", "indexmap", - "wasm-encoder 0.244.0", - "wasm-metadata 0.244.0", + "wasm-encoder", + "wasm-metadata", "wit-bindgen-core", "wit-component", ] @@ -1480,7 +1436,7 @@ dependencies = [ "anyhow", "clap", "env_logger", - "wasm-encoder 0.244.0", + "wasm-encoder", "wit-bindgen-c", "wit-bindgen-core", "wit-bindgen-cpp", @@ -1512,8 +1468,8 @@ dependencies = [ "clap", "heck", "test-helpers", - "wasm-encoder 0.244.0", - "wasm-metadata 0.244.0", + "wasm-encoder", + "wasm-metadata", "wit-bindgen-c", "wit-bindgen-core", "wit-component", @@ -1527,7 +1483,7 @@ dependencies = [ "clap", "heck", "indexmap", - "wasm-metadata 0.244.0", + "wasm-metadata", "wit-bindgen-core", "wit-component", "wit-parser", @@ -1540,8 +1496,8 @@ dependencies = [ "anyhow", "clap", "heck", - "wasm-encoder 0.244.0", - "wasm-metadata 0.244.0", + "wasm-encoder", + "wasm-metadata", "wit-bindgen-core", "wit-component", ] @@ -1582,7 +1538,7 @@ dependencies = [ "serde_json", "syn", "test-helpers", - "wasm-metadata 0.244.0", + "wasm-metadata", "wit-bindgen", "wit-bindgen-core", "wit-component", @@ -1619,8 +1575,8 @@ dependencies = [ "wac-types", "wasi-preview1-component-adapter-provider", "wasm-compose", - "wasm-encoder 0.244.0", - "wasmparser 0.244.0", + "wasm-encoder", + "wasmparser", "wat", "wit-bindgen-csharp", "wit-component", @@ -1630,8 +1586,7 @@ dependencies = [ [[package]] name = "wit-component" version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "anyhow", "bitflags", @@ -1640,9 +1595,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.244.0", - "wasm-metadata 0.244.0", - "wasmparser 0.244.0", + "wasm-encoder", + "wasm-metadata", + "wasmparser", "wat", "wit-parser", ] @@ -1650,10 +1605,10 @@ dependencies = [ [[package]] name = "wit-parser" version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523" dependencies = [ "anyhow", + "hashbrown 0.15.5", "id-arena", "indexmap", "log", @@ -1662,7 +1617,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.244.0", + "wasmparser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cfbbf5fc9..ae1b1538b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,13 +36,13 @@ prettyplease = "0.2.20" syn = { version = "2.0.89", features = ["printing"] } futures = "0.3.31" -wat = "1.244.0" -wasmparser = "0.244.0" -wasm-encoder = "0.244.0" -wasm-metadata = { version = "0.244.0", default-features = false } -wit-parser = "0.244.0" -wit-component = "0.244.0" -wasm-compose = "0.244.0" +wat = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } +wasmparser = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } +wasm-encoder = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } +wasm-metadata = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } +wit-parser = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } +wit-component = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } +wasm-compose = { git = 'https://github.com/bytecodealliance/wasm-tools.git' } wit-bindgen-core = { path = 'crates/core', version = '0.52.0' } wit-bindgen-c = { path = 'crates/c', version = '0.52.0' } diff --git a/crates/c/src/lib.rs b/crates/c/src/lib.rs index 1799bca4c..39c844640 100644 --- a/crates/c/src/lib.rs +++ b/crates/c/src/lib.rs @@ -1066,7 +1066,7 @@ fn is_prim_type_id(resolve: &Resolve, id: TypeId) -> bool { | TypeDefKind::Future(_) | TypeDefKind::Stream(_) | TypeDefKind::Unknown => false, - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), } } @@ -1152,7 +1152,7 @@ pub fn push_ty_name(resolve: &Resolve, ty: &Type, src: &mut String) { push_ty_name(resolve, &Type::Id(*resource), src); } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), } } @@ -1366,7 +1366,7 @@ impl Return { TypeDefKind::Resource => todo!("return_single for resource"), TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), } @@ -2012,7 +2012,7 @@ impl InterfaceGenerator<'_> { self.free(&Type::Id(*id), "*ptr"); } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), } if c_helpers_body_start == self.src.c_helpers.len() { @@ -2706,7 +2706,7 @@ void {name}_return({return_ty}) {{ TypeDefKind::Type(ty) => self.contains_droppable_borrow(ty), TypeDefKind::Unknown => false, - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), } } else { @@ -4076,7 +4076,7 @@ pub fn is_arg_by_pointer(resolve: &Resolve, ty: &Type) -> bool { TypeDefKind::Stream(_) => false, TypeDefKind::Resource => todo!("is_arg_by_pointer for resource"), TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), }, Type::String => true, diff --git a/crates/core/src/abi.rs b/crates/core/src/abi.rs index 7f627aedf..d6052f505 100644 --- a/crates/core/src/abi.rs +++ b/crates/core/src/abi.rs @@ -873,7 +873,7 @@ fn needs_deallocate(resolve: &Resolve, ty: &Type, what: Deallocate) -> bool { TypeDefKind::Flags(_) | TypeDefKind::Enum(_) => false, TypeDefKind::Future(_) | TypeDefKind::Stream(_) => what.handles(), TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(t, _) => needs_deallocate(resolve, t, what), + TypeDefKind::FixedLengthList(t, _) => needs_deallocate(resolve, t, what), TypeDefKind::Map(..) => todo!(), }, @@ -1597,7 +1597,7 @@ impl<'a, B: Bindgen> Generator<'a, B> { }); } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(ty, size) => { + TypeDefKind::FixedLengthList(ty, size) => { self.emit(&FixedLengthListLower { element: ty, size: *size, @@ -1795,7 +1795,7 @@ impl<'a, B: Bindgen> Generator<'a, B> { }); } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(ty, size) => { + TypeDefKind::FixedLengthList(ty, size) => { let temp = flat_types(self.resolve, ty, None).unwrap(); let flat_per_elem = temp.to_vec().len(); let flatsize = flat_per_elem * (*size as usize); @@ -1995,7 +1995,7 @@ impl<'a, B: Bindgen> Generator<'a, B> { } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(element, size) => { + TypeDefKind::FixedLengthList(element, size) => { // resembles write_list_to_memory self.push_block(); self.emit(&IterElem { element }); @@ -2197,7 +2197,7 @@ impl<'a, B: Bindgen> Generator<'a, B> { } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(ty, size) => { + TypeDefKind::FixedLengthList(ty, size) => { self.push_block(); self.emit(&IterBasePointer); let elemaddr = self.stack.pop().unwrap(); @@ -2398,7 +2398,7 @@ impl<'a, B: Bindgen> Generator<'a, B> { TypeDefKind::Resource => unreachable!(), TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), }, } @@ -2520,7 +2520,7 @@ impl<'a, B: Bindgen> Generator<'a, B> { TypeDefKind::Future(_) => unreachable!(), TypeDefKind::Stream(_) => unreachable!(), TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(_, _) => {} + TypeDefKind::FixedLengthList(_, _) => {} TypeDefKind::Map(..) => todo!(), }, } diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index fcfb73791..7799b15e7 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -181,7 +181,7 @@ pub trait InterfaceGenerator<'a> { TypeDefKind::Future(t) => self.type_future(id, name, t, &ty.docs), TypeDefKind::Stream(t) => self.type_stream(id, name, t, &ty.docs), TypeDefKind::Handle(_) => panic!("handle types do not require definition"), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), TypeDefKind::Unknown => unreachable!(), } @@ -219,7 +219,7 @@ pub trait AnonymousTypeGenerator<'a> { TypeDefKind::Future(f) => self.anonymous_type_future(id, f, &ty.docs), TypeDefKind::Stream(s) => self.anonymous_type_stream(id, s, &ty.docs), TypeDefKind::Handle(handle) => self.anonymous_type_handle(id, handle, &ty.docs), - TypeDefKind::FixedSizeList(t, size) => { + TypeDefKind::FixedLengthList(t, size) => { self.anonymous_type_fixed_length_list(id, t, *size, &ty.docs) } TypeDefKind::Map(..) => todo!(), diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 8129aa0dc..1b99fcdd0 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -203,7 +203,7 @@ impl Types { // should use the same ownership semantics as `own` info.has_own_handle = true; } - TypeDefKind::FixedSizeList(ty, _) => { + TypeDefKind::FixedLengthList(ty, _) => { info = self.type_info(resolve, ty); } TypeDefKind::Map(..) => todo!(), diff --git a/crates/cpp/src/lib.rs b/crates/cpp/src/lib.rs index 9c02e2855..1dc2a8e5a 100644 --- a/crates/cpp/src/lib.rs +++ b/crates/cpp/src/lib.rs @@ -891,7 +891,7 @@ impl CppInterfaceGenerator<'_> { TypeDefKind::Future(_) => todo!("generate for future"), TypeDefKind::Stream(_) => todo!("generate for stream"), TypeDefKind::Handle(_) => todo!("generate for handle"), - TypeDefKind::FixedSizeList(_, _) => todo!(), + TypeDefKind::FixedLengthList(_, _) => todo!(), TypeDefKind::Map(_, _) => todo!(), TypeDefKind::Unknown => unreachable!(), } @@ -1702,7 +1702,7 @@ impl CppInterfaceGenerator<'_> { TypeDefKind::Future(_) => todo!(), TypeDefKind::Stream(_) => todo!(), TypeDefKind::Type(ty) => self.type_name(ty, from_namespace, flavor), - TypeDefKind::FixedSizeList(ty, size) => { + TypeDefKind::FixedLengthList(ty, size) => { self.r#gen.dependencies.needs_array = true; format!( "std::array<{}, {size}>", diff --git a/crates/markdown/src/lib.rs b/crates/markdown/src/lib.rs index e46a36c8c..e0b9eb712 100644 --- a/crates/markdown/src/lib.rs +++ b/crates/markdown/src/lib.rs @@ -419,7 +419,7 @@ impl InterfaceGenerator<'_> { self.push_str(">"); } TypeDefKind::Unknown => unreachable!(), - TypeDefKind::FixedSizeList(..) => todo!(), + TypeDefKind::FixedLengthList(..) => todo!(), TypeDefKind::Map(..) => todo!(), } } diff --git a/crates/test/Cargo.toml b/crates/test/Cargo.toml index 283625380..0b9e5bcff 100644 --- a/crates/test/Cargo.toml +++ b/crates/test/Cargo.toml @@ -27,9 +27,9 @@ regex = "1.11.1" serde = { workspace = true } toml = "0.8.20" wasi-preview1-component-adapter-provider = "37.0.2" -wac-parser = "0.8.1" -wac-types = "0.8.1" -wac-graph = "0.8.1" +wac-parser = { git = "https://github.com/cpetig/wac.git", branch = "new_wasm_tools" } +wac-types = { git = "https://github.com/cpetig/wac.git", branch = "new_wasm_tools" } +wac-graph = { git = "https://github.com/cpetig/wac.git", branch = "new_wasm_tools" } wasm-compose = { workspace = true } indexmap = { workspace = true } wasm-encoder = { workspace = true }