From b8a292bbfddd9113dfd08fc0a8aef8845abbc492 Mon Sep 17 00:00:00 2001 From: Zeeshan Lakhani Date: Mon, 18 Sep 2023 23:29:08 -0400 Subject: [PATCH] chore: wit-bindgen in my mind (#320) --- .github/dependabot.yml | 2 +- Cargo.lock | 78 ++---------------- homestar-functions/add/Cargo.toml | 2 +- homestar-wasm/fixtures/example_add.wasm | Bin 8768 -> 8768 bytes .../fixtures/example_add_component.wasm | Bin 8765 -> 8765 bytes .../fixtures/example_add_component.wat | 2 +- 6 files changed, 12 insertions(+), 72 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6b9da8fe..31d0f038 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,7 +9,7 @@ updates: target-branch: "main" schedule: interval: "weekly" - open-pull-requests-limit: 10 + open-pull-requests-limit: 5 - package-ecosystem: "docker" directory: "/docker" diff --git a/Cargo.lock b/Cargo.lock index 9addea17..f2b94595 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2334,7 +2334,7 @@ dependencies = [ name = "homestar-functions-add" version = "0.1.0" dependencies = [ - "wit-bindgen 0.11.0", + "wit-bindgen", ] [[package]] @@ -2342,7 +2342,7 @@ name = "homestar-functions-test" version = "0.1.0" dependencies = [ "image", - "wit-bindgen 0.12.0", + "wit-bindgen", ] [[package]] @@ -7677,16 +7677,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "wit-bindgen" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a3e8e965dc50e6eb4410d9a11720719fadc6a1713803ea5f3be390b81c8279" -dependencies = [ - "bitflags 2.4.0", - "wit-bindgen-rust-macro 0.11.0", -] - [[package]] name = "wit-bindgen" version = "0.12.0" @@ -7694,18 +7684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4f7c5d6f59ae013fc4c013c76eab667844a46e86b51987acb71b1e32953211a" dependencies = [ "bitflags 2.4.0", - "wit-bindgen-rust-macro 0.12.0", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77255512565dfbd0b61de466e854918041d1da53c7bc049d6188c6e02643dc1e" -dependencies = [ - "anyhow", - "wit-component", - "wit-parser 0.11.1", + "wit-bindgen-rust-macro", ] [[package]] @@ -7719,20 +7698,6 @@ dependencies = [ "wit-parser 0.11.1", ] -[[package]] -name = "wit-bindgen-rust" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c60e6ea8598d1380e792f13d557007834f0fb799fea6503408cbc5debb4ae" -dependencies = [ - "anyhow", - "heck", - "wasm-metadata", - "wit-bindgen-core 0.11.0", - "wit-bindgen-rust-lib 0.11.0", - "wit-component", -] - [[package]] name = "wit-bindgen-rust" version = "0.12.0" @@ -7742,21 +7707,11 @@ dependencies = [ "anyhow", "heck", "wasm-metadata", - "wit-bindgen-core 0.12.0", - "wit-bindgen-rust-lib 0.12.0", + "wit-bindgen-core", + "wit-bindgen-rust-lib", "wit-component", ] -[[package]] -name = "wit-bindgen-rust-lib" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fb7a43c7dc28b0b727d6ae01bf369981229b7539e768fba2b7a4df13feeeb" -dependencies = [ - "heck", - "wit-bindgen-core 0.11.0", -] - [[package]] name = "wit-bindgen-rust-lib" version = "0.12.0" @@ -7764,22 +7719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13c89c9c1a93e164318745841026f63f889376f38664f86a7f678930280e728" dependencies = [ "heck", - "wit-bindgen-core 0.12.0", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cea5ed784da06da0e55836a6c160e7502dbe28771c2368a595e8606243bf22" -dependencies = [ - "anyhow", - "proc-macro2", - "syn 2.0.33", - "wit-bindgen-core 0.11.0", - "wit-bindgen-rust 0.11.0", - "wit-bindgen-rust-lib 0.11.0", - "wit-component", + "wit-bindgen-core", ] [[package]] @@ -7791,9 +7731,9 @@ dependencies = [ "anyhow", "proc-macro2", "syn 2.0.33", - "wit-bindgen-core 0.12.0", - "wit-bindgen-rust 0.12.0", - "wit-bindgen-rust-lib 0.12.0", + "wit-bindgen-core", + "wit-bindgen-rust", + "wit-bindgen-rust-lib", "wit-component", ] diff --git a/homestar-functions/add/Cargo.toml b/homestar-functions/add/Cargo.toml index 7433f8c6..d2297691 100644 --- a/homestar-functions/add/Cargo.toml +++ b/homestar-functions/add/Cargo.toml @@ -6,7 +6,7 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -wit-bindgen = "0.11" +wit-bindgen = "0.12" [lib] doc = false diff --git a/homestar-wasm/fixtures/example_add.wasm b/homestar-wasm/fixtures/example_add.wasm index e0f7b016a7a2db66e1fd07fc3814248546140f44..ff7d18bc174b0fb60040ba6a185d506963b932fc 100755 GIT binary patch delta 11 ScmX@$a=>MStrD}5o&f+G=>w|( delta 11 ScmX@$a=>MStrD}Lo&f+G<^!q# diff --git a/homestar-wasm/fixtures/example_add_component.wasm b/homestar-wasm/fixtures/example_add_component.wasm index f3e5081175921930db0f072394e6cde866ef7446..808a4a679428f1368f8fa88c6a29254184af5c42 100644 GIT binary patch delta 13 Ucmdn%ve#w9Mny)W$(t0r0V-<+sQ>@~ delta 13 Ucmdn%ve#w9Mny)$$(t0r0V-w%r~m)} diff --git a/homestar-wasm/fixtures/example_add_component.wat b/homestar-wasm/fixtures/example_add_component.wat index c9529e05..a2e56260 100644 --- a/homestar-wasm/fixtures/example_add_component.wat +++ b/homestar-wasm/fixtures/example_add_component.wat @@ -3704,7 +3704,7 @@ (export "__heap_base" (global 2)) (@producers (processed-by "wit-component" "0.14.2") - (processed-by "wit-bindgen-rust" "0.11.0") + (processed-by "wit-bindgen-rust" "0.12.0") ) ) (core instance (;0;) (instantiate 0))