From 9d7d07dff8ba040529d9632b9508d7d555a22ce4 Mon Sep 17 00:00:00 2001 From: Jeremy Fleitz Date: Thu, 27 Aug 2026 08:25:09 -0400 Subject: [PATCH] update to wit-bindgen 0.61.1 Signed-off-by: Jeremy Fleitz --- Cargo.lock | 285 ++++++++++-------- Cargo.toml | 6 +- examples/sdk/component/go.mod | 2 +- examples/sdk/component/go.sum | 4 +- .../exports/wit_exports/wit_exports.go | 2 +- .../wasi_cli_environment/wit_bindings.go | 4 +- .../imports/wasi_cli_exit/wit_bindings.go | 2 +- .../imports/wasi_cli_stderr/wit_bindings.go | 22 +- .../imports/wasi_cli_stdin/wit_bindings.go | 44 +-- .../imports/wasi_cli_stdout/wit_bindings.go | 22 +- .../wasi_cli_terminal_input/wit_bindings.go | 2 +- .../wasi_cli_terminal_output/wit_bindings.go | 2 +- .../wasi_cli_terminal_stderr/wit_bindings.go | 2 +- .../wasi_cli_terminal_stdin/wit_bindings.go | 2 +- .../wasi_cli_terminal_stdout/wit_bindings.go | 2 +- .../imports/wasi_cli_types/wit_bindings.go | 2 +- .../wit_bindings.go | 2 +- .../wasi_clocks_system_clock/wit_bindings.go | 4 +- .../imports/wasi_clocks_types/wit_bindings.go | 2 +- .../wasi_filesystem_preopens/wit_bindings.go | 4 +- .../wasi_filesystem_types/wit_bindings.go | 88 +++--- .../wasi_random_insecure/wit_bindings.go | 2 +- .../wasi_random_insecure_seed/wit_bindings.go | 4 +- .../wasi_random_random/wit_bindings.go | 2 +- .../wit_bindings.go | 6 +- .../wasi_sockets_types/wit_bindings.go | 86 +++--- examples/sdk/pkg/go.mod | 2 +- examples/sdk/pkg/go.sum | 4 +- src/utils.rs | 7 +- tests/Cargo.toml | 4 +- .../foo_baz_store/wit_bindings.go | 2 +- .../named-implements/primary/wit_bindings.go | 2 +- .../secondary/wit_bindings.go | 2 +- 33 files changed, 327 insertions(+), 301 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1804202..2c270ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "cap-fs-ext" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78e5a3368ae89b7cb68186411452b4b9fac8b41be9c19bf3f47c2d2c8e36e6b" +checksum = "56ff379b70af8e08307a8f65e7040c7301cb4a572538ade16b4984f0da77847f" dependencies = [ "cap-primitives", "cap-std", @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdadbd7c002d3a484b35243669abdae85a0ebaded5a61117169dc3400f9a7ff0" +checksum = "8b5f74729fd2f44701d1a8eb47e906cdb3ccd9ec0f02baad85a744b791940b18" dependencies = [ "ambient-authority", "fs-set-times", @@ -210,9 +210,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7281235d6e96d3544ca18bba9049be92f4190f8d923e3caef1b5f66cfa752608" +checksum = "c1ec78e242cfa2cfe276807ac2ecc00315a6c97786977414bcd1c3963b6c91b8" dependencies = [ "cap-primitives", "io-extras", @@ -350,8 +350,8 @@ dependencies = [ "toml 1.1.2+spec-1.1.0", "which", "wit-bindgen-go", - "wit-component", - "wit-parser 0.254.0", + "wit-component 0.258.0", + "wit-parser 0.258.0", ] [[package]] @@ -409,27 +409,27 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0435c6939d6ef218bf0a3063094f2cc5c46f7a44a88f81cf932da8d3922ff8" +checksum = "9903e767cc0a95a59950de099a6b1d61e1476f774be1cdfa06d7ccdc9bfae56f" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca52511cc21a2c9c927aef493d11c8087bdc5483249a3d93aee41e81b8bd4d1" +checksum = "e777252ea3ec9daffa71408fbfe0793ab0a7b7bc3b2cf0f417dd0fa33964b8ef" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6867e99f068454b0c81c50b807af88aa80aaf383105e2be26675d81fc4278466" +checksum = "7828208a36e6627481cea61bd24c6234e31411d5c58b48e80ca094a1d593b944" dependencies = [ "cranelift-entity", "wasmtime-internal-core", @@ -437,9 +437,9 @@ dependencies = [ [[package]] name = "cranelift-bitset" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf66017aed971344230199ad35ca01c955cf824a0e65fed5240452d2a302445" +checksum = "a58c8447cc59ef98c49096679f81392ad0acec2224cea2bef52011f5169f9d02" dependencies = [ "serde", "serde_derive", @@ -448,9 +448,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933b2e5237665bf9367a34ad2100eed70c94b2796586cb09d9ba11693e061667" +checksum = "ce520e899df1de583e7b564eafd66760fbc147d72894d2278ddac57a1489fcc0" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -479,9 +479,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322e3ca0603683cc17f0c808559c0fb85ad52b0f20ace0478bdd4ba2fa1e9678" +checksum = "8d8ab23e63d78ea6bbda18ae1ed9c958bc1cb88d90fb5e95f5ba62e9c019474b" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -492,24 +492,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287ab88211d049178dc8dda243e2db176919d8b29db605c0efc7c6d76ebea0f7" +checksum = "24319a996b1ef40ebf8af69b39c868c790b35a42cfe38edacfd8c9deb75ea712" [[package]] name = "cranelift-control" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11438f9becf9a1e1e061bf76a33241b941a07ed01a489e9dad5fa79dc3624e9" +checksum = "cf9856d68cc2cefb83229cb2c55b620dd38427555c2fe87d73f8a4421616f628" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584ecabe1462593a9cba9efbf9022e0987421ddb548989b455ab8bdd444b743c" +checksum = "e0ec225d6b79c5d61358cb5ea081a1384ec541dbf8c1a8c618d187875af326ad" dependencies = [ "cranelift-bitset", "serde", @@ -519,9 +519,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34249873145213a12106d5fd8a98a9dc9e90e16525e2337b2907874d1e7e9ee7" +checksum = "7d3a96a09bd9bd3cf6df2de2ea15d7418f493e946a8eaa1acfe39297a67ed3f3" dependencies = [ "cranelift-codegen", "hashbrown 0.17.1", @@ -532,15 +532,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6f1c1dc4d6b4bc4f0be12b08cee0e59f7610287827aa62590f8e9ec6f45dff4" +checksum = "bd28f593c36afbdc9aa17305c0bb66c39ce0530e1caffcf389fbec053950083e" [[package]] name = "cranelift-native" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d9e4f6d9a3777b1ffa818000b4a6d7afd1b8787af71a9c58d94baef9076ced" +checksum = "2987ca47affc261aa31ac643fb80dd7f8274cebf878003ba9f50cd6ff2c1055f" dependencies = [ "cranelift-codegen", "libc", @@ -549,9 +549,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.134.2" +version = "0.135.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4155f8a1afdef96a0272c67804926eee4ef35f9708ab22ad6878d4c9543df596" +checksum = "b7431dd8c9def94aca43b27915dee0d42103d9b13922cfb044febcd975547d68" [[package]] name = "crc32fast" @@ -1554,9 +1554,9 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6064e52588328c1275d690baad99f8d4b3fdd870736966f1a63cfcbb20560b6" +checksum = "f755d75e0809a4738a3e4880eeeb852fadbe1de5a437505b84f09c381657012a" dependencies = [ "cranelift-bitset", "log", @@ -1566,9 +1566,9 @@ dependencies = [ [[package]] name = "pulley-macros" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e832980317bfc7f8c8538ffc9c69b82912f3e33ec70f7c855d521654c70fa62" +checksum = "c7e69fa1c4a555946f82e7894a7df88b0e9ee03b4266829b4811467c616ce51d" dependencies = [ "proc-macro2", "quote", @@ -1751,9 +1751,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2c52737737f8609e94f975dee22854a2d5c125772d4b1cf292120f4d45c186" +checksum = "757712e8e61590d6d4f5d563483755538b5aa13467837a3b41cd9832509a7f85" dependencies = [ "allocator-api2", "bumpalo", @@ -2646,9 +2646,9 @@ dependencies = [ [[package]] name = "wasm-compose" -version = "0.252.0" +version = "0.254.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59b710751a35d54732a63851cdfacbfb2266b7160ce174faf269d3f4e84e31b" +checksum = "8fd717357bff09b5f1ea49aea8ed1cd149b0c521823a1cc70bc2ac16b90b651a" dependencies = [ "anyhow", "heck", @@ -2656,29 +2656,29 @@ dependencies = [ "log", "petgraph", "smallvec", - "wasm-encoder 0.252.0", - "wasmparser 0.252.0", + "wasm-encoder 0.254.0", + "wasmparser 0.254.0", "wat", ] [[package]] name = "wasm-encoder" -version = "0.252.0" +version = "0.254.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8185ae345fa5687c054626ff9a50e7089797a343d9904d1dc9820eb4c4d3196f" +checksum = "09480d646178e5fdd12bb06e812d0af9a3a191dbc9cd697fdc86687beade7393" dependencies = [ "leb128fmt", - "wasmparser 0.252.0", + "wasmparser 0.254.0", ] [[package]] name = "wasm-encoder" -version = "0.254.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09480d646178e5fdd12bb06e812d0af9a3a191dbc9cd697fdc86687beade7393" +checksum = "e974fe6821a8cf64575d51ea2194e2c8f77e7b66e9afe7419ce8a97f9ee0d251" dependencies = [ "leb128fmt", - "wasmparser 0.254.0", + "wasmparser 0.258.0", ] [[package]] @@ -2693,11 +2693,23 @@ dependencies = [ "wasmparser 0.254.0", ] +[[package]] +name = "wasm-metadata" +version = "0.258.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a11585adb92fe9b55ad1d760e8d8fb5d87e0d2e303cb8eed57f078d54293a2" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder 0.258.0", + "wasmparser 0.258.0", +] + [[package]] name = "wasmparser" -version = "0.252.0" +version = "0.254.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c" +checksum = "d5769a29f799fbab136aaf65b4fe5384cd7d93fe6fc9ba0dcb6c8382a1f16e27" dependencies = [ "bitflags", "hashbrown 0.17.1", @@ -2708,9 +2720,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.254.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5769a29f799fbab136aaf65b4fe5384cd7d93fe6fc9ba0dcb6c8382a1f16e27" +checksum = "d9a61719f93a87b16d325921e251800c4833f8fab50fa21c7de73aed50086313" dependencies = [ "bitflags", "hashbrown 0.17.1", @@ -2720,27 +2732,26 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.252.0" +version = "0.254.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7142797de29b35ab8dbf15c00f55fda75d409da4c423a8ab8bd6b667a785824b" +checksum = "64e3ba11e024f504698f87b629b2b66c22a1231758de7607754963f7d198be39" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.252.0", + "wasmparser 0.254.0", ] [[package]] name = "wasmtime" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d9f263ccb212017dae1d109b9997f218a7675db1e9a7bedf07ae1643322bf3" +checksum = "1bd39f78fe9bc82cee4025ec9d52118269e9a1498016cc60119b14f2e1d86a8d" dependencies = [ "addr2line", "async-trait", "bitflags", "bumpalo", "cc", - "cfg-if", "encoding_rs", "futures", "fxprof-processed-profile", @@ -2764,8 +2775,8 @@ dependencies = [ "target-lexicon", "tempfile", "wasm-compose", - "wasm-encoder 0.252.0", - "wasmparser 0.252.0", + "wasm-encoder 0.254.0", + "wasmparser 0.254.0", "wasmtime-environ", "wasmtime-internal-cache", "wasmtime-internal-component-macro", @@ -2779,14 +2790,14 @@ dependencies = [ "wasmtime-internal-versioned-export-macros", "wat", "windows-sys 0.61.2", - "wit-parser 0.252.0", + "wit-parser 0.254.0", ] [[package]] name = "wasmtime-environ" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9915e3d90c36a16e0fec8be746ee87e21cf0d4a017ecf09c49b7d1cc6f31b2b6" +checksum = "00c1070d95484d048994ec109cd42c4932ac07e6ee3cc1886fb90c7a18ec29da" dependencies = [ "anyhow", "cpp_demangle", @@ -2806,8 +2817,8 @@ dependencies = [ "sha2", "smallvec", "target-lexicon", - "wasm-encoder 0.252.0", - "wasmparser 0.252.0", + "wasm-encoder 0.254.0", + "wasmparser 0.254.0", "wasmprinter", "wasmtime-internal-component-util", "wasmtime-internal-core", @@ -2815,9 +2826,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-cache" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7c25436e1602aad2de80bfb3f586dcdfb6fe426d5b17cba37fabf9a1714d32" +checksum = "9d447fd40f3e149cda8c0cd808660a1d1de438f3ff28627abb9bcda90dfb4895" dependencies = [ "base64", "directories-next", @@ -2835,9 +2846,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-component-macro" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b627ea698db36fb9110aa77868467f1d23791a76a88a433cb6a43e1242073b77" +checksum = "f3d2b2f9f89a65bb2277d82fbdd49263d27d8233bc717d750c4b13a23d57721c" dependencies = [ "anyhow", "proc-macro2", @@ -2845,20 +2856,20 @@ dependencies = [ "syn", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", - "wit-parser 0.252.0", + "wit-parser 0.254.0", ] [[package]] name = "wasmtime-internal-component-util" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f45bf943cff1d2f1976bac6a241ca4ecaf29a6efd5f1ad89e7722439fa5c392f" +checksum = "2c0fe8292115fda08875f29064ae9f7f0b2c1ffbb323146eae538ae34b8a613f" [[package]] name = "wasmtime-internal-core" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea33e1f9685be82f90223bebcf2ffefb6b596ea3d82a3c42384527b9c6f5b447" +checksum = "821385794cf44baf2967fd2515368429ed2bff9b9b256f62d09a0f1301474fd8" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -2868,11 +2879,10 @@ dependencies = [ [[package]] name = "wasmtime-internal-cranelift" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1ce104719932a48dbdfec0cc292c96494b0bfe764946e45fbfd3340e3a68f9" +checksum = "0238b4a52773457ad1b8a1a26be90486e0ca0108cf46b9be16cc1d8d8cabdfa1" dependencies = [ - "cfg-if", "cranelift-codegen", "cranelift-control", "cranelift-entity", @@ -2886,7 +2896,7 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror 2.0.18", - "wasmparser 0.252.0", + "wasmparser 0.254.0", "wasmtime-environ", "wasmtime-internal-core", "wasmtime-internal-unwinder", @@ -2895,12 +2905,11 @@ dependencies = [ [[package]] name = "wasmtime-internal-fiber" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976e4b71b9c0da8a9a7bb8d5fa0abedc4da879b397111fd91ece73be524fe621" +checksum = "596f1d85e06cbf9c9add9c78ea135171c5753264ffe94a83dcc082a1ff49fc9b" dependencies = [ "cc", - "cfg-if", "libc", "rustix", "wasmtime-environ", @@ -2910,9 +2919,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-debug" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f60ecba3497cfc26284903c2e79023fd5ea991b95b0e8dafe994fd9fca4c4e" +checksum = "365faed74827bb0116785bab5872372df1baaec9ec0003c83bc99ccdc595f689" dependencies = [ "cc", "object", @@ -2922,11 +2931,10 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae6decb025ae6d12f3391b36deb62a6838d45b18864f796d84bced722ceac0d" +checksum = "3cce25afd9e7ac4957292a5c6a219951dd0f140b8417e7378a97f50b67c3b96f" dependencies = [ - "cfg-if", "libc", "wasmtime-internal-core", "windows-sys 0.61.2", @@ -2934,11 +2942,10 @@ dependencies = [ [[package]] name = "wasmtime-internal-unwinder" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0982122d9470d3d72ed7aa9ed91e69538ae44c1494cd22d78fec7846b248a940" +checksum = "a1fdea09d51e39c774984ca68a7d7486767e5b2935f5e686fa654aabcfc3c42d" dependencies = [ - "cfg-if", "cranelift-codegen", "log", "object", @@ -2947,9 +2954,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363cf88a80e6ed13311d0d34d9bcd02a2e07d98113b994ff41ed386a206f498e" +checksum = "97e48a5f514c38c2f74249724cb3501e45548d3311ca9e3881694859fd6ba116" dependencies = [ "proc-macro2", "quote", @@ -2958,31 +2965,30 @@ dependencies = [ [[package]] name = "wasmtime-internal-wit-bindgen" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ff41bb1656cbeb7befc42b8a7078b30a5f8393a0c8bca36a6cec94360c1a16" +checksum = "07429ab53576255be2d298e04b2e1f381e39645465adbaebd69314b5430165c0" dependencies = [ "anyhow", "bitflags", "heck", "indexmap", - "wit-parser 0.252.0", + "wit-component 0.254.0", + "wit-parser 0.254.0", ] [[package]] name = "wasmtime-wasi" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1750b8e5e5d5b1ee3c0eb602d2c49d6a37a36e9996eaf0708b48ac92b62b06" +checksum = "85dd81ee95792682ea5b279c9ed352f6b8a2cba084c2f8abdb225e6933323fed" dependencies = [ "async-trait", "bitflags", "bytes", "cap-fs-ext", - "cap-std", - "cfg-if", + "cap-primitives", "futures", - "io-lifetimes 3.0.1", "rand 0.10.2", "rustix", "thiserror 2.0.18", @@ -2997,9 +3003,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi-io" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54777d3afeaf3f32cc444df661d9cb4fd57067971e183c2b1f5251f33b939e68" +checksum = "6a557bc8a7232cd079f6b423a9bb385f3ff9148824f3c26c07a028b499fab2bf" dependencies = [ "async-trait", "bytes", @@ -3019,24 +3025,24 @@ dependencies = [ [[package]] name = "wast" -version = "252.0.0" +version = "258.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942a3449d6a593fccc111a6241c8df52bda168af30e40bf9580d4394d7374c65" +checksum = "97f7defc7ecca8b19ac7f824598eadd0c53985ee00c74060d65051e9da5b58a1" dependencies = [ "bumpalo", "leb128fmt", "memchr", "unicode-width", - "wasm-encoder 0.252.0", + "wasm-encoder 0.258.0", ] [[package]] name = "wat" -version = "1.252.0" +version = "1.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72a4ba7088f7bac94cf516e49882bdf97068904a563768cf249efc839ec42cb" +checksum = "7555c008cca87f2ac58d9f83ccda7e7b44611093ce28eb28f052e7c78024b9bf" dependencies = [ - "wast 252.0.0", + "wast 258.0.0", ] [[package]] @@ -3079,9 +3085,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a23c2dc694dfafb35beb542e172d7c256488912cd84902828f8661723ad0eb7" +checksum = "b871ea219ad85c1e59ee7d013563814e86d2e6aa094d3bc66b7675ec4ca58bb7" dependencies = [ "bitflags", "thiserror 2.0.18", @@ -3093,9 +3099,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fe48e5e455e827339d8e65de602cc7839d241bd7063be1fc235e35581788ad" +checksum = "ed981675756e748a4725286a4059c9be006749a8db4120d54e2021d0f167bac3" dependencies = [ "heck", "proc-macro2", @@ -3107,9 +3113,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "47.0.2" +version = "48.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb520c20bed78e5a311d4c9ad883ac3b6d070617d07a19fbe5dc0b408c501b4b" +checksum = "7f3927729af874585c58b85710128e40d459a7064bb9aea9b0b420fb5eafd555" dependencies = [ "proc-macro2", "quote", @@ -3435,25 +3441,25 @@ checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "wit-bindgen-core" -version = "0.60.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=d3ebba0957500bf3edb200a89e70555545d92f6c#d3ebba0957500bf3edb200a89e70555545d92f6c" +version = "0.61.1" +source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=4f9a02d74cec9257c14ba9b160fa787a3523fd0b#4f9a02d74cec9257c14ba9b160fa787a3523fd0b" dependencies = [ "anyhow", "heck", - "wit-parser 0.254.0", + "wit-parser 0.258.0", ] [[package]] name = "wit-bindgen-go" -version = "0.60.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=d3ebba0957500bf3edb200a89e70555545d92f6c#d3ebba0957500bf3edb200a89e70555545d92f6c" +version = "0.61.1" +source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=4f9a02d74cec9257c14ba9b160fa787a3523fd0b#4f9a02d74cec9257c14ba9b160fa787a3523fd0b" dependencies = [ "anyhow", "heck", - "wasm-encoder 0.254.0", - "wasm-metadata", + "wasm-encoder 0.258.0", + "wasm-metadata 0.258.0", "wit-bindgen-core", - "wit-component", + "wit-component 0.258.0", ] [[package]] @@ -3470,16 +3476,35 @@ dependencies = [ "serde_derive", "serde_json", "wasm-encoder 0.254.0", - "wasm-metadata", + "wasm-metadata 0.254.0", "wasmparser 0.254.0", "wit-parser 0.254.0", ] +[[package]] +name = "wit-component" +version = "0.258.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "481b5c47b2ecce0389b5e08a05557d6a190c9cd761773b8880a8017ee04dc7ef" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder 0.258.0", + "wasm-metadata 0.258.0", + "wasmparser 0.258.0", + "wit-parser 0.258.0", +] + [[package]] name = "wit-parser" -version = "0.252.0" +version = "0.254.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4266bea110371c620ccf3201c5023676046bc4556e5c7cfb5d500bda5ebc162d" +checksum = "1655131e4f7d3f0cb141f6eca71315ca40eff0f3d4de7cff0a82bacedd8c89b4" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -3491,14 +3516,14 @@ dependencies = [ "serde_derive", "serde_json", "unicode-ident", - "wasmparser 0.252.0", + "wasmparser 0.254.0", ] [[package]] name = "wit-parser" -version = "0.254.0" +version = "0.258.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1655131e4f7d3f0cb141f6eca71315ca40eff0f3d4de7cff0a82bacedd8c89b4" +checksum = "ff4daaa3cd97ae49ecd0a99dc009d453f93e0f083dd3be38c0f24a83a93e37ac" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -3510,7 +3535,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-ident", - "wasmparser 0.254.0", + "wasmparser 0.258.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8b794c0..93a3935 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,8 +46,8 @@ clap = { version = "4.6.1", features = ["derive"] } regex = "1.12.4" serde = { version = "1.0.228", features = ["derive"] } toml = "1.1.0" -wit-bindgen-go = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "d3ebba0957500bf3edb200a89e70555545d92f6c" } -wit-component = "0.254.0" -wit-parser = "0.254.0" +wit-bindgen-go = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "4f9a02d74cec9257c14ba9b160fa787a3523fd0b" } +wit-component = "0.258.0" +wit-parser = "0.258.0" which = "8.0.4" dirs = "6.0.0" diff --git a/examples/sdk/component/go.mod b/examples/sdk/component/go.mod index e5b1474..6952701 100644 --- a/examples/sdk/component/go.mod +++ b/examples/sdk/component/go.mod @@ -6,4 +6,4 @@ replace pkg => ../pkg require pkg v0.0.0-00010101000000-000000000000 -require go.bytecodealliance.org/pkg v0.2.2 // indirect +require go.bytecodealliance.org/pkg v0.2.3 // indirect diff --git a/examples/sdk/component/go.sum b/examples/sdk/component/go.sum index c2ef3ce..dbd1947 100644 --- a/examples/sdk/component/go.sum +++ b/examples/sdk/component/go.sum @@ -1,2 +1,2 @@ -go.bytecodealliance.org/pkg v0.2.2 h1:O0wrZ3Mk/h9pN5747kuuIVsYlwf03kLFw+czFMV9hec= -go.bytecodealliance.org/pkg v0.2.2/go.mod h1:OjA+V8g3uUFixeCKFfamm6sYhTJdg8fvwEdJ2GO0GSk= +go.bytecodealliance.org/pkg v0.2.3 h1:So9zHg8ahW+TH1JmgBHgIYuKHcinLiEcpV1tqVEZvLA= +go.bytecodealliance.org/pkg v0.2.3/go.mod h1:OjA+V8g3uUFixeCKFfamm6sYhTJdg8fvwEdJ2GO0GSk= diff --git a/examples/sdk/pkg/bindings/exports/wit_exports/wit_exports.go b/examples/sdk/pkg/bindings/exports/wit_exports/wit_exports.go index 11d5669..eecc69c 100644 --- a/examples/sdk/pkg/bindings/exports/wit_exports/wit_exports.go +++ b/examples/sdk/pkg/bindings/exports/wit_exports/wit_exports.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_environment/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_environment/wit_bindings.go index d4ccd64..7736a23 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_environment/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_environment/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -32,7 +32,7 @@ func GetEnvironment() []witTypes.Tuple2[string, string] { value := unsafe.String((*uint8)(unsafe.Pointer(uintptr(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 0))))), *(*uint32)(unsafe.Add(unsafe.Pointer(base), 4))) value0 := unsafe.String((*uint8)(unsafe.Pointer(uintptr(*(*uint32)(unsafe.Add(unsafe.Pointer(base), (2 * 4)))))), *(*uint32)(unsafe.Add(unsafe.Pointer(base), (3 * 4)))) - result = append(result, witTypes.Tuple2[string, string]{value, value0}) + result = append(result, witTypes.Tuple2[string, string]{F0: value, F1: value0}) } result1 := result diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_exit/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_exit/wit_bindings.go index c63cacc..aadeb42 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_exit/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_exit/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_stderr/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_stderr/wit_bindings.go index ea008bf..1c810d6 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_stderr/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_stderr/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -72,16 +72,16 @@ func wasm_future_lower_result_unit_wasi_cli_types_error_code( } var wasm_future_vtable_result_unit_wasi_cli_types_error_code = witTypes.FutureVtable[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]{ - 2, - 1, - wasm_future_read_result_unit_wasi_cli_types_error_code, - wasm_future_write_result_unit_wasi_cli_types_error_code, - nil, - nil, - wasm_future_drop_readable_result_unit_wasi_cli_types_error_code, - wasm_future_drop_writable_result_unit_wasi_cli_types_error_code, - wasm_future_lift_result_unit_wasi_cli_types_error_code, - wasm_future_lower_result_unit_wasi_cli_types_error_code, + Size: 2, + Align: 1, + Read: wasm_future_read_result_unit_wasi_cli_types_error_code, + Write: wasm_future_write_result_unit_wasi_cli_types_error_code, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_future_drop_readable_result_unit_wasi_cli_types_error_code, + DropWritable: wasm_future_drop_writable_result_unit_wasi_cli_types_error_code, + Lift: wasm_future_lift_result_unit_wasi_cli_types_error_code, + Lower: wasm_future_lower_result_unit_wasi_cli_types_error_code, } func MakeFutureResultUnitWasiCliTypesErrorCode() (*witTypes.FutureWriter[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]) { diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_stdin/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_stdin/wit_bindings.go index 531da8b..2222efd 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_stdin/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_stdin/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -34,16 +34,16 @@ func wasm_stream_drop_readable_u8(handle int32) func wasm_stream_drop_writable_u8(handle int32) var wasm_stream_vtable_u8 = witTypes.StreamVtable[uint8]{ - 1, - 1, - wasm_stream_read_u8, - wasm_stream_write_u8, - nil, - nil, - wasm_stream_drop_readable_u8, - wasm_stream_drop_writable_u8, - nil, - nil, + Size: 1, + Align: 1, + Read: wasm_stream_read_u8, + Write: wasm_stream_write_u8, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_stream_drop_readable_u8, + DropWritable: wasm_stream_drop_writable_u8, + Lift: nil, + Lower: nil, } func MakeStreamU8() (*witTypes.StreamWriter[uint8], *witTypes.StreamReader[uint8]) { @@ -111,16 +111,16 @@ func wasm_future_lower_result_unit_wasi_cli_types_error_code( } var wasm_future_vtable_result_unit_wasi_cli_types_error_code = witTypes.FutureVtable[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]{ - 2, - 1, - wasm_future_read_result_unit_wasi_cli_types_error_code, - wasm_future_write_result_unit_wasi_cli_types_error_code, - nil, - nil, - wasm_future_drop_readable_result_unit_wasi_cli_types_error_code, - wasm_future_drop_writable_result_unit_wasi_cli_types_error_code, - wasm_future_lift_result_unit_wasi_cli_types_error_code, - wasm_future_lower_result_unit_wasi_cli_types_error_code, + Size: 2, + Align: 1, + Read: wasm_future_read_result_unit_wasi_cli_types_error_code, + Write: wasm_future_write_result_unit_wasi_cli_types_error_code, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_future_drop_readable_result_unit_wasi_cli_types_error_code, + DropWritable: wasm_future_drop_writable_result_unit_wasi_cli_types_error_code, + Lift: wasm_future_lift_result_unit_wasi_cli_types_error_code, + Lower: wasm_future_lower_result_unit_wasi_cli_types_error_code, } func MakeFutureResultUnitWasiCliTypesErrorCode() (*witTypes.FutureWriter[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]) { @@ -144,7 +144,7 @@ func ReadViaStream() (*witTypes.StreamReader[uint8], *witTypes.FutureReader[witT returnArea := uintptr(witRuntime.Allocate(pinner, 8, 4)) wasm_import_read_via_stream(returnArea) - result := witTypes.Tuple2[*witTypes.StreamReader[uint8], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]]{LiftStreamU8(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), LiftFutureResultUnitWasiCliTypesErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} + result := witTypes.Tuple2[*witTypes.StreamReader[uint8], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]]{F0: LiftStreamU8(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), F1: LiftFutureResultUnitWasiCliTypesErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} tuple := result return tuple.F0, tuple.F1 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_stdout/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_stdout/wit_bindings.go index d78ab74..25241ed 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_stdout/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_stdout/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -72,16 +72,16 @@ func wasm_future_lower_result_unit_wasi_cli_types_error_code( } var wasm_future_vtable_result_unit_wasi_cli_types_error_code = witTypes.FutureVtable[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]{ - 2, - 1, - wasm_future_read_result_unit_wasi_cli_types_error_code, - wasm_future_write_result_unit_wasi_cli_types_error_code, - nil, - nil, - wasm_future_drop_readable_result_unit_wasi_cli_types_error_code, - wasm_future_drop_writable_result_unit_wasi_cli_types_error_code, - wasm_future_lift_result_unit_wasi_cli_types_error_code, - wasm_future_lower_result_unit_wasi_cli_types_error_code, + Size: 2, + Align: 1, + Read: wasm_future_read_result_unit_wasi_cli_types_error_code, + Write: wasm_future_write_result_unit_wasi_cli_types_error_code, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_future_drop_readable_result_unit_wasi_cli_types_error_code, + DropWritable: wasm_future_drop_writable_result_unit_wasi_cli_types_error_code, + Lift: wasm_future_lift_result_unit_wasi_cli_types_error_code, + Lower: wasm_future_lower_result_unit_wasi_cli_types_error_code, } func MakeFutureResultUnitWasiCliTypesErrorCode() (*witTypes.FutureWriter[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, wasi_cli_types.ErrorCode]]) { diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_input/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_input/wit_bindings.go index b54007e..3b784ce 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_input/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_input/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_output/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_output/wit_bindings.go index 5b1297a..c388c84 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_output/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_output/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stderr/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stderr/wit_bindings.go index 3ec4af6..1be1cba 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stderr/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stderr/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdin/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdin/wit_bindings.go index d473a08..93599aa 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdin/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdin/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdout/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdout/wit_bindings.go index b889232..ef03edd 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdout/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_terminal_stdout/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_cli_types/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_cli_types/wit_bindings.go index 30d42e2..a00fbc7 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_cli_types/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_cli_types/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_clocks_monotonic_clock/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_clocks_monotonic_clock/wit_bindings.go index 593f74f..229d182 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_clocks_monotonic_clock/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_clocks_monotonic_clock/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_clocks_system_clock/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_clocks_system_clock/wit_bindings.go index 2fa2767..3f5cd02 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_clocks_system_clock/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_clocks_system_clock/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -32,7 +32,7 @@ func Now() Instant { returnArea := uintptr(witRuntime.Allocate(pinner, 16, 8)) wasm_import_now(returnArea) - result := Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 0)), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 8)))} + result := Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 0)), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 8)))} return result } diff --git a/examples/sdk/pkg/bindings/imports/wasi_clocks_types/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_clocks_types/wit_bindings.go index 6083713..4342e2b 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_clocks_types/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_clocks_types/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_filesystem_preopens/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_filesystem_preopens/wit_bindings.go index 47deec7..f24ca01 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_filesystem_preopens/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_filesystem_preopens/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -34,7 +34,7 @@ func GetDirectories() []witTypes.Tuple2[*wasi_filesystem_types.Descriptor, strin base := unsafe.Add(unsafe.Pointer(uintptr(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 0)))), index*(3*4)) value := unsafe.String((*uint8)(unsafe.Pointer(uintptr(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 4))))), *(*uint32)(unsafe.Add(unsafe.Pointer(base), (2 * 4)))) - result = append(result, witTypes.Tuple2[*wasi_filesystem_types.Descriptor, string]{wasi_filesystem_types.DescriptorFromOwnHandle(int32(uintptr(*(*int32)(unsafe.Add(unsafe.Pointer(base), 0))))), value}) + result = append(result, witTypes.Tuple2[*wasi_filesystem_types.Descriptor, string]{F0: wasi_filesystem_types.DescriptorFromOwnHandle(int32(uintptr(*(*int32)(unsafe.Add(unsafe.Pointer(base), 0))))), F1: value}) } result0 := result diff --git a/examples/sdk/pkg/bindings/imports/wasi_filesystem_types/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_filesystem_types/wit_bindings.go index 66cec59..826685d 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_filesystem_types/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_filesystem_types/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -35,16 +35,16 @@ func wasm_stream_drop_readable_u8(handle int32) func wasm_stream_drop_writable_u8(handle int32) var wasm_stream_vtable_u8 = witTypes.StreamVtable[uint8]{ - 1, - 1, - wasm_stream_read_u8, - wasm_stream_write_u8, - nil, - nil, - wasm_stream_drop_readable_u8, - wasm_stream_drop_writable_u8, - nil, - nil, + Size: 1, + Align: 1, + Read: wasm_stream_read_u8, + Write: wasm_stream_write_u8, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_stream_drop_readable_u8, + DropWritable: wasm_stream_drop_writable_u8, + Lift: nil, + Lower: nil, } func MakeStreamU8() (*witTypes.StreamWriter[uint8], *witTypes.StreamReader[uint8]) { @@ -445,16 +445,16 @@ func wasm_future_lower_result_unit_error_code( } var wasm_future_vtable_result_unit_error_code = witTypes.FutureVtable[witTypes.Result[witTypes.Unit, ErrorCode]]{ - (5 * 4), - 4, - wasm_future_read_result_unit_error_code, - wasm_future_write_result_unit_error_code, - nil, - nil, - wasm_future_drop_readable_result_unit_error_code, - wasm_future_drop_writable_result_unit_error_code, - wasm_future_lift_result_unit_error_code, - wasm_future_lower_result_unit_error_code, + Size: (5 * 4), + Align: 4, + Read: wasm_future_read_result_unit_error_code, + Write: wasm_future_write_result_unit_error_code, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_future_drop_readable_result_unit_error_code, + DropWritable: wasm_future_drop_writable_result_unit_error_code, + Lift: wasm_future_lift_result_unit_error_code, + Lower: wasm_future_lower_result_unit_error_code, } func MakeFutureResultUnitErrorCode() (*witTypes.FutureWriter[witTypes.Result[witTypes.Unit, ErrorCode]], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]) { @@ -534,7 +534,7 @@ func wasm_stream_lift_directory_entry(src unsafe.Pointer) DirectoryEntry { } value0 := unsafe.String((*uint8)(unsafe.Pointer(uintptr(*(*uint32)(unsafe.Add(unsafe.Pointer(src), (4 * 4)))))), *(*uint32)(unsafe.Add(unsafe.Pointer(src), (5 * 4)))) - return DirectoryEntry{variant, value0} + return DirectoryEntry{Type: variant, Name: value0} } func wasm_stream_lower_directory_entry( @@ -604,16 +604,16 @@ func wasm_stream_lower_directory_entry( } var wasm_stream_vtable_directory_entry = witTypes.StreamVtable[DirectoryEntry]{ - (6 * 4), - 4, - wasm_stream_read_directory_entry, - wasm_stream_write_directory_entry, - nil, - nil, - wasm_stream_drop_readable_directory_entry, - wasm_stream_drop_writable_directory_entry, - wasm_stream_lift_directory_entry, - wasm_stream_lower_directory_entry, + Size: (6 * 4), + Align: 4, + Read: wasm_stream_read_directory_entry, + Write: wasm_stream_write_directory_entry, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_stream_drop_readable_directory_entry, + DropWritable: wasm_stream_drop_writable_directory_entry, + Lift: wasm_stream_lift_directory_entry, + Lower: wasm_stream_lower_directory_entry, } func MakeStreamDirectoryEntry() (*witTypes.StreamWriter[DirectoryEntry], *witTypes.StreamReader[DirectoryEntry]) { @@ -990,7 +990,7 @@ func (self *Descriptor) ReadViaStream(offset uint64) (*witTypes.StreamReader[uin returnArea := uintptr(witRuntime.Allocate(pinner, 8, 4)) wasm_import_method_descriptor_read_via_stream((self).Handle(), int64(offset), returnArea) - result := witTypes.Tuple2[*witTypes.StreamReader[uint8], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]]{LiftStreamU8(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), LiftFutureResultUnitErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} + result := witTypes.Tuple2[*witTypes.StreamReader[uint8], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]]{F0: LiftStreamU8(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), F1: LiftFutureResultUnitErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} tuple := result return tuple.F0, tuple.F1 @@ -2260,7 +2260,7 @@ func (self *Descriptor) ReadDirectory() (*witTypes.StreamReader[DirectoryEntry], returnArea := uintptr(witRuntime.Allocate(pinner, 8, 4)) wasm_import_method_descriptor_read_directory((self).Handle(), returnArea) - result := witTypes.Tuple2[*witTypes.StreamReader[DirectoryEntry], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]]{LiftStreamDirectoryEntry(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), LiftFutureResultUnitErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} + result := witTypes.Tuple2[*witTypes.StreamReader[DirectoryEntry], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]]{F0: LiftStreamDirectoryEntry(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), F1: LiftFutureResultUnitErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} tuple := result return tuple.F0, tuple.F1 @@ -2719,7 +2719,7 @@ func (self *Descriptor) Stat() witTypes.Result[DescriptorStat, ErrorCode] { option0 = witTypes.None[wasi_clocks_system_clock.Instant]() case 1: - option0 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (32 + 4*4))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (40 + 4*4))))}) + option0 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (32 + 4*4))), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (40 + 4*4))))}) default: panic("unreachable") } @@ -2730,7 +2730,7 @@ func (self *Descriptor) Stat() witTypes.Result[DescriptorStat, ErrorCode] { option1 = witTypes.None[wasi_clocks_system_clock.Instant]() case 1: - option1 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (56 + 4*4))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (64 + 4*4))))}) + option1 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (56 + 4*4))), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (64 + 4*4))))}) default: panic("unreachable") } @@ -2741,12 +2741,12 @@ func (self *Descriptor) Stat() witTypes.Result[DescriptorStat, ErrorCode] { option2 = witTypes.None[wasi_clocks_system_clock.Instant]() case 1: - option2 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (80 + 4*4))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (88 + 4*4))))}) + option2 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (80 + 4*4))), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (88 + 4*4))))}) default: panic("unreachable") } - result = witTypes.Ok[DescriptorStat, ErrorCode](DescriptorStat{variant, uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 4*4)))), uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 4*4)))), option0, option1, option2}) + result = witTypes.Ok[DescriptorStat, ErrorCode](DescriptorStat{Type: variant, LinkCount: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 4*4)))), Size: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 4*4)))), DataAccessTimestamp: option0, DataModificationTimestamp: option1, StatusChangeTimestamp: option2}) case 1: var variant5 ErrorCode switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 8))) { @@ -2994,7 +2994,7 @@ func (self *Descriptor) StatAt(pathFlags PathFlags, path string) witTypes.Result option0 = witTypes.None[wasi_clocks_system_clock.Instant]() case 1: - option0 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (32 + 4*4))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (40 + 4*4))))}) + option0 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (32 + 4*4))), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (40 + 4*4))))}) default: panic("unreachable") } @@ -3005,7 +3005,7 @@ func (self *Descriptor) StatAt(pathFlags PathFlags, path string) witTypes.Result option1 = witTypes.None[wasi_clocks_system_clock.Instant]() case 1: - option1 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (56 + 4*4))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (64 + 4*4))))}) + option1 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (56 + 4*4))), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (64 + 4*4))))}) default: panic("unreachable") } @@ -3016,12 +3016,12 @@ func (self *Descriptor) StatAt(pathFlags PathFlags, path string) witTypes.Result option2 = witTypes.None[wasi_clocks_system_clock.Instant]() case 1: - option2 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (80 + 4*4))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (88 + 4*4))))}) + option2 = witTypes.Some[wasi_clocks_system_clock.Instant](wasi_clocks_system_clock.Instant{Seconds: *(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (80 + 4*4))), Nanoseconds: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (88 + 4*4))))}) default: panic("unreachable") } - result = witTypes.Ok[DescriptorStat, ErrorCode](DescriptorStat{variant, uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 4*4)))), uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 4*4)))), option0, option1, option2}) + result = witTypes.Ok[DescriptorStat, ErrorCode](DescriptorStat{Type: variant, LinkCount: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 4*4)))), Size: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 4*4)))), DataAccessTimestamp: option0, DataModificationTimestamp: option1, StatusChangeTimestamp: option2}) case 1: var variant5 ErrorCode switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 8))) { @@ -4849,7 +4849,7 @@ func (self *Descriptor) MetadataHash() witTypes.Result[MetadataHashValue, ErrorC switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 0))) { case 0: - result = witTypes.Ok[MetadataHashValue, ErrorCode](MetadataHashValue{uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 8))), uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 16)))}) + result = witTypes.Ok[MetadataHashValue, ErrorCode](MetadataHashValue{Lower: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 8))), Upper: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 16)))}) case 1: var variant ErrorCode switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 8))) { @@ -5042,7 +5042,7 @@ func (self *Descriptor) MetadataHashAt(pathFlags PathFlags, path string) witType switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 0))) { case 0: - result = witTypes.Ok[MetadataHashValue, ErrorCode](MetadataHashValue{uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 8))), uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 16)))}) + result = witTypes.Ok[MetadataHashValue, ErrorCode](MetadataHashValue{Lower: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 8))), Upper: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 16)))}) case 1: var variant ErrorCode switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 8))) { diff --git a/examples/sdk/pkg/bindings/imports/wasi_random_insecure/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_random_insecure/wit_bindings.go index 527a2f6..afd4415 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_random_insecure/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_random_insecure/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_random_insecure_seed/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_random_insecure_seed/wit_bindings.go index 5bb1027..84acfff 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_random_insecure_seed/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_random_insecure_seed/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -26,7 +26,7 @@ func GetInsecureSeed() (uint64, uint64) { returnArea := uintptr(witRuntime.Allocate(pinner, 16, 8)) wasm_import_get_insecure_seed(returnArea) - result := witTypes.Tuple2[uint64, uint64]{uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 0))), uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 8)))} + result := witTypes.Tuple2[uint64, uint64]{F0: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 0))), F1: uint64(*(*int64)(unsafe.Add(unsafe.Pointer(returnArea), 8)))} tuple := result return tuple.F0, tuple.F1 diff --git a/examples/sdk/pkg/bindings/imports/wasi_random_random/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_random_random/wit_bindings.go index 6da96f0..208a765 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_random_random/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_random_random/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 diff --git a/examples/sdk/pkg/bindings/imports/wasi_sockets_ip_name_lookup/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_sockets_ip_name_lookup/wit_bindings.go index a0298cf..039a787 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_sockets_ip_name_lookup/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_sockets_ip_name_lookup/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -106,11 +106,11 @@ func ResolveAddresses(name string) witTypes.Result[[]wasi_sockets_types.IpAddres switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 0))) { case 0: - variant = wasi_sockets_types.MakeIpAddressIpv4(witTypes.Tuple4[uint8, uint8, uint8, uint8]{uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 2)))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 3)))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 4)))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 5))))}) + variant = wasi_sockets_types.MakeIpAddressIpv4(witTypes.Tuple4[uint8, uint8, uint8, uint8]{F0: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 2)))), F1: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 3)))), F2: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 4)))), F3: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 5))))}) case 1: - variant = wasi_sockets_types.MakeIpAddressIpv6(witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 2)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 4)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 6)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 8)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 10)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 12)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 14)))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 16))))}) + variant = wasi_sockets_types.MakeIpAddressIpv6(witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{F0: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 2)))), F1: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 4)))), F2: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 6)))), F3: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 8)))), F4: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 10)))), F5: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 12)))), F6: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 14)))), F7: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(base), 16))))}) default: panic("unreachable") diff --git a/examples/sdk/pkg/bindings/imports/wasi_sockets_types/wit_bindings.go b/examples/sdk/pkg/bindings/imports/wasi_sockets_types/wit_bindings.go index 514f78b..680a01a 100644 --- a/examples/sdk/pkg/bindings/imports/wasi_sockets_types/wit_bindings.go +++ b/examples/sdk/pkg/bindings/imports/wasi_sockets_types/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.60.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // wasi:clocks@0.3.0 @@ -59,16 +59,16 @@ func wasm_stream_lower_tcp_socket( } var wasm_stream_vtable_tcp_socket = witTypes.StreamVtable[*TcpSocket]{ - 4, - 4, - wasm_stream_read_tcp_socket, - wasm_stream_write_tcp_socket, - nil, - nil, - wasm_stream_drop_readable_tcp_socket, - wasm_stream_drop_writable_tcp_socket, - wasm_stream_lift_tcp_socket, - wasm_stream_lower_tcp_socket, + Size: 4, + Align: 4, + Read: wasm_stream_read_tcp_socket, + Write: wasm_stream_write_tcp_socket, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_stream_drop_readable_tcp_socket, + DropWritable: wasm_stream_drop_writable_tcp_socket, + Lift: wasm_stream_lift_tcp_socket, + Lower: wasm_stream_lower_tcp_socket, } func MakeStreamTcpSocket() (*witTypes.StreamWriter[*TcpSocket], *witTypes.StreamReader[*TcpSocket]) { @@ -97,16 +97,16 @@ func wasm_stream_drop_readable_u8(handle int32) func wasm_stream_drop_writable_u8(handle int32) var wasm_stream_vtable_u8 = witTypes.StreamVtable[uint8]{ - 1, - 1, - wasm_stream_read_u8, - wasm_stream_write_u8, - nil, - nil, - wasm_stream_drop_readable_u8, - wasm_stream_drop_writable_u8, - nil, - nil, + Size: 1, + Align: 1, + Read: wasm_stream_read_u8, + Write: wasm_stream_write_u8, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_stream_drop_readable_u8, + DropWritable: wasm_stream_drop_writable_u8, + Lift: nil, + Lower: nil, } func MakeStreamU8() (*witTypes.StreamWriter[uint8], *witTypes.StreamReader[uint8]) { @@ -331,16 +331,16 @@ func wasm_future_lower_result_unit_error_code( } var wasm_future_vtable_result_unit_error_code = witTypes.FutureVtable[witTypes.Result[witTypes.Unit, ErrorCode]]{ - (5 * 4), - 4, - wasm_future_read_result_unit_error_code, - wasm_future_write_result_unit_error_code, - nil, - nil, - wasm_future_drop_readable_result_unit_error_code, - wasm_future_drop_writable_result_unit_error_code, - wasm_future_lift_result_unit_error_code, - wasm_future_lower_result_unit_error_code, + Size: (5 * 4), + Align: 4, + Read: wasm_future_read_result_unit_error_code, + Write: wasm_future_write_result_unit_error_code, + CancelRead: nil, + CancelWrite: nil, + DropReadable: wasm_future_drop_readable_result_unit_error_code, + DropWritable: wasm_future_drop_writable_result_unit_error_code, + Lift: wasm_future_lift_result_unit_error_code, + Lower: wasm_future_lower_result_unit_error_code, } func MakeFutureResultUnitErrorCode() (*witTypes.FutureWriter[witTypes.Result[witTypes.Unit, ErrorCode]], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]) { @@ -1214,7 +1214,7 @@ func (self *TcpSocket) Receive() (*witTypes.StreamReader[uint8], *witTypes.Futur returnArea := uintptr(witRuntime.Allocate(pinner, 8, 4)) wasm_import_method_tcp_socket_receive((self).Handle(), returnArea) - result := witTypes.Tuple2[*witTypes.StreamReader[uint8], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]]{LiftStreamU8(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), LiftFutureResultUnitErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} + result := witTypes.Tuple2[*witTypes.StreamReader[uint8], *witTypes.FutureReader[witTypes.Result[witTypes.Unit, ErrorCode]]]{F0: LiftStreamU8(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 0))), F1: LiftFutureResultUnitErrorCode(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), 4)))} tuple := result return tuple.F0, tuple.F1 @@ -1236,11 +1236,11 @@ func (self *TcpSocket) GetLocalAddress() witTypes.Result[IpSocketAddress, ErrorC switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 4))) { case 0: - variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), witTypes.Tuple4[uint8, uint8, uint8, uint8]{uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) + variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), Address: witTypes.Tuple4[uint8, uint8, uint8, uint8]{F0: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), F1: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), F2: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), F3: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) case 1: - variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) + variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), FlowInfo: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), Address: witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{F0: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), F1: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), F2: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), F3: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), F4: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), F5: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), F6: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), F7: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, ScopeId: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) default: panic("unreachable") @@ -1351,11 +1351,11 @@ func (self *TcpSocket) GetRemoteAddress() witTypes.Result[IpSocketAddress, Error switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 4))) { case 0: - variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), witTypes.Tuple4[uint8, uint8, uint8, uint8]{uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) + variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), Address: witTypes.Tuple4[uint8, uint8, uint8, uint8]{F0: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), F1: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), F2: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), F3: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) case 1: - variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) + variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), FlowInfo: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), Address: witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{F0: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), F1: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), F2: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), F3: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), F4: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), F5: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), F6: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), F7: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, ScopeId: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) default: panic("unreachable") @@ -3678,17 +3678,17 @@ func (self *UdpSocket) Receive() witTypes.Result[witTypes.Tuple2[[]uint8, IpSock switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (3 * 4)))) { case 0: - variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 3*4))))), witTypes.Tuple4[uint8, uint8, uint8, uint8]{uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 3*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 3*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 3*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 3*4)))))}}) + variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 3*4))))), Address: witTypes.Tuple4[uint8, uint8, uint8, uint8]{F0: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 3*4))))), F1: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 3*4))))), F2: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 3*4))))), F3: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 3*4)))))}}) case 1: - variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 3*4))))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 3*4)))), witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 3*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 3*4)))))}, uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 3*4))))}) + variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 3*4))))), FlowInfo: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 3*4)))), Address: witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{F0: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 3*4))))), F1: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 3*4))))), F2: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 3*4))))), F3: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 3*4))))), F4: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 3*4))))), F5: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 3*4))))), F6: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 3*4))))), F7: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 3*4)))))}, ScopeId: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 3*4))))}) default: panic("unreachable") } - result = witTypes.Ok[witTypes.Tuple2[[]uint8, IpSocketAddress], ErrorCode](witTypes.Tuple2[[]uint8, IpSocketAddress]{value, variant}) + result = witTypes.Ok[witTypes.Tuple2[[]uint8, IpSocketAddress], ErrorCode](witTypes.Tuple2[[]uint8, IpSocketAddress]{F0: value, F1: variant}) case 1: var variant1 ErrorCode switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 4))) { @@ -3793,11 +3793,11 @@ func (self *UdpSocket) GetLocalAddress() witTypes.Result[IpSocketAddress, ErrorC switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 4))) { case 0: - variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), witTypes.Tuple4[uint8, uint8, uint8, uint8]{uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) + variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), Address: witTypes.Tuple4[uint8, uint8, uint8, uint8]{F0: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), F1: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), F2: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), F3: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) case 1: - variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) + variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), FlowInfo: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), Address: witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{F0: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), F1: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), F2: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), F3: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), F4: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), F5: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), F6: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), F7: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, ScopeId: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) default: panic("unreachable") @@ -3908,11 +3908,11 @@ func (self *UdpSocket) GetRemoteAddress() witTypes.Result[IpSocketAddress, Error switch uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), 4))) { case 0: - variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), witTypes.Tuple4[uint8, uint8, uint8, uint8]{uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) + variant = MakeIpSocketAddressIpv4(Ipv4SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), Address: witTypes.Tuple4[uint8, uint8, uint8, uint8]{F0: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (6 + 1*4))))), F1: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (7 + 1*4))))), F2: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4))))), F3: uint8(uint8(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (9 + 1*4)))))}}) case 1: - variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) + variant = MakeIpSocketAddressIpv6(Ipv6SocketAddress{Port: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (4 + 1*4))))), FlowInfo: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (8 + 1*4)))), Address: witTypes.Tuple8[uint16, uint16, uint16, uint16, uint16, uint16, uint16, uint16]{F0: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (12 + 1*4))))), F1: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (14 + 1*4))))), F2: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (16 + 1*4))))), F3: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (18 + 1*4))))), F4: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (20 + 1*4))))), F5: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (22 + 1*4))))), F6: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (24 + 1*4))))), F7: uint16(uint16(*(*uint32)(unsafe.Add(unsafe.Pointer(returnArea), (26 + 1*4)))))}, ScopeId: uint32(*(*int32)(unsafe.Add(unsafe.Pointer(returnArea), (28 + 1*4))))}) default: panic("unreachable") diff --git a/examples/sdk/pkg/go.mod b/examples/sdk/pkg/go.mod index 1d9ce13..4c80283 100644 --- a/examples/sdk/pkg/go.mod +++ b/examples/sdk/pkg/go.mod @@ -2,4 +2,4 @@ module pkg go 1.25.5 -require go.bytecodealliance.org/pkg v0.2.2 +require go.bytecodealliance.org/pkg v0.2.3 diff --git a/examples/sdk/pkg/go.sum b/examples/sdk/pkg/go.sum index c2ef3ce..dbd1947 100644 --- a/examples/sdk/pkg/go.sum +++ b/examples/sdk/pkg/go.sum @@ -1,2 +1,2 @@ -go.bytecodealliance.org/pkg v0.2.2 h1:O0wrZ3Mk/h9pN5747kuuIVsYlwf03kLFw+czFMV9hec= -go.bytecodealliance.org/pkg v0.2.2/go.mod h1:OjA+V8g3uUFixeCKFfamm6sYhTJdg8fvwEdJ2GO0GSk= +go.bytecodealliance.org/pkg v0.2.3 h1:So9zHg8ahW+TH1JmgBHgIYuKHcinLiEcpV1tqVEZvLA= +go.bytecodealliance.org/pkg v0.2.3/go.mod h1:OjA+V8g3uUFixeCKFfamm6sYhTJdg8fvwEdJ2GO0GSk= diff --git a/src/utils.rs b/src/utils.rs index c4b97d8..9388139 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -213,15 +213,16 @@ pub fn embed_wit(wasm_file: &Path, resolve: &Resolve, world: WorldId) -> Result< pub fn module_to_component(wasm_file: &Path, adapt_file: Option<&Path>) -> Result<()> { let wasm: Vec = fs::read(wasm_file)?; - let mut encoder = wit_component::ComponentEncoder::default().validate(true); - encoder = encoder.module(&wasm)?; + let mut encoder = wit_component::ComponentEncoder::default(); + encoder.validate(true); + encoder.module(&wasm)?; let adapt_bytes = if let Some(adapt) = adapt_file { fs::read(adapt) .with_context(|| format!("failed to read adapt file '{}'", adapt.display()))? } else { WASIP1_SNAPSHOT_ADAPT.to_vec() }; - encoder = encoder.adapter("wasi_snapshot_preview1", &adapt_bytes)?; + encoder.adapter("wasi_snapshot_preview1", &adapt_bytes)?; let bytes = encoder .encode() diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 5ba4c09..a0c453d 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -14,5 +14,5 @@ once_cell = "1.21.3" reqwest = { workspace = true } tar = { workspace = true } tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] } -wasmtime = { version = "47.0.2" } -wasmtime-wasi = { version = "47.0.2" } +wasmtime = { version = "48.0.1" } +wasmtime-wasi = { version = "48.0.1" } diff --git a/tests/fixtures/named-implements/foo_baz_store/wit_bindings.go b/tests/fixtures/named-implements/foo_baz_store/wit_bindings.go index ac31a35..8173ddf 100644 --- a/tests/fixtures/named-implements/foo_baz_store/wit_bindings.go +++ b/tests/fixtures/named-implements/foo_baz_store/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.59.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // foo:baz@0.1.0 diff --git a/tests/fixtures/named-implements/primary/wit_bindings.go b/tests/fixtures/named-implements/primary/wit_bindings.go index e162485..229d1c6 100644 --- a/tests/fixtures/named-implements/primary/wit_bindings.go +++ b/tests/fixtures/named-implements/primary/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.59.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // foo:baz@0.1.0 diff --git a/tests/fixtures/named-implements/secondary/wit_bindings.go b/tests/fixtures/named-implements/secondary/wit_bindings.go index 83af910..ffdae2d 100644 --- a/tests/fixtures/named-implements/secondary/wit_bindings.go +++ b/tests/fixtures/named-implements/secondary/wit_bindings.go @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.59.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.61.1. DO NOT EDIT! // // This code was generated from the following packages: // foo:baz@0.1.0