From 3970942a600cfdc7bb94d94f360f6aa5d832619a Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 2 Jan 2024 13:57:30 -0800 Subject: [PATCH] Update wasmtools and wasmtime deps Signed-off-by: James Sturtevant --- Cargo.lock | 232 ++++++++++------------ Cargo.toml | 10 +- tests/wasi_snapshot_preview1.reactor.wasm | Bin 97017 -> 98729 bytes 3 files changed, 111 insertions(+), 131 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd0bfdfa5..ec085aa6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,18 +346,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb38f2af690b5a4411d9a8782b6d77dabff3ca939e0518453ab9f9a4392d41" +checksum = "7c22542c0b95bd3302f7ed6839869c561f2324bac2fd5e7e99f5cfa65fdc8b92" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39526c036b92912417e8931f52c1e235796688068d3efdbbd8b164f299d19156" +checksum = "6b3db903ef2e9c8a4de2ea6db5db052c7857282952f9df604aa55d169e6000d8" dependencies = [ "bumpalo", "cranelift-bforest", @@ -376,33 +376,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb0deedc9fccf2db53a5a3c9c9d0163e44143b0d004dca9bf6ab6a0024cd79a" +checksum = "6590feb5a1d6438f974bf6a5ac4dddf69fca14e1f07f3265d880f69e61a94463" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea2d1b274e45aa8e61e9103efa1ba82d4b5a19d12bd1fd10744c3b7380ba3ff" +checksum = "7239038c56fafe77fddc8788fc8533dd6c474dc5bdc5637216404f41ba807330" [[package]] name = "cranelift-control" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5977559a71e63db79a263f0e81a89b996e8a38212c4281e37dd1dbaa8b65c" +checksum = "f7dc9c595341404d381d27a3d950160856b35b402275f0c3990cd1ad683c8053" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f871ada808b58158d84dfc43a6a2e2d2756baaf4ed1c51fd969ca8330e6ca5c" +checksum = "44e3ee532fc4776c69bcedf7e62f9632cbb3f35776fa9a525cdade3195baa3f7" dependencies = [ "serde", "serde_derive", @@ -410,9 +410,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e6890f587ef59824b3debe577e68fdf9b307b3808c54b8d93a18fd0b70941b" +checksum = "a612c94d09e653662ec37681dc2d6fd2b9856e6df7147be0afc9aabb0abf19df" dependencies = [ "cranelift-codegen", "log", @@ -422,15 +422,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5fc6d5d3b52d1917002b17a8ecce448c2621b5bf394bb4e77e2f676893537" +checksum = "85db9830abeb1170b7d29b536ffd55af1d4d26ac8a77570b5d1aca003bf225cc" [[package]] name = "cranelift-native" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e10c2e7faa65d4ae7de9a83b44f2c31aca7dc638e17d0a79572fdf8103d720b" +checksum = "301ef0edafeaeda5771a5d2db64ac53e1818ae3111220a185677025fe91db4a1" dependencies = [ "cranelift-codegen", "libc", @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.102.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2755807efc7ec80d1cc0b6815e70f10cedf968889f0469091dbff9c5c0741c48" +checksum = "380f0abe8264e4570ac615fc31cef32a3b90a77f7eb97b08331f9dd357b1f500" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -449,7 +449,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.116.1", + "wasmparser", "wasmtime-types", ] @@ -1340,7 +1340,7 @@ name = "test-helpers" version = "0.0.0" dependencies = [ "codegen-macro", - "wasm-encoder 0.38.0", + "wasm-encoder", "wit-bindgen-core", "wit-component", "wit-parser", @@ -1536,9 +1536,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3542b8d238a3de6c9986218af842f1e8f950ca7c4707aee9d0dd83002577a759" +checksum = "154528979a211aa28d969846e883df75705809ed9bcc70aba61460683ea7355b" dependencies = [ "anyhow", "async-trait", @@ -1559,9 +1559,9 @@ dependencies = [ [[package]] name = "wasi-common" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a362c9dbdc5eb0809ce9db09e7b76805fea3ddaf2b8ff41a0e5c805935736205" +checksum = "3d888b611fee7d273dd057dc009d2dd3132736f36710ffd65657ac83628d1e3b" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -1579,27 +1579,18 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822b645bf4f2446b949776ffca47e2af60b167209ffb70814ef8779d299cd421" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b09bc5df933a3dabbdb72ae4b6b71be8ae07f58774d5aa41bd20adcd41a235a" +checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.10.13" +version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b4a14bbedb07737809c00843d1f2f88ba0b8950c114283e0387e30b1b6ee558" +checksum = "d835d67708f6374937c550ad8dd1d17c616ae009e3f00d7a0ac9f7825e78c36a" dependencies = [ "anyhow", "indexmap", @@ -1607,25 +1598,15 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.38.0", - "wasmparser 0.118.0", -] - -[[package]] -name = "wasmparser" -version = "0.116.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" -dependencies = [ - "indexmap", - "semver", + "wasm-encoder", + "wasmparser", ] [[package]] name = "wasmparser" -version = "0.118.0" +version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebbb91574de0011ded32b14db12777e7dd5e9ea2f9d7317a1ab51a9495c75924" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ "indexmap", "semver", @@ -1633,19 +1614,19 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.72" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aff4df0cdf1906ec040e97d78c3fc8fd26d3f8d70adaac81f07f80957b63b54" +checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" dependencies = [ "anyhow", - "wasmparser 0.116.1", + "wasmparser", ] [[package]] name = "wasmtime" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae4b1702ef55144d6f594085f4989dc71fb71a791be1c8354ecc8e489b81199b" +checksum = "a8e539fded2495422ea3c4dfa7beeddba45904eece182cf315294009e1a323bf" dependencies = [ "anyhow", "async-trait", @@ -1660,14 +1641,13 @@ dependencies = [ "object", "once_cell", "paste", - "psm", "rayon", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder", + "wasmparser", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", @@ -1683,18 +1663,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c981d0e87bb3e98e08e76644e7ae5dfdef7f1d4105145853f3d677bb4535d65f" +checksum = "660ba9143e15a2acd921820df221b73aee256bd3ca2d208d73d8adc9587ccbb9" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7ba8adaa84fdb9dd659275edcf7fc5282c44b9c9f829986c71d44fd52ea80a" +checksum = "a3ce373743892002f9391c6741ef0cb0335b55ec899d874f311222b7e36f4594" dependencies = [ "anyhow", "base64", @@ -1712,9 +1692,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91dcbbd0e1f094351d1ae0e53463c63ba53ec8f8e0e21d17567c1979a8c3758" +checksum = "12ef32643324e564e1c359e9044daa06cbf90d7e2d6c99a738d17a12959f01a5" dependencies = [ "anyhow", "proc-macro2", @@ -1727,15 +1707,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e85f1319a7ed36aa59446ab7e967d0c2fb0cd179bf56913633190b44572023e" +checksum = "8c87d06c18d21a4818f354c00a85f4ebc62b2270961cd022968452b0e4dbed9d" [[package]] name = "wasmtime-cranelift" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1453665878e16245b9a25405e550c4a36c6731c6e34ea804edc002a38c3e6741" +checksum = "2d648c8b4064a7911093b02237cd5569f71ca171d3a0a486bf80600b19e1cba2" dependencies = [ "anyhow", "cfg-if", @@ -1750,7 +1730,7 @@ dependencies = [ "object", "target-lexicon", "thiserror", - "wasmparser 0.116.1", + "wasmparser", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -1758,9 +1738,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dface3d9b72b4670781ff72675eabb291e2836b5dded6bb312b577d2bb561f" +checksum = "290a89027688782da8ff60b12bb95695494b1874e0d0ba2ba387d23dace6d70c" dependencies = [ "anyhow", "cranelift-codegen", @@ -1774,9 +1754,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0116108e7d231cce15fe7dd642c66c3abb14dbcf169b0130e11f223ce8d1ad7" +checksum = "61eb64fb3e0da883e2df4a13a81d6282e072336e6cb6295021d0f7ab2e352754" dependencies = [ "anyhow", "cranelift-entity", @@ -1788,8 +1768,8 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder", + "wasmparser", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -1797,9 +1777,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a5896355c37bf0f9feb4f1299142ef4bed8c92576aa3a41d150fed0cafa056" +checksum = "40ecf1d3a838b0956b71ad3f8cb80069a228339775bf02dd35d86a5a68bbe443" dependencies = [ "anyhow", "cc", @@ -1812,9 +1792,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32b210767452f6b20157bb7c7d98295b92cc47aaad2a8aa31652f4469813a5d" +checksum = "f485336add49267d8859e8f8084d2d4b9a4b1564496b6f30ba5b168d50c10ceb" dependencies = [ "addr2line", "anyhow", @@ -1839,9 +1819,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffd2785a16c55ac77565613ebda625f5850d4014af0499df750e8de97c04547" +checksum = "65e119affec40edb2fab9044f188759a00c2df9c3017278d047012a2de1efb4f" dependencies = [ "object", "once_cell", @@ -1851,9 +1831,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73ad1395eda136baec5ece7e079e0536a82ef73488e345456cc9b89858ad0ec" +checksum = "6b6d197fcc34ad32ed440e1f9552fd57d1f377d9699d31dee1b5b457322c1f8a" dependencies = [ "cfg-if", "libc", @@ -1862,9 +1842,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b50f7f3c1a8dabb2607f32a81242917bd77cee75f3dec66e04b02ccbb8ba07" +checksum = "794b2bb19b99ef8322ff0dd9fe1ba7e19c41036dfb260b3f99ecce128c42ff92" dependencies = [ "anyhow", "cc", @@ -1877,10 +1857,10 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand", + "psm", "rustix", "sptr", - "wasm-encoder 0.36.2", + "wasm-encoder", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", @@ -1892,22 +1872,22 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447973db3dc5c24db14130ab0922795c58790aec296d198ad9d253b82ec67471" +checksum = "d995db8bb56f2cd8d2dc0ed5ffab94ffb435283b0fe6747f80f7aab40b2d06a1" dependencies = [ "cranelift-entity", "serde", "serde_derive", "thiserror", - "wasmparser 0.116.1", + "wasmparser", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a347bb8ecf12275fb180afb1b1c85c9e186553c43109737bffed4f54c2aa365" +checksum = "f55c5565959287c21dd0f4277ae3518dd2ae62679f655ee2dbc4396e19d210db" dependencies = [ "proc-macro2", "quote", @@ -1916,9 +1896,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f94342fc932695027cdfa0500a62a680879bdad495b36490887b1564124e53" +checksum = "ccd8370078149d49a3a47e93741553fd79b700421464b6a27ca32718192ab130" dependencies = [ "anyhow", "async-trait", @@ -1951,16 +1931,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8c602f026526d754c33b750f67d754234c6ec29595865916693c3306ca6a3b" +checksum = "2c6f945ff9bad96e0a69973d74f193c19f627c8adbf250e7cb73ae7564b6cc8a" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser", "wasmtime-cranelift-shared", "wasmtime-environ", "winch-codegen", @@ -1968,9 +1948,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41786c7bbbf250c0e685b291323b50c6bb65f0505a2c0b4f0b598c740f13f185" +checksum = "f328b2d4a690270324756e886ed5be3a4da4c00be0eea48253f4595ad068062b" dependencies = [ "anyhow", "heck", @@ -1980,9 +1960,9 @@ dependencies = [ [[package]] name = "wasmtime-wmemcheck" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47907bdd67500c66fa308acbce7387c7bfb63b5505ef81be7fc897709afcca60" +checksum = "67761d8f8c0b3c13a5d34356274b10a40baba67fe9cfabbfc379a8b414e45de2" [[package]] name = "wast" @@ -1995,30 +1975,30 @@ dependencies = [ [[package]] name = "wast" -version = "69.0.0" +version = "69.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa51b5ad1391943d1bfad537e50f28fe938199ee76b115be6bae83802cd5185" +checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.38.0", + "wasm-encoder", ] [[package]] name = "wat" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4c2488d058326466e086a43f5d4ea448241a8d0975e3eb0642c0828be1eb3" +checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c" dependencies = [ - "wast 69.0.0", + "wast 69.0.1", ] [[package]] name = "wiggle" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b5a36af7e0a7d68fd6c080e78803b34c3105caa3f743dff2fc8db2fac4ab71" +checksum = "0afb26cd3269289bb314a361ff0a6685e5ce793b62181a9fe3f81ace15051697" dependencies = [ "anyhow", "async-trait", @@ -2031,9 +2011,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f5a763e4801e83c438e7fa6abdd5c38d735194c2a94e2f2ccdcc66456cefee" +checksum = "cef2868fed7584d2b552fa317104858ded80021d23b073b2d682d3c932a027bd" dependencies = [ "anyhow", "heck", @@ -2046,9 +2026,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58262f5ac3a8ea686d4b940aa9f976f26c7e4e980aa8ac378f29274cb8638e33" +checksum = "31ae1ec11a17ea481539ee9a5719a278c9790d974060fbf71db4b2c05378780b" dependencies = [ "proc-macro2", "quote", @@ -2080,9 +2060,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9057ea325cac1ec02b28418da975a9f3a3634611812dc6150401347f1774844e" +checksum = "58e58c236a6abdd9ab454552b4f29e16cfa837a86897c1503313b2e62e7609ec" dependencies = [ "anyhow", "cranelift-codegen", @@ -2090,7 +2070,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser", "wasmtime-environ", ] @@ -2186,7 +2166,7 @@ dependencies = [ "clap", "heck", "test-helpers", - "wasm-encoder 0.38.0", + "wasm-encoder", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -2201,7 +2181,7 @@ dependencies = [ "clap", "heck", "test-artifacts", - "wasm-encoder 0.38.0", + "wasm-encoder", "wasmtime", "wasmtime-wasi", "wit-bindgen-c", @@ -2232,7 +2212,7 @@ dependencies = [ "clap", "heck", "test-helpers", - "wasm-encoder 0.38.0", + "wasm-encoder", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -2306,9 +2286,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a35a2a9992898c9d27f1664001860595a4bc99d32dd3599d547412e17d7e2" +checksum = "4b2e0cdd27c1500cb2524810e8f40b50012355a476c1bea5d12d73620125cc04" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -2317,9 +2297,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.38.0", + "wasm-encoder", "wasm-metadata", - "wasmparser 0.118.0", + "wasmparser", "wat", "wit-parser", ] diff --git a/Cargo.toml b/Cargo.toml index 5a53e8af4..c82d8d1c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,11 +28,11 @@ clap = { version = "4.3.19", features = ["derive"] } env_logger = "0.10.0" indexmap = "2.0.0" -wasm-encoder = "0.38.0" -wasm-metadata = "0.10.13" -wasmtime-wasi = "15.0.0" +wasm-encoder = "0.38.1" +wasm-metadata = "0.10.14" +wasmtime-wasi = "16.0.0" wit-parser = "0.13.0" -wit-component = "0.18.2" +wit-component = "0.19.0" wit-bindgen-core = { path = 'crates/core', version = '0.16.0' } wit-bindgen-c = { path = 'crates/c', version = '0.16.0' } @@ -79,7 +79,7 @@ csharp-mono = ['csharp'] [dev-dependencies] heck = { workspace = true } -wasmtime = { version = "15", features = ['component-model'] } +wasmtime = { version = "16", features = ['component-model'] } wasmtime-wasi = { workspace = true } test-artifacts = { path = 'crates/test-rust-wasm/artifacts' } wit-parser = { workspace = true } diff --git a/tests/wasi_snapshot_preview1.reactor.wasm b/tests/wasi_snapshot_preview1.reactor.wasm index c8320e0b387374ce478d17546a4a0a442748a8ba..f74b47c367cc1136c1d1a318833e8016a37205f6 100644 GIT binary patch delta 20151 zcmeHv3w%`7wfEUGlT4CH!Xz_lXGQBu*N8v*e z@6p+%DfiFCXu5az)6%SWF@Drc@8XIefC* z>D7B}W&wVue01N!gsB@X&GyAzo!!07-L~G=)@d@01$y_Up5{$ODIk>H+td{QP4!zxG){`l8?dWa+ znKwk?ns#n3@~?o7(TV)scE`4M!|rBGAUdnL$F{dH7NMt;vdLAi-PXo9L;{c9rqNw` z@8)I`IQH7jz{xgyJG*x>E%;b6;V!e#*gj@UA*E?+>Da=wdDp}ZnD!F-oCrhPIy_$8 zc6;acTwa|qpN>wZtC-&P>};o1~E!Jahwyox!Eq0s5Y%l88JFL!jYOo!#9^w?bY1&=A%*BQD4(7I< z+38*P*c}$LtAsx9*}SdS>fF)6TvF6beV`c{!{JzS^JZJ`nhuWLV}~O}5AP4}cs7E< zeYO4Y50gF0Y^gz$=yj+*R3ATzOXp5)I!4-3Xj&+e4v{}hI-Ek;kQ9o;pMusDxr?{P z@7)b#q+1HjK?NmDiuNg%LQEEV6r&h$cO`(Q&esI+l|MKYV-$=>KG`RifSGV1}_r8Pw1h*-;efOugUGc*k-g@HajLcM$ z<~N>u=)i9eKKTyZ6OrPr*~#&1i8R?iCF0kU3wZiZN0~E%=1{zkw!`D1xs>Pcjvl=J zz>WX@#4miF@BH$mhwi`W%_o09$g|Aj>Gko)LEbZlIo)~mo#sS7KG{V6%6X_%CouUF zCXz;|4^016qP7~Qgo*!|n7@XJKSZ9yQg{)+3f+V6;15plbo_48*Kvp_vmg}$pU8q@ z@Cu>1!6W(QNk|As(B1u~aKT9_uxTn3KNdJ*k~ku9J@CeOiizKc4@tKad1Dci->Qs8 z*W%@}Fgiy))zGEdlgyQyeQKiD0qV&kQu{*QiG0P}T5${=#TQMe!M~`eMBl@IshB-> zA0bMi6azxR0%@&*HL*Muj_<<@$87h9dK$&A$7o^#B)hXR7@tUsvz0{L31bEL98N$4 z{8WN_LIVWvja@eahX)4VV__> zVdD`Lj6Y+5VClkODmM-iygq*F06}6xBURUIP}Ox4+I?Hhxo8F*an4s;W~Va6VR+EhoWNkq%DXA&Ku^NE(5x&kFqEqeqXP9j?N2(puFK#2nr zyJ7M(e~*cc_twKOz4+_l!(r-v5!79U-wDL40n$B=9;KWKKn%v5Fhmq5r2SO^}Kc%x$m`)=b`AQp`A(R zd8y{LAl1Zc!gEkRn~soNlT7Dj3)1& z$|KjP74Q$Pm&W#y+jM>^FU!D_RK5l@q3nyFgh`k9UNRiP5RlVy@?3E`50VNDTtJeX zmt*Fj5R48`im6WL$A*jp{f{!O9)3&Z4*^*7@mtc09PJL|ywl5&C!zk0O3VpZ5zKkK zw+b9`#oPvP$g{Tf=ZuN>ZKn>oEwCs>Uj=m56fj(R#t@4RkbB+)bQE6@B@uGpqI;tF zoOzRA_^tD1!0=z3mqs_^Z_TT0%A&@SJjlqEt;Aw*F}<~p0qZmpXex#Z8qnUFXv0zF z%2X5@8IvDo76ZLc{C@ zwG)F`2slwMRxG2}pJe2bMLV~9}7&C}cXs8=TFaRN*$5mRI zy3*u)1qz$^Yj~5E?h8Z!MTSpMWEeym$;AeIi28Q}BZpzt`hQaS0KCD|@}aG=HOpkD z#h)ZfsPg;`7BM(nKY5Z0)iL4vG=tNN)`#=sd-3i?W5Z0`#a~)f3z^{9qBG(1lSPg2 z+1S_u?)iA5kscZI)PvfAGX*`LEY4KqB=?|+IOXMwH~I{Qqn?0@peA78QF*oung*98 z1gryi)sh8Nn>2&IhL0{Gq2b?`ECe}IXAcPtTbGj1aO|-mOJ!&+;aiv*@KoflEEQnj z?ABU5<(%7cUE@?q?lg1a`{zCdG3TyjBnLmUtTy>yv{r)9i?(JbFDgM`#sl~d%l3mX zrE@3YhnFXT{Md4$hBuaL=o4Ji^o?Bc(yNFX{%cjBhCH%RDj{irmk{Ihtr`*`KRfxK z3B32nuU$FI59252-cR7UN515|1t%fD`@CeK7YR{u2*+1m=+ESTZPL|CJQ2ad29Bvtx%SdU`GP}3#%ss=KFBlxbL1}sQg+nZKD)MD(9T@egwIp-C zxt6%m$7|1q<+1Q0J$KZ{E+V5o`h{RrYPkaN3%}GZSvO?VQ<48@9UJ{hNhrS$U5>w0 zF$UMHUkXxmtS3?&Sf3sj1iXUfB~h9kb20~hZT%Q@C;s*N#)%}YkmMLm6~%8S#vz+L z15dtyTQ{haj*}IUM#TjX?o;_BBcoK_(h{1H>zL^jEa9JR*p)lm&v}s!u4%doJnkVq zSOq7C#dH;T>b0?d7fAKD&RDVmjtRd4RI&G zg@l2xXapi3Rq=B@foD*EjKiXa7UCIa_nhDvr_;Tx_kNIhXrV9>S8b~W$v&rI zA-6=ysV)9vd(I9Dfg+WW?=w(zuG(>5Zs<7`uz=duCm)JK8graz5VrWs_u44R3yRJU zV2eHCm1tzIJX9YalGbo)eX^cxs28-RVWDLET5CcjOe_Xq5kZn6wPSH8=3iyULtrKQ z>a?`<*a1V5Pip&U97b`kkc~hISres&Y(WZciqlZlq)`?sA-{}eQV{H+i1h&WK$!q| zm!w0ouNl9KOb05d$Q%?Wp`X;lXt1)XDex*^+M(dAEYp|*{FBOy|B9pluNNW!*K?*5 z8nu!zw9P@~FsU$Z>IoJe*~_2{?{pmPv-+w39$=W8`*s_cBAH~6tmuTNkx~+Lz+_Xc zHBjnLC*b~(O9A71DUhnHven1%k?G+J8bT`|@)7zJ+@^pMte8SGz1JhujFCDf9`^wi z$(A8ns*w!@qO%VeyzkPB&~^AXm(D?V;OfiHLtn(5m!;5`@XeQT=s5oUWi>I#vQQ*V z3yq7D`!nF_%*&_2=c>!+!MY3fTS&G@f3X&SbU9gfvu_)M#0U0K{Dm}Z9|fOm+vOzW zKj@zcBmc3VK(&dx$HK_!?n!7j-mtq1!u~6}t0Cq5comf9Mq7erX^L)!&k0? zDWR*L9v(=eULY-itsuZR zz;EhrxMjF$3WLmF7{G`RZwO3N=oMMCg_uUY@dVS1*xg4V!@37PQ&`88felJ;B2sU> zX=;@hiSs@E=Ytq2xF!Mk0etsOE2^#{9l>)T#79U=F{vJDM8L)S&O}$?v-efO-0Xb^ zhR-cOm>XeA-LCrPU~c)|+-M7#+Y7gzFt^j`KI4`afAj%Nbz=9kaR9APKKcNfIa7r6onmLvN1{4Fxeh{055QBU{N^k z5^$5l?vS94ZYT9))4?HbQ9wCRSa|utWR)mbQ4_|QKwmlwWF%b5FB_BNV@O2LsxL4z8QH$V1NL&fsp{IU4sa6V;TU!P7gQLB!D2*3UIF` zd09<76;CDBRHxxHmAn830AvmzuHH|WrLZeDIN(k-+RY z-6YNy!LpvqkY}KmQhddOxB5aKAv`|KbWfa$fNp7c9A12A;Rx@>ZUZ-u&pC5%&9P@rREd_H{ws_^&P3d;w{>K3J}iHo6~_NhPlK5{U4`^$I$1!|MvOBX-;nlRCW+zbIIehV1h53EZO!ts}qN9w;`h0vo% zE_(VW`D30SgVcnjP%){Evc*u9rcnGky!hKI@V(EUk3abKEN^X*5{!x8fTtZ5(G7UR z(Q)9#mmE!j>&0$;cCAdu$nFjHgs78}SFfJxd;#E|4c??OvBwd}vvFJ!FFm%-cM#Iw zx5xL6vG^}fM)5sIH}J!l57T78JT%B0;SauZrEkuCflR}?;rG9D-4u`W$w++8_u=0^ zIT}Cq-N5oEBgeD8ch~SihbaOp-`W4SlN`DA`#(cIoA=5FV#d(Le%%iyq9gd+=cb`= z;O)=#;g!$T;vfE?AAj`R1oTaue10E#27lq(Yw&+QpF-cl)i10mZYC+zf0cUC=IrL zaVBh_pmZLgfm{NmK1xLhGDlhDmF#)s-FqZ{E73gJkD+wc@f*oKe918d4}l(nJiHts z{vGh9-bwuzwh+8b;g3rCAd(A0kP9Y7L3R-S2Ov9Fk}EfZjhA}s=sp2-9ArK+<5-r= zC;ak)=_5!sbVP5!!w7%)?MnCxp!YA?_+U!I3?jP_Bq7DWM&wE%$n3CV1CNTSst=Q= zL>Nl*^&A@VRXva9aY{ortO%c{b7;^|npn0vMC)x(9~~C-0n{)o6T3AZcfLG19egsbnNi7&|NHnIVrfhkFA0E!>(DjxGhb#<_@#K zxjS8$isJwAY8n;d!q*&h2zR}FYyx_g{yuGNvGp~ zbO;?f^30DmA{b}fx)#1+CtfJBP}xOxzJb%J6v>~GVtq_T<6_OYNxxFO{%PqDDAAfy(IExnHzq~#LKH+XG z+yN^lySqOHMuM*?6TV~*^hn~Tzm4G1H!nW_F`~j)DNqq1;*Sr#Jxp(ze|r^Gn4Rri z@Xhaz-n!nMUH04-xa;oi2{TduiqU)8OBlpN_agXOHGbvI%O;RtROB(SGLX*yeLy?( z4>L@35sU-WL4o+f%C|KprY? z>FC^3KM|^l2zIWGv4(aVGjI>Fp2Zeq4-Zz3DS*@~NI&F=~cFN>qHJQcHk)foGXgu#DthT7qVH`W^*Mg)Y^19Q3UmC`B{9 z!OBoWKA8x4EVyl@i1nVAqXy_i*4?UK{0mCp*+1_cl_cU1=%N%i{(358qt0KCDH}bg z23SQQRB^=p^;@yZG0Fuhot8~*%UZhX$nQ|>-a6f~;CDb&_WV4f)2W(8xShGIfG zgd+`L!#UDnD649ecE=T>U3E3UtE9l%)~)xpbatSIHH1?%!VC#^zQ|Omt$9P{LWQh_ zM*)j4Lk%}X7;vx?r&mO$7hz7+9lTT`ZQh)Z-2Q*A&7VIB#2j7JYyM4Bp6p&0Lc3N@ zA+{+3i}|KP4Haa#q4T2p8#0NL+i2>M>pz}=&@|UAM4Qlb_me_&37X+vQiPfsW=7DY z9ePj8T(hlZj-UVP+1dPTwyxW(<5^y)&)QhqcM> zsO#R=)0@xE=ET`7^Uv-hSu}UH#0k1-adt-GWL1>)j4sO=k>f?%VI{%H2qrHJx{U7X z`Wj-|-Sl=Oj^YIR8({bWEBV{wE^9!Q2|i=l2Agqo(a0#Qu4`zsTXqhFvpdg41@2cH z(3H4t+k%;~BvsF-f+6Yd@dnf!=SH@<#muj8eL-{s)(}!a8Yd8RwSK;*yvuf5baN}mIcfN-H=7X zQPrYby*}GDG&Zg%ilm5^Agh*PXB@-5Q$t4F&e(>?tEyw0T!yuEw`>tI5+Wzdx-MI? z!Sk}Ht6EXJ$LXa-XmkQ*B!cS1jLDj!ZRuL9o3x(cvW+lz&SVXV(9g29YcZM-w?xxW6;?5AopoTkZrfsXRa~)j-r_i3ax%K4 zsA z-38g^1xdHT44hW(qUN>BIL^IgA!=}6J{!$XfWbtIRd^G$$xEi8C43H>m!jH)A!Hm= zR&`!tC4*HZE$Qp{y``XIRkjpUAd1OAXG3*M&p~!Vkil7W$5a$m&FH$VRrqs%`5ZJM zAxW0tD5|7ewq%J4r;XW0B&O~(*3F)aY7(|-0}s~b9Rui8UaRaKAeo!sK%Z(xHf4?# z1n_NbY@2&*9TMGF*P{}5_A)d!0m?O00o+z%9h=P8hqQ5<$Ql{%_AEzgg10$~Q+bEDwl5fyAR)XSWAtOq<$(xb{ zTogl_?6)pI4_bLsaX7`249id)UbeLJVo(dJz3zP1&ObK|Y(+zBki=w=VPaq?z?rSa3yMM=%5j^&nJfcA~e z7&`PBI{VT&Ozv59YvGf_&I0> z5UAx44g^QySpi&GR9I6}g0^z^>UC&Z8AKpG!-Lm3svruYrn*Php*7_hRyAQIXABkw zg`lF%bsujyFb=Za-Lz>3g|!( zO($cLmDDiOaU2UqI*nr?9LA9hY4eFitKDBUqeKEk(iMTTW!W(x$8y@D#a<+vxe-U*455E@%)cvLy!MhKJ4_5rh&sh>=g~3P`h+g)~A>j zpb@|$uvi>5qpi$67v#KwV?kEso(i&h=%FBM$Wa~s86o6w52sDv)N}rbM}%B3{DhFc z3n^W2W(es{PBd9N@`)iA4ICJqj~+WW(TTAX zb0Ep~-1A6w>jt#Quoc3sA#mjIRgP&S8P>;xUO=NtzB-Db=~MfHjX9b%?_`t@W08)7He1>ul2br z7QhBW|0*=0Iz!HGfe|du5ugq5RE9NeQPld;Ae9TbIUhKQ0Cxay*_H{>jf1?u+kJZz zI-4Ztf(mHP2##p!ItT8=WgJV}gDBpi`MDJO>#Pc**bw#raH$~46{P>Fa)2lh5LFXu z0!3FXLA%o93#qv%DL~GK#H<<+Svds~(N$1cq}QO;Fd}#&%kqwBs*b?xqND9atz_b(ZO*nhUDU31x3;3Xazhg6YB69s0P7U(I`?oZ(t({~DS{zqcvFN>DQMRNc%}ii zehaEd+EB$ncvU122oR;D-GC_asdk|`>E6BtC1%Pdr^~Rk03z5np8+V**0#NUwxmk1 zL;)>Hf(Y|fB~`xBeSHhMyi9fgqnQBkbW;TbYd4X{mz6`s2KdclSqXqWmr=BR-g603 z22>Ln%McAtGED7ex4skYDQCgv4wOusubY(e& zOan4JWJ01hs28xuC1WX~4)}}(JR~cYtnK%nOEL>(l&NPpk%bD0)o!EDleXoEx&$5v zP~Va>rgi|mLSWH&w|XnOryL@*%8Dj$1N<@tPSsrZm96Nxr0pmi2e=)|$c*k-mUa-< z0_d3l3<_mRk_Hb*PZ5O-Z;MbrX0+SUT9Swx!Dj>m&IHm$TU7wxLmj1k0a>IiOHe|b zxG^Mo0H3fFeRw<@a3^FU0`(1BwRqMyJ(Qd($3opp3R-}* z8CB))M5{?^p5}hA4Hdd~Z$pVBXF~mEsBDIpB|!VSb{ASRKr=pR+6v1Fwxz13Xvns% z-3=-uEGCKP!5gPeg+x~JwhbZy6!L~(!P0^G@la%F_qY?cqqE9+C{|<{>Rww0zh`;v zUbk~Q0`%fo1jiYMBJiqWs@i?-(e0={37%(ifExgsfK%C`_GPq^j48THcA(;p1peh<7^F%djd`*#yua zo2>Q~Fg+c%{bE@23ULiKlQDTq%-B{&dk|gZH9vnb8qJ&FS)_;;M94>=Fzu_T1VBkM zJ;SWItGD|hR6=t#In#{XKkSz6L=}~fpd@+hpDPAi;a-nN-T6CF4a6Z`7cz#$OEw8t zoc0)K;gOxF>cB1(sWiKGg4)5^ZCF3BoCI6vA*mjAAKHngCZRT!0IwSoY;Ayk747lC zzA*sLFc%h5F%-i9W3(qwL34Bawzl3D;Rwoax7&gFlk@__dkRJ22|1d}ZP}M#cfxYC6`}{66=l=oejjEo_p>&-*e8bx;%P)?1Mi>k4;43JvFHllaZK>n^6vSas>DrIdMvT8u^cuYmGskOo zQAvnN-L)Q-^f7w2(Y?N>X}#0S%rBsqJuN#NzhPnA>DbcJ-Pu7OFB+A;8>Cp0Z?(bP zn_wVHv$Vj!?`>&!Xv4A`*9HN$wDdU4#c^`o1|5hTmt@0TACSY7737I+^cp?eJ1pkX ze7JLMA}-~zs(A38%*Smr*7q=%l?-j|Zdt#fw}-jBkTkcnIRo9VpoHlb!hp!nTv-Z) zeFK!Fok-ootR{kWbvuU5Tvgy-4)9t-M1g0t!EWhp>M+_J=4vv@uC3iIFs-#&a7{a} z%MGr8j%g+{>~=afx0_BkV-lhs$Jw}yvFIh4woR^jowhc{ArkoP+|n+icSDl}9DAK6 z;N)1no!#4+4WnrLfcRwnTD)VesC)|3nnRzpwRCJ`Hu~3{T}}tnmQUM>aP(Qb_q$e9 z*2i?jgLXQZ&OCb8v%Q@Xb+Pnza|gMjie)y%yE@z2nmRk2PS<6+bGo`attMw%OE1%t zORu{PvfRD#9&3YRH*Ifm+H7WXZnx24cec|N-4Z7r(_~nd)3vIX*_uOdVQyQPZT@wS z(_u5)^J#m}hRwZp=hhBpM{X0fk|uZvcHh*r!7;j;OrysMM{*zDAMU*mA=DR|!#;wu z$DTwl;?#s1{F|}m=p`JjY8bO`cYi;VKnW(5-C7r7T5G}yv^)`J_u-{gTgL4rPg8$j z*jp%BB$YdZi6pk=_Ttn;v6MCf-TBD>@w1Wt7!7d$ z?f9!dk^9dF$$y%dKIfdmkoho7ygJYgxvgRH8TSA7(<}B-(h^TF@xvi}=B3d%Ree`5 z)%}F~*=jP?|5H6Z5GL$THJsMW%o-e!zcxtzyPBEjAz!{Qt;lZ=lK*|}r1Ow}P`iLG zWCJW>*M#<9nLdE7{{zc(^TZkuroVm?`VM}3;`cKR;su>(>12Zlzo+LH!|$lN^hBu% zj3jtt`V<_RycOMscTB!6;6-(Eath%!c1l_&A)@ihL?~71+v2F+G-s-DpZpY`*7$Jp zNmB=WBLPs_4$t%CXRcISW9YGYij2vJ)cQ2)nR}E zMhP)_D9*l!ADA}@eHY&KGtJ zb}PANK!9&E>_fOgS%?ndt;+7qvBz7)1m07J;7c~`OyQ_mO`8BUu1_MLlw6JO$Gek< zgE9WTm^k*u#7x<1)0|EQjX4xW05KlJsp~3W4x0{7LZ|RYS_OItSIqDdgE&ZiFr50@ z3(QO=I}wJdr9uFfr)Q+)reF~~AuxLO?xvtSk^B7JH6O`_btm*7*Uuv;(pL*gg(ZD~ z*;s=n(Cg3~fc_UTDyzZQTsUT07<6160inn;CnB)y;6bl`6eifu-bgyf6DY;DCPM6+ zczi`U`T|Z?92h=110ZUy$ClyEu_uzI+svHJjKg6%6DnUK}oSF*1WsOFr zl6E%|C9RvAR?;wj_`Sv+eF@o4?NOd&@GlaG%!11^0O|91YMOLGfq%hRh9TTX@p z6~XF|wZZKRc4Q9erva}oOzUNM8Za2wsqqYuS7mr|9K6xbr-EfUi^nah29?ZNGzH9e zBU~TEw=F8~)AI>Fm$z0^1A)r{^I*U{m?7p7Vo)@mh=Tb5x)NJ%WYjR^dBLAVjM&Qz zh6RHm&&yj=OsbAOMkJ`ni^Rb)USL`iQT8JO35ifWGp8EGaKYlW;V8QYcPt(gjra!UxBKZBy;sx+4EolMkxp#?K?OPzp3kg$TNbzuv&zWLI^->9ps(M)o{BB&@ z9P}7~z>n*ZN4W#)C1UI$oLV*))I~CoQ~2mI;_WXln+Ia#U)(<&xdNuy)byzo2c9C? z$pGvR2jY+K@QvjnjQsoMU(Ga%Pl`LAF--kn#Zxe^+g4V>ydGUyTk>bJB!CD64KA3U z55NE_IJ5E~2!hHc;JYs^0rDp zz~e3(;>(|&{3(*U`s7Jd=mL9YieOxHy!pzjlihoSCdg^UH$rS%MKEbNU2Q5%hb<($IT8`TwQY|mbvpOwh+vE7fn z_yuD$x)=Y@STG~SEC5)9)R=@F1Yrm6(ERQc>gk4vK-1N%L@s-n*dk=hgDrRCS*E7G zM|>1)G#d;y5nBKu9wnkn@@XzW!u8}d>yRJOLP12k#~cz~{+p3x5O}Do`rKc#)2>R( z^>e1v)Kz`*>z%oQXAdX;vC|TG!Tb2XG&X%p`vA-l(S<=r|f8096{(>jOGp=qupZ$HR?zJ1QL}yQ2 zyRiYGFQ0h4tp%0rAr?XcXt@qh4S&Y~TGw@)K{w%?&PH@2UfMYsa-l7qZGqT_a)w6C zatKv`%p}PUb%{aNNns^;0%DUfNH7HU*}(qFu9E>Xvd+E$z7J+F(>6`3^fC9G%bo&%Y&=#%j8d~g}$Ps7kPP{W7# zOfSiwe!sjH_wS5C#_}ev-%PTo<(sP@u?&w)EVFz!%pz_WiQ`?HJ3}A!En zk_z9yi-gaeeI#o*-baeX|JXGoV2&g>x%G<_g)*y=M&SJ4REY%sIII%EM|Pz5BuG|N z9-(!0P!x}!P+sEKGVG8*isOdd7lT3*QtIj$ z`yx$f$W7{xuRm~W2y%P!=);e~>H82=NDydfE=qO@YOd?0sM;eGFJZWIDq5~x4!yoEkS!BdqhzpT;KE!EKgQu#sQhK|rh{Whdx`NhMlqqKW8aQaK#G777TcRT79u4Z)3swh&n~ z)Cw(R+FUEXZG8c5>0gR&#!vT8N1wyL?7tMSrX6(%18>WI-&)+bm(l@?n zUFbq6n4*4lR2NEu(LIbKdnTZMJb6zS!1?F)R05noy@wP=@9rUmQTdIeFlxS$6h_~@ z(aeNDw6_fKW7$noSw{9d$7fG-aqp()fS#`N0R7Z+)2A02(&ff#nwKyT4z})H1(SGn z?~o$p%xwh5rr(whgju8t$WCOX6S3diJOtD}iTuPZPX#K9qklJcM2yW(CLYN zLm>H+g!_zhnRWXL5b2KFN%j5p+sA+)-@p9|bUm)$fA_dIsjugdIp!vE=p5mOfy?q% z_5u8h{S#r8<9CeMG0REEUqVQO`8V!Jt3Jmsz~~c_gG3IDfZTI-4|0KF-P1OZQ_qY7 zRsHAynatEXCsp_s9P^ha24W=O+FzZvJ6E6^@N;*TgYZAN^P;gg5GJsM08kM^l?Sgz z0M6?vc_Ihi)*4?J z4O80wh2KD|aUXO5x?X*7y!J)v$dGi*(ep!ooyxT);)AJ_R9y&xo9y*L62v76U~>aj zi~YM36CN6mg3$BhJhHj+1PN7VzeKj|&K@OOcBh{h5}Q7bfC9zG5qS9{hwwu(DQhCI zYYCw?3ISptu6^XWoUBHsnrvMb;O1A#@Q07&gmX~{b4S+%691_H*nyP(HaKNL3^8Ng zdDW0p)`hZb3TP&oMUp>AA*1X;Jo_fkEP7zq6>`EvHVsSz zoAO!VP!`FAV2cO_!&Q%wssk9-`3y-oB)hm-0h7r5{7AqZz_z*|FNXP}R|S)JJD9`} zRlg84PN&xG&y4QWlKA6q)GW|+eDIS9{QW>`W?P?_cMdb7 zQ11`1^2vIiz#kp-a3F+_A1jS9uyMnB_}M3~4&=JC5ab$vjKnDU*t*P8DHpbMa{VpO zkDe~W?|&x?f9u$lLASd}x9abaa5nS!^mFV3*5c0}KlaxwrC{X2+G}_npHX}L`w1F1 z)2}VhQ?qAu_}W)!939r-X_znti;ph{sivN43cfh_PP)_Z_a21ox~J1*@1)6S+<`s& z^j8ueJ-s>L^oukJ-4KK~7lS0QG~dd?Pd<}gnqLEH@HN2&Urp5cl_eC7Oe)MiPNo2_ zGN8;$_4h~Edr7(m#bJbf9Jhb5eKwcMiK1*z3&$H>6$Pgfg4?co{PrUYQ5}_}h zh<*K?*yt04O-)z{<&l~vl?N})pdP&$|Le&W=sCRnwaf86FHZAoUjniWdnwa0!CfkQ zCZfTayd}#ca`;#attl9h&_`z?@{sk-1nThjKzjaDNDgmFpF7oCPv4o4Q3l7Oe20%0 zCj;W9H|9=0hp;0Bfv=;o@Xpg0^g$ZK%tU)R_E@Qua&usKEMUl)3atH~kK=A`o4su9qEep09#xM$mcMzFtAYWl1d4Q0f4XJg6J%VR^ z|LcMK-5LU)`sn)v(n{aC27V8`Lt@v%@7#-yoS656W>j~CS|b93=GYTd2gDeF3%MrC zPSZnR`sxpB`yTZDjXD`38B!v&jJ}YExzaBc$i@%dAtJU5y~(>dm~dzyI~wXoWLWA) zlx8gTwJ<<-VEh4t1hMgQ*iFK-PK~)F44jF{A+Y`UZ3ygXggC%0Ef8@rqGvQzf)Md! zLWAbx=YBMK0)2oEh-V zDfwujM3Ac&mbo2htDFEn&>@JiY~{8&rI@O2%{)s@K4WNJF>#=rjMRC*gN0M@nuM~w-3l5#DrZouFbXK>nO}`Z zKZ}>gp-(i|c6zMtmM&Ok)Cigmp*-)WQ<07GpSlfwGgL~Hk(Jfq^lt6!-WaH|(5sw| znhc_mtX#U7^;W0t(A$=-dc(HiQ|lhoSVpHAVFqR%ENfweNppmcgb2~72$R7Gra~Hv zo_To|8i!^S1LIJ(y}8@yZRzYFql|)4{Ezq3gQZ)8vFlxDw}s&K_#fv)bp zyoF^b;on!|_V-u#ep3@zQa1Ri@02;U15E|sm!rob-+$2r;;eIg4i|uOQMkylv?yRFaDbscW(@E>u+8RLH_?sFZL=^NTR^ttxBN@5*q8U>(IMhQ98ITh}Ow|-PA!*x!;0QX};GJBCCVL%=P(u;4tF9)CCdUiB=8AgATd@oP4IXBD zXBMHU#gf8vmLhYqDT%zMxq7&HpntJ<)nZg!>~NC7E1IDuB}J2LNsl-KB$Ny5og{RU zDk!$0O15STs+LsrXoqL4Mhm=#C8(^zRtaU3D=p$XLwDRW8Z#j+x{wUXwUW^PXFV z>L_rsN%fM;(H_>4fXcO!rf4Yw?{eO2%h8R+ykNPSF6b> zgmq;(sX4MC*tY0$lIESh1a+`{Qk0T{ofJ4zQWP=iEnk6dDNgdLXmJkMg5qerVd%xz z`kcg-XhM+;GqE{nS51x61W_;X75n9tpgIobDanp(YlbQCwy2l(_+2MliYi$ZOcv$` z0=TveeZA$EqLyNjQzQX&s;ImP3N!W5n}=G)C@+5%s$oS=QY_wec*Ek7lEiznS0T4p zUyfE6CtWa0*A-RKHXK>7^{N(M$gfruX=|X^cgjIoUilTMq!?BQvJDpDmE3VXMU_=iuq2D~&R&VySw-Ot$2NJ1H*8Vllis@3$STximrn|k z=5mfKiH`TiYGi|=1xo=1yP|E{T9Vf%2KIIPRj8zp7erWZPJuO2ZCIP*SD~gtTLM=Q zT;6mn!w^A}YmmuuN!Jl9A;}r4!Z}*fJFo_=FScERk}(gkl<6WR}kX>f+D2&$@y;1!lG z2GF~x8BHuwRavl1QIJGUFicR5SpR!fpr8xkQJeSl|TUR&veZOTOm32kgvJF9kSfZE~K+0|t&GHtT zXi~8x%L?>UILmZY!E$u1$M1O5L^FyEO93Z@=c2@EvZ>E-eNUZXp^_q3Ga$skP<>(NfcNKnr8cT65)}xNz*$I&j^nEOMH@0GZnRNp zvEeELxPT#B3gDXQ>azgv0tm_Xes816#g+zhg@6PwY-&l{(PwvOkaRd`{3O?LBwloq zj-Z%^%NhEdbDfn=(WBC+(R*McsvXnS+YQmz5=C$m(MrmS$iu?ub7vF1RC)(o2#871 zRe+}o#wti){QA6wB$iisZ@Z|X$aDZSIq)Ze(-cKjbe){R&YM4Q1be|OpH~`0as_n* z7`@Di2H>S4s~m6W3x^%kUX*!Cd-41X4ggf6RuY*t-hway2}e@pOis|3j6BM{bm&R$ zWy20~Up#n@d%1@;AaSyhG!={EG#7%JDO>s_nWwu~kQ2=GZ1>7cfmk?s-lzeF8=PR+ zU#k>F-rT4}V{FuCw3xcyZaJD~2ERzVe*syzw83N9$J&9O+&&>_qp~=Q_~6 zcJMs+y7Y1GreGd(T2RF}g9I>_7Yr^5D{YB-bH-V3!`s$^_RMpWoZ>Eyi(^KE%*t?TH{_PH&{$B5;T9G(Yz+u(8V_Wa<~w|^SE!#@n(nRynxYsgXXO(RZ%cV`|1?-@J?-kWg@d~@b0 z@GTjKz_(_c0q+e?eRq$8BjDQyPk`?jdI0;5s0&rT2TO4zze2{pSEE1;ji~F~K^FqzieBtM5iF z{utvr(5NDl2UO)GN0uc?gyHn-2!mCuXhHJhkP?A+lcFknvpdkzaU}6?qHF;&d2l#` zHyj9qR#LwKl755}xNES2Rq;0fXi2ty zBO+zNLJuNlX$d6IiY9AGSAy)!hHUgEbPa(Kh>=~Wp+o{e7X^s^yaBiesmfk>LNV|6 zU5JHxf`l|1Y7I`ZKm`3}MDSiANgYMxN)SMSBEW^*9v~1REwAXeAOa&}Jz$aL{caP= zF9V$7?IZ+D3Cab?-vFm>MQsBEQL4mLQ&c6vf`rGic@?6w-q6;zrM*GnB?#^$u1cB$ z6^^FJ`#h~1?P3+ky;VqASdjg@LedamRUQ3yLcOy{f|vp+wj%-B zDzYr<`@MqA=(-{vOvh9dqG&;~#iV{m&<@Fw3X_6BXaNw&`T^R`ict4J-eTC6szSDE zd3l@B4Q$d?Z3wkVUQ`ts@Xxy+T8kiuav*o-OcA230``2+=M4;@Qh{;_;wk7w(GPj+ zwxW|okb0{QfP!Ljk|`OYewW8@L$4IU@UVEcX{o#oX^)|M-fj|mniru0@9}0-2r5n* z7J!y02qb+I6hS|Xt|GxPtix9gY^8!gN zL)Je>YoNm;+&J9RCZRb;~Ws%r9%3Mm6ry!r#)_?>8WktBn+YlZ;zxGS09mtXL@cA_~Y zu#DgdW)kwNqzNvsKZsV6VPx-vohYva@=BY7d=tuda2Zb0A41#w#~1HHG3AMfZxrGn%DsH!$^!rp-)imLty$|qY81l^n_NPiwh`ShPpN#8%_o$Nzp<&UEh z(j5HDF0ixi_xO_cejlnSf%;ZbHP9ZEtx${D`ccrr+J02w9qUJta;s}Qn2RP0Dqt@} zOmG;8uKE++ntn8ig=hygi3H|hYY+uBueu-A%!1LN51;@f?;O;pjx9n>s2@YIcBdU4 z9!J?tP3@c8dRxRVqbz7^@7&^?pif~q?_c`SrqNuYPK8Yea3f1gz@~{<&-3-X=