From df019cf327c97cc60b768076910b3116cd3672ba Mon Sep 17 00:00:00 2001 From: Christof Petig Date: Thu, 1 Aug 2024 23:09:25 +0200 Subject: [PATCH] small merge fix and dependency update --- Cargo.lock | 90 +++++++++++++++++++++--------------------- src/bin/wit-bindgen.rs | 4 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9d24eba6..9367d15ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1433,10 +1433,10 @@ name = "test-helpers" version = "0.0.0" dependencies = [ "codegen-macro", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", "wit-bindgen-core", "wit-component", - "wit-parser 0.214.0", + "wit-parser 0.215.0", ] [[package]] @@ -1710,26 +1710,26 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.214.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "0.215.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", - "wasmparser 0.214.0", ] [[package]] name = "wasm-encoder" version = "0.215.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ "leb128", + "wasmparser 0.215.0", ] [[package]] name = "wasm-metadata" -version = "0.214.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "0.215.0" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ "anyhow", "indexmap", @@ -1737,8 +1737,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.214.0", - "wasmparser 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", + "wasmparser 0.215.0", ] [[package]] @@ -1757,8 +1757,8 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.214.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "0.215.0" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ "ahash", "bitflags", @@ -1830,7 +1830,7 @@ dependencies = [ "wasmtime-slab", "wasmtime-versioned-export-macros", "wasmtime-winch", - "wat 1.215.0", + "wat 1.215.0 (registry+https://github.com/rust-lang/crates.io-index)", "windows-sys", ] @@ -2073,44 +2073,44 @@ dependencies = [ [[package]] name = "wast" -version = "214.0.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "215.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wast" version = "215.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.215.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", ] [[package]] name = "wat" -version = "1.214.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "1.215.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d" dependencies = [ - "wast 214.0.0", + "wast 215.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wat" version = "1.215.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ - "wast 215.0.0", + "wast 215.0.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", ] [[package]] @@ -2322,11 +2322,11 @@ dependencies = [ "clap", "heck 0.5.0", "test-helpers", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", "wasm-metadata", "wit-bindgen-core", "wit-component", - "wit-parser 0.214.0", + "wit-parser 0.215.0", ] [[package]] @@ -2337,8 +2337,8 @@ dependencies = [ "clap", "heck 0.5.0", "test-artifacts", - "wasm-encoder 0.214.0", - "wasmparser 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", + "wasmparser 0.215.0", "wasmtime", "wasmtime-wasi", "wit-bindgen-bridge", @@ -2351,7 +2351,7 @@ dependencies = [ "wit-bindgen-rust", "wit-bindgen-teavm-java", "wit-component", - "wit-parser 0.214.0", + "wit-parser 0.215.0", ] [[package]] @@ -2360,7 +2360,7 @@ version = "0.28.0" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.214.0", + "wit-parser 0.215.0", ] [[package]] @@ -2371,7 +2371,7 @@ dependencies = [ "clap", "heck 0.5.0", "test-helpers", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", "wasm-metadata", "wit-bindgen-c", "wit-bindgen-core", @@ -2387,12 +2387,12 @@ dependencies = [ "heck 0.5.0", "indexmap", "test-helpers", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", "wasm-metadata", - "wasmparser 0.214.0", + "wasmparser 0.215.0", "wit-bindgen-core", "wit-component", - "wit-parser 0.214.0", + "wit-parser 0.215.0", ] [[package]] @@ -2473,8 +2473,8 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.214.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "0.215.0" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ "anyhow", "bitflags", @@ -2483,11 +2483,11 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", "wasm-metadata", - "wasmparser 0.214.0", - "wat 1.214.0", - "wit-parser 0.214.0", + "wasmparser 0.215.0", + "wat 1.215.0 (git+https://github.com/cpetig/wasm-tools?branch=symmetric)", + "wit-parser 0.215.0", ] [[package]] @@ -2510,8 +2510,8 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.214.0" -source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#fcbcd794d865bd52593a2cb6854c9b75b6ef3bbc" +version = "0.215.0" +source = "git+https://github.com/cpetig/wasm-tools?branch=symmetric#3d92311bdd95208e835c0bbf1f0611ea7040db3e" dependencies = [ "anyhow", "id-arena", @@ -2522,7 +2522,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.214.0", + "wasmparser 0.215.0", ] [[package]] diff --git a/src/bin/wit-bindgen.rs b/src/bin/wit-bindgen.rs index 8bfde4256..6c97dbd9e 100644 --- a/src/bin/wit-bindgen.rs +++ b/src/bin/wit-bindgen.rs @@ -211,9 +211,9 @@ fn gen_world( resolve.features.insert(feature.to_string()); } } - let (pkgs, _files) = resolve.push_path(&opts.wit)?; + let (pkg, _files) = resolve.push_path(&opts.wit)?; resolve.add_future_and_stream_results(); - let world = resolve.select_world(&pkgs, opts.world.as_deref())?; + let world = resolve.select_world(pkg, opts.world.as_deref())?; generator.generate(&resolve, world, files)?; Ok(())