From 7cf190676370bcb4dd5cc1ad87b3041ea8e4e0e8 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 18 Dec 2024 17:05:20 -0700 Subject: [PATCH 01/21] build: one cargo workspace for the repo --- Cargo.lock | 449 ++++- Cargo.toml | 8 +- crates/guest/Cargo.lock | 595 ------ crates/guest/Cargo.toml | 2 - crates/guest/src/guest.rs | 24 +- crates/host/src/module.rs | 2 +- scripts/test-wasmer_sys_dev.sh | 12 +- scripts/test-wasmer_sys_prod.sh | 7 +- scripts/test-wasmer_wamr.sh | 4 +- test/Cargo.lock | 2996 ------------------------------- test/Cargo.toml | 3 - test/src/test.rs | 4 +- test/test_wasm/Cargo.lock | 337 ---- test/test_wasm/src/wasm.rs | 5 +- test/wasm_empty/Cargo.lock | 325 ---- test/wasm_io/Cargo.lock | 363 ---- test/wasm_io/src/wasm.rs | 2 +- test/wasm_memory/Cargo.lock | 363 ---- test/wasm_memory/src/wasm.rs | 18 +- 19 files changed, 465 insertions(+), 5054 deletions(-) delete mode 100644 crates/guest/Cargo.lock delete mode 100644 test/Cargo.lock delete mode 100644 test/test_wasm/Cargo.lock delete mode 100644 test/wasm_empty/Cargo.lock delete mode 100644 test/wasm_io/Cargo.lock delete mode 100644 test/wasm_memory/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock index 6aacb95b..a4bcab89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "addr2line" @@ -49,6 +49,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + [[package]] name = "anyhow" version = "1.0.94" @@ -64,6 +76,17 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.4.0" @@ -263,6 +286,12 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cc" version = "1.2.4" @@ -289,6 +318,33 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "cipher" version = "0.4.4" @@ -310,6 +366,31 @@ dependencies = [ "libloading", ] +[[package]] +name = "clap" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + [[package]] name = "cmake" version = "0.1.52" @@ -460,6 +541,42 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -494,6 +611,12 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -504,6 +627,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "darling" version = "0.20.10" @@ -659,6 +792,19 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -681,6 +827,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "filetime" version = "0.2.25" @@ -764,6 +916,16 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -800,6 +962,21 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -852,6 +1029,18 @@ dependencies = [ "thiserror 2.0.8", ] +[[package]] +name = "holochain_wasmer_guest" +version = "0.0.96" +dependencies = [ + "holochain_serialized_bytes", + "holochain_wasmer_common", + "paste 1.0.15", + "serde", + "test-fuzz", + "tracing", +] + [[package]] name = "holochain_wasmer_host" version = "0.0.96" @@ -869,6 +1058,12 @@ dependencies = [ "wasmer-middlewares", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "icu_collections" version = "1.5.0" @@ -1068,6 +1263,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1365,6 +1571,12 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + [[package]] name = "parking_lot" version = "0.12.3" @@ -1388,12 +1600,31 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + [[package]] name = "paste" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + [[package]] name = "pbkdf2" version = "0.12.2" @@ -1422,6 +1653,34 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1469,6 +1728,12 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.92" @@ -1717,7 +1982,7 @@ checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", - "paste", + "paste 1.0.15", ] [[package]] @@ -1814,6 +2079,15 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -2039,6 +2313,50 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test" +version = "0.0.90" +dependencies = [ + "criterion", + "ctor", + "env_logger", + "holochain_serialized_bytes", + "holochain_wasmer_common", + "holochain_wasmer_host", + "once_cell", + "parking_lot", + "rand", + "serde", + "serde_bytes", + "tempfile", + "test-fuzz", + "test_common", + "wasmer", + "wasmer-middlewares", +] + [[package]] name = "test-fuzz" version = "6.0.0" @@ -2091,6 +2409,54 @@ dependencies = [ "test-fuzz-internal", ] +[[package]] +name = "test_common" +version = "0.0.90" +dependencies = [ + "holochain_wasmer_common", + "serde", + "serde_bytes", +] + +[[package]] +name = "test_wasm" +version = "0.0.90" +dependencies = [ + "holochain_serialized_bytes", + "holochain_wasmer_guest", + "serde", + "test_common", +] + +[[package]] +name = "test_wasm_empty" +version = "0.0.90" +dependencies = [ + "holochain_wasmer_guest", +] + +[[package]] +name = "test_wasm_io" +version = "0.0.90" +dependencies = [ + "holochain_serialized_bytes", + "holochain_wasmer_guest", + "paste 0.1.18", + "serde", + "test_common", +] + +[[package]] +name = "test_wasm_memory" +version = "0.0.84" +dependencies = [ + "holochain_serialized_bytes", + "holochain_wasmer_guest", + "paste 0.1.18", + "serde", + "test_common", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -2160,6 +2526,16 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -2291,6 +2667,16 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2353,12 +2739,12 @@ checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-encoder" -version = "0.221.2" +version = "0.222.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5" +checksum = "3432682105d7e994565ef928ccf5856cf6af4ba3dddebedb737f61caed70f956" dependencies = [ "leb128", - "wasmparser 0.221.2", + "wasmparser 0.222.0", ] [[package]] @@ -2557,9 +2943,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.221.2" +version = "0.222.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083" +checksum = "4adf50fde1b1a49c1add6a80d47aea500c88db70551805853aa8b88f3ea27ab5" dependencies = [ "bitflags 2.6.0", "indexmap 2.7.0", @@ -2568,9 +2954,9 @@ dependencies = [ [[package]] name = "wast" -version = "221.0.2" +version = "222.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc4470b9de917ba199157d1f0ae104f2ae362be728c43e68c571c7715bd629e" +checksum = "5ce7191f4b7da0dd300cc32476abae6457154e4625d9b1bc26890828a9a26f6e" dependencies = [ "bumpalo", "leb128", @@ -2581,13 +2967,23 @@ dependencies = [ [[package]] name = "wat" -version = "1.221.2" +version = "1.222.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1f3c6d82af47286494c6caea1d332037f5cbeeac82bbf5ef59cb8c201c466e" +checksum = "8fde61b4b52f9a84ae31b5e8902a2cd3162ea45d8bf564c729c3288fe52f4334" dependencies = [ "wast", ] +[[package]] +name = "web-sys" +version = "0.3.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.26.7" @@ -2597,6 +2993,37 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-sys" version = "0.52.0" diff --git a/Cargo.toml b/Cargo.toml index e6fe5777..2c71daf9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] -members = ["crates/host", "crates/common"] -exclude = ["test"] - +members = ["crates/*", "test", "test/common", "test/test_wasm", "test/wasm_empty", "test/wasm_io", "test/wasm_memory"] +default-members = ["crates/*"] resolver = "2" + +[profile.release.package.test] +debug = true diff --git a/crates/guest/Cargo.lock b/crates/guest/Cargo.lock deleted file mode 100644 index 8911d5c4..00000000 --- a/crates/guest/Cargo.lock +++ /dev/null @@ -1,595 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "camino" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cpufeatures" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.90", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "test-fuzz", - "thiserror 2.0.8", -] - -[[package]] -name = "holochain_wasmer_guest" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_common", - "paste", - "serde", - "test-fuzz", - "tracing", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - -[[package]] -name = "libc" -version = "0.2.168" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pin-project-lite" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" - -[[package]] -name = "prettyplease" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" -dependencies = [ - "proc-macro2", - "syn 2.0.90", -] - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "semver" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "serde_json" -version = "1.0.133" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test-fuzz" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7a9bb33d134e863862ab9dad2ac7e022ac89707914627f498fe0f29248d9b" -dependencies = [ - "serde", - "test-fuzz-internal", - "test-fuzz-macro", - "test-fuzz-runtime", -] - -[[package]] -name = "test-fuzz-internal" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bef5dd380747bd7b6e636a8032a24aa34fcecaf843e59fc97d299681922e86" -dependencies = [ - "bincode", - "cargo_metadata", - "serde", -] - -[[package]] -name = "test-fuzz-macro" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500" -dependencies = [ - "darling", - "heck", - "itertools", - "once_cell", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "test-fuzz-runtime" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fbe6fb7481ec6d9bf64ae2c5d49cb1b40f8da624a91031482af7b08168c679" -dependencies = [ - "hex", - "num-traits", - "serde", - "sha1", - "test-fuzz-internal", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-ident" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" diff --git a/crates/guest/Cargo.toml b/crates/guest/Cargo.toml index 025e8005..38c2e538 100644 --- a/crates/guest/Cargo.toml +++ b/crates/guest/Cargo.toml @@ -6,8 +6,6 @@ version = "0.0.96" authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" -[workspace] - [lib] name = "holochain_wasmer_guest" crate-type = ["cdylib", "rlib"] diff --git a/crates/guest/src/guest.rs b/crates/guest/src/guest.rs index ccbe443c..5238bd8e 100644 --- a/crates/guest/src/guest.rs +++ b/crates/guest/src/guest.rs @@ -51,6 +51,7 @@ where /// - Deserialize whatever bytes we can import from the host after calling the host function /// - Return a `Result` of the deserialized output type `O` #[inline(always)] +#[allow(improper_ctypes_definitions)] pub fn host_call( f: unsafe extern "C" fn(usize, usize) -> DoubleUSize, input: I, @@ -159,26 +160,3 @@ macro_rules! try_ptr { } }}; } - -#[cfg(test)] -pub mod tests { - use super::*; - - #[test] - fn wasm_error_macro_guest() { - assert_eq!( - wasm_error!("foo").error, - WasmErrorInner::Guest("foo".into()), - ); - - assert_eq!( - wasm_error!("{} {}", "foo", "bar").error, - WasmErrorInner::Guest("foo bar".into()) - ); - - assert_eq!( - wasm_error!(WasmErrorInner::Host("foo".into())).error, - WasmErrorInner::Host("foo".into()), - ); - } -} diff --git a/crates/host/src/module.rs b/crates/host/src/module.rs index 34277e0f..3728eec5 100644 --- a/crates/host/src/module.rs +++ b/crates/host/src/module.rs @@ -374,7 +374,7 @@ impl ModuleCache { } #[cfg(test)] -mod tests { +pub mod tests { use super::{CacheKey, ModuleCache, PlruCache}; #[test] diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index fcaf35da..998e4c90 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -6,18 +6,14 @@ export WASMER_BACKTRACE=1 # static tests cargo fmt --check -( cd test && cargo fmt --check ) -( cd crates/guest && cargo fmt --check ) - cargo clippy -- --deny warnings -( cd test && cargo clippy -- --deny warnings ) ( cd crates/guest && cargo clippy --target wasm32-unknown-unknown -- --deny warnings ) -# tests the root workspace that doesn't include any wasm code +# tests the root workspace cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture -# test that everything builds -cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown +# test that test wasms build +cargo build --release -p test_wasm --target wasm32-unknown-unknown # build wasm and run the "full" tests for wasmer_sys_dev -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture +cargo test --release -p test --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture diff --git a/scripts/test-wasmer_sys_prod.sh b/scripts/test-wasmer_sys_prod.sh index b36be088..d25e73f5 100755 --- a/scripts/test-wasmer_sys_prod.sh +++ b/scripts/test-wasmer_sys_prod.sh @@ -4,11 +4,8 @@ set -euxo pipefail export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 -# tests the root workspace that doesn't include any wasm code +# tests the root workspace cargo test --no-default-features --features error_as_host,wasmer_sys_prod ${1-} -- --nocapture -# test that everything builds -cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown - # build wasm and run the "full" tests for wasmer_sys_prod -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys_prod ${1-} -- --nocapture +cargo test --release -p test --no-default-features --features wasmer_sys_prod ${1-} -- --nocapture diff --git a/scripts/test-wasmer_wamr.sh b/scripts/test-wasmer_wamr.sh index 46b1d639..79b72369 100755 --- a/scripts/test-wasmer_wamr.sh +++ b/scripts/test-wasmer_wamr.sh @@ -5,8 +5,8 @@ export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 -# tests the root workspace that doesn't include any wasm code +# tests the root workspace cargo test --no-default-features --features error_as_host,wasmer_wamr ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_wamr -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_wamr ${1-} -- --nocapture +cargo test --release -p test --no-default-features --features wasmer_wamr ${1-} -- --nocapture diff --git a/test/Cargo.lock b/test/Cargo.lock deleted file mode 100644 index 8356c5cf..00000000 --- a/test/Cargo.lock +++ /dev/null @@ -1,2996 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli 0.29.0", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" -dependencies = [ - "derive_arbitrary", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object 0.35.0", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" -dependencies = [ - "bitflags 2.5.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.87", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive 0.6.12", - "ptr_meta 0.1.4", - "simdutf8", -] - -[[package]] -name = "bytecheck" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" -dependencies = [ - "bytecheck_derive 0.8.0", - "ptr_meta 0.3.0", - "rancor", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bytecheck_derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror 1.0.63", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstyle", - "clap_lex", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - -[[package]] -name = "corosensei" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437" -dependencies = [ - "autocfg", - "cfg-if", - "libc", - "scopeguard", - "windows-sys 0.59.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "cranelift-bforest" -version = "0.110.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305d51c180ebdc46ef61bc60c54ae6512db3bc9a05842a1f1e762e45977019ab" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-bitset" -version = "0.110.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690d8ae6c73748e5ce3d8fe59034dceadb8823e6c8994ba324141c5eae909b0e" - -[[package]] -name = "cranelift-codegen" -version = "0.110.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7ca95e831c18d1356da783765c344207cbdffea91e13e47fa9327dbb2e0719" -dependencies = [ - "bumpalo", - "cranelift-bforest", - "cranelift-bitset", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", - "gimli 0.28.1", - "hashbrown 0.14.5", - "log", - "regalloc2", - "rustc-hash", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.110.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a2d2ab65e6cbf91f81781d8da65ec2005510f18300eff21a99526ed6785863" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.110.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efcff860573cf3db9ae98fbd949240d78b319df686cc306872e7fab60e9c84d7" - -[[package]] -name = "cranelift-control" -version = "0.110.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d70e5b75c2d5541ef80a99966ccd97aaa54d2a6af19ea31759a28538e1685a" -dependencies = [ - "arbitrary", -] - -[[package]] -name = "cranelift-entity" -version = "0.110.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a48cb0a194c9ba82fec35a1e492055388d89b2e3c03dee9dcf2488892be8004d" -dependencies = [ - "cranelift-bitset", -] - -[[package]] -name = "cranelift-frontend" -version = "0.110.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8327afc6c1c05f4be62fefce5b439fa83521c65363a322e86ea32c85e7ceaf64" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.110.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b08621c00321efcfa3eee6a3179adc009e21ea8d24ca7adc3c326184bc3f48" - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.87", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "dashmap" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "deflate64" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" - -[[package]] -name = "enum-iterator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "enumset" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -dependencies = [ - "fallible-iterator", - "indexmap 2.2.6", - "stable_deref_trait", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror 1.0.63", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "thiserror 2.0.8", -] - -[[package]] -name = "holochain_wasmer_host" -version = "0.0.96" -dependencies = [ - "bimap", - "bytes", - "hex", - "holochain_serialized_bytes", - "holochain_wasmer_common", - "parking_lot", - "serde", - "thiserror 2.0.8", - "tracing", - "wasmer", - "wasmer-middlewares", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", -] - -[[package]] -name = "inkwell" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2" -dependencies = [ - "either", - "inkwell_internals", - "libc", - "llvm-sys", - "once_cell", - "thiserror 1.0.63", -] - -[[package]] -name = "inkwell_internals" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "libc" -version = "0.2.162" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "llvm-sys" -version = "180.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778fa5fa02e32728e718f11eec147e6f134137399ab02fd2c13d32476337affa" -dependencies = [ - "anyhow", - "cc", - "lazy_static", - "libc", - "regex-lite", - "semver", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "lockfree-object-pool" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -dependencies = [ - "adler", -] - -[[package]] -name = "more-asserts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" - -[[package]] -name = "munge" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" -dependencies = [ - "munge_macro", -] - -[[package]] -name = "munge_macro" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.30.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" -dependencies = [ - "memchr", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "crc32fast", - "flate2", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "memchr", - "ruzstd", -] - -[[package]] -name = "object" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.1", - "smallvec", - "windows-targets", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "plotters" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" - -[[package]] -name = "plotters-svg" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "prettyplease" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" -dependencies = [ - "proc-macro2", - "syn 2.0.87", -] - -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "proc-macro2" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive 0.1.4", -] - -[[package]] -name = "ptr_meta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" -dependencies = [ - "ptr_meta_derive 0.3.0", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rancor" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" -dependencies = [ - "ptr_meta 0.3.0", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "regalloc2" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" -dependencies = [ - "hashbrown 0.13.2", - "log", - "rustc-hash", - "slice-group-by", - "smallvec", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-lite" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "region" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7" -dependencies = [ - "bitflags 1.3.2", - "libc", - "mach2", - "windows-sys 0.52.0", -] - -[[package]] -name = "rend" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" -dependencies = [ - "bytecheck 0.8.0", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rkyv" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b" -dependencies = [ - "bytecheck 0.8.0", - "bytes", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "munge", - "ptr_meta 0.3.0", - "rancor", - "rend", - "rkyv_derive", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" -dependencies = [ - "log", - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - -[[package]] -name = "rustls-webpki" -version = "0.102.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "ruzstd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" -dependencies = [ - "byteorder", - "derive_more", - "twox-hash", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "self_cell" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shared-buffer" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" -dependencies = [ - "bytes", - "memmap2", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "test" -version = "0.0.90" -dependencies = [ - "criterion", - "ctor", - "env_logger", - "holochain_serialized_bytes", - "holochain_wasmer_common", - "holochain_wasmer_host", - "once_cell", - "parking_lot", - "rand", - "serde", - "serde_bytes", - "tempfile", - "test-fuzz", - "test_common", - "wasmer", - "wasmer-middlewares", -] - -[[package]] -name = "test-fuzz" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7a9bb33d134e863862ab9dad2ac7e022ac89707914627f498fe0f29248d9b" -dependencies = [ - "serde", - "test-fuzz-internal", - "test-fuzz-macro", - "test-fuzz-runtime", -] - -[[package]] -name = "test-fuzz-internal" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bef5dd380747bd7b6e636a8032a24aa34fcecaf843e59fc97d299681922e86" -dependencies = [ - "bincode", - "cargo_metadata", - "serde", -] - -[[package]] -name = "test-fuzz-macro" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500" -dependencies = [ - "darling", - "heck", - "itertools 0.13.0", - "once_cell", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "test-fuzz-runtime" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fbe6fb7481ec6d9bf64ae2c5d49cb1b40f8da624a91031482af7b08168c679" -dependencies = [ - "hex", - "num-traits", - "serde", - "sha1", - "test-fuzz-internal", -] - -[[package]] -name = "test_common" -version = "0.0.90" -dependencies = [ - "holochain_wasmer_common", - "serde", - "serde_bytes", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl 1.0.63", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "ureq" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-pki-types", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.87", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-encoder" -version = "0.216.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasmer" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9817a0dd105a992d9f3e8831370acddbdf3848e5357086a569dc4fb07c2aa57d" -dependencies = [ - "bindgen", - "bytes", - "cfg-if", - "cmake", - "indexmap 1.9.3", - "js-sys", - "more-asserts", - "rustc-demangle", - "serde", - "serde-wasm-bindgen", - "shared-buffer", - "tar", - "target-lexicon", - "thiserror 1.0.63", - "tracing", - "ureq", - "wasm-bindgen", - "wasmer-compiler", - "wasmer-compiler-cranelift", - "wasmer-compiler-llvm", - "wasmer-derive", - "wasmer-types", - "wasmer-vm", - "wasmparser", - "wat", - "windows-sys 0.59.0", - "xz", - "zip", -] - -[[package]] -name = "wasmer-compiler" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0261d34a6f61d666e4f954254cf486371117db3e8a875767c5e3f21e45eb43aa" -dependencies = [ - "backtrace", - "bytes", - "cfg-if", - "enum-iterator", - "enumset", - "lazy_static", - "leb128", - "libc", - "memmap2", - "more-asserts", - "object 0.32.2", - "region", - "rkyv", - "self_cell", - "shared-buffer", - "smallvec", - "target-lexicon", - "thiserror 1.0.63", - "wasmer-types", - "wasmer-vm", - "wasmparser", - "windows-sys 0.59.0", - "xxhash-rust", -] - -[[package]] -name = "wasmer-compiler-cranelift" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc984c651c29e30ec4f6da82ca472b9d2dd50dfe4c9edd84628e59f876ea2d0" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "gimli 0.28.1", - "itertools 0.12.1", - "more-asserts", - "rayon", - "smallvec", - "target-lexicon", - "tracing", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-compiler-llvm" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87659b36db0aa023c1dc292ec5b99c0df3e956ec1361acfe4a409faffa410c94" -dependencies = [ - "byteorder", - "cc", - "inkwell", - "itertools 0.10.5", - "lazy_static", - "libc", - "object 0.30.4", - "rayon", - "regex", - "rustc_version", - "semver", - "smallvec", - "target-lexicon", - "wasmer-compiler", - "wasmer-types", - "wasmer-vm", -] - -[[package]] -name = "wasmer-derive" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2e5a149301403084c3198b68cd635b7f210e8d26f533218a7a68b6d20b441e" -dependencies = [ - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "wasmer-middlewares" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c441261b0388b1dcb062474912e998f81ce2cd033e0fd9b97fa79917637b9f" -dependencies = [ - "wasmer", - "wasmer-types", - "wasmer-vm", -] - -[[package]] -name = "wasmer-types" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09f305bc775871b551c5907facaadc8e7ddc0845b0ccd18ccb2c046d0f9b7f0" -dependencies = [ - "bytecheck 0.6.12", - "enum-iterator", - "enumset", - "getrandom", - "hex", - "indexmap 2.2.6", - "more-asserts", - "rkyv", - "sha2", - "target-lexicon", - "thiserror 1.0.63", - "xxhash-rust", -] - -[[package]] -name = "wasmer-vm" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1b03c3cb791e94f63a44377fe35936496d35230d8219a36af11b090940c99" -dependencies = [ - "backtrace", - "cc", - "cfg-if", - "corosensei", - "crossbeam-queue", - "dashmap", - "enum-iterator", - "fnv", - "indexmap 2.2.6", - "lazy_static", - "libc", - "mach2", - "memoffset", - "more-asserts", - "region", - "scopeguard", - "thiserror 1.0.63", - "wasmer-types", - "windows-sys 0.59.0", -] - -[[package]] -name = "wasmparser" -version = "0.216.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3" -dependencies = [ - "ahash", - "bitflags 2.5.0", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "semver", -] - -[[package]] -name = "wast" -version = "216.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08" -dependencies = [ - "bumpalo", - "leb128", - "memchr", - "unicode-width", - "wasm-encoder", -] - -[[package]] -name = "wat" -version = "1.216.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a" -dependencies = [ - "wast", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xxhash-rust" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" - -[[package]] -name = "xz" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c887690ff2a2e233e8e49633461521f98ec57fbff9d59a884c9a4f04ec1da34" -dependencies = [ - "xz2", -] - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "zip" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" -dependencies = [ - "aes", - "arbitrary", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "deflate64", - "displaydoc", - "flate2", - "hmac", - "indexmap 2.2.6", - "lzma-rs", - "memchr", - "pbkdf2", - "rand", - "sha1", - "thiserror 1.0.63", - "time", - "zeroize", - "zopfli", - "zstd", -] - -[[package]] -name = "zopfli" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" -dependencies = [ - "bumpalo", - "crc32fast", - "lockfree-object-pool", - "log", - "once_cell", - "simd-adler32", -] - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/test/Cargo.toml b/test/Cargo.toml index 6bdd7b1b..2aa577bd 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -34,9 +34,6 @@ name = "test" crate-type = ["cdylib", "rlib"] path = "src/test.rs" -[profile.release] -debug = true - [features] debug_memory = ["holochain_wasmer_host/debug_memory"] default = ["wasmer_sys_dev"] diff --git a/test/src/test.rs b/test/src/test.rs index 1be011fd..9069e8c1 100644 --- a/test/src/test.rs +++ b/test/src/test.rs @@ -391,7 +391,7 @@ pub mod tests { match err { Err(runtime_error) => assert_eq!( WasmError { - file: "src/wasm.rs".into(), + file: "test/test_wasm/src/wasm.rs".into(), line: 102, error: WasmErrorInner::Guest("oh no!".into()), }, @@ -432,7 +432,7 @@ pub mod tests { Err(runtime_error) => { assert_eq!( WasmError { - file: "src/wasm.rs".into(), + file: "test/test_wasm/src/wasm.rs".into(), line: 130, error: WasmErrorInner::Guest("it fails!: ()".into()), }, diff --git a/test/test_wasm/Cargo.lock b/test/test_wasm/Cargo.lock deleted file mode 100644 index 5dffba56..00000000 --- a/test/test_wasm/Cargo.lock +++ /dev/null @@ -1,337 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror 1.0.63", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "thiserror 2.0.8", -] - -[[package]] -name = "holochain_wasmer_guest" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_common", - "paste", - "serde", - "tracing", -] - -[[package]] -name = "indexmap" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "serde_json" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test_common" -version = "0.0.90" -dependencies = [ - "holochain_wasmer_common", - "serde", - "serde_bytes", -] - -[[package]] -name = "test_wasm" -version = "0.0.90" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_guest", - "serde", - "test_common", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl 1.0.63", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/test/test_wasm/src/wasm.rs b/test/test_wasm/src/wasm.rs index 5ae52acc..cc246c3b 100644 --- a/test/test_wasm/src/wasm.rs +++ b/test/test_wasm/src/wasm.rs @@ -153,11 +153,10 @@ pub extern "C" fn decrease_points(guest_ptr: usize, len: usize) -> DoubleUSize { #[no_mangle] pub extern "C" fn call_ping_via_host(_guest_ptr: usize, _len: usize) -> DoubleUSize { let res = host_call::<(), Vec>(__hc__call_ping_1, ()).unwrap(); - return_ptr(res) + return_ptr(res) } - #[no_mangle] pub extern "C" fn ping(_guest_ptr: usize, _len: usize) -> DoubleUSize { return_ptr(Vec::::from([1])) -} \ No newline at end of file +} diff --git a/test/wasm_empty/Cargo.lock b/test/wasm_empty/Cargo.lock deleted file mode 100644 index 3ff325ca..00000000 --- a/test/wasm_empty/Cargo.lock +++ /dev/null @@ -1,325 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "hashbrown" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror 1.0.49", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "thiserror 2.0.8", -] - -[[package]] -name = "holochain_wasmer_guest" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_common", - "paste", - "serde", - "tracing", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test_wasm_empty" -version = "0.0.90" -dependencies = [ - "holochain_wasmer_guest", -] - -[[package]] -name = "thiserror" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" -dependencies = [ - "thiserror-impl 1.0.49", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/test/wasm_io/Cargo.lock b/test/wasm_io/Cargo.lock deleted file mode 100644 index 4c32f90e..00000000 --- a/test/wasm_io/Cargo.lock +++ /dev/null @@ -1,363 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror 1.0.63", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "thiserror 2.0.8", -] - -[[package]] -name = "holochain_wasmer_guest" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_common", - "paste 1.0.15", - "serde", - "tracing", -] - -[[package]] -name = "indexmap" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste 1.0.15", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "serde_json" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test_common" -version = "0.0.90" -dependencies = [ - "holochain_wasmer_common", - "serde", - "serde_bytes", -] - -[[package]] -name = "test_wasm_io" -version = "0.0.90" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_guest", - "paste 0.1.18", - "serde", - "test_common", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl 1.0.63", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/test/wasm_io/src/wasm.rs b/test/wasm_io/src/wasm.rs index d60c278b..eac58a7d 100644 --- a/test/wasm_io/src/wasm.rs +++ b/test/wasm_io/src/wasm.rs @@ -84,7 +84,7 @@ macro_rules! _n { return_ptr(s) } } - } + }; } _n!(Bytes; n; vec![0; u32::from(n).try_into().unwrap()]; vec![];); diff --git a/test/wasm_memory/Cargo.lock b/test/wasm_memory/Cargo.lock deleted file mode 100644 index bfc68528..00000000 --- a/test/wasm_memory/Cargo.lock +++ /dev/null @@ -1,363 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror 1.0.63", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "thiserror 2.0.8", -] - -[[package]] -name = "holochain_wasmer_guest" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_common", - "paste 1.0.15", - "serde", - "tracing", -] - -[[package]] -name = "indexmap" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste 1.0.15", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "serde_json" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test_common" -version = "0.0.90" -dependencies = [ - "holochain_wasmer_common", - "serde", - "serde_bytes", -] - -[[package]] -name = "test_wasm_memory" -version = "0.0.84" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_guest", - "paste 0.1.18", - "serde", - "test_common", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl 1.0.63", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/test/wasm_memory/src/wasm.rs b/test/wasm_memory/src/wasm.rs index 71ff0261..394de5d1 100644 --- a/test/wasm_memory/src/wasm.rs +++ b/test/wasm_memory/src/wasm.rs @@ -10,29 +10,25 @@ extern "C" { #[no_mangle] pub extern "C" fn bytes_round_trip(_: usize, _: usize) -> DoubleUSize { - let mut old_pages: WasmSize = unsafe { __hc__pages_1(0) }; let mut current_pages: WasmSize = old_pages; // thrash this more times than there are bytes in a wasm page so that if even one byte leaks // we will see it in the page count for i in 0..100_000 { - // thrash a bunch of little chunks of bytes so that we can be reasonably sure the // allocations are in the correct position and not overlapping - let bytes: Vec<[u8; 5]> = std::iter::repeat([ 1, 2, 3, 4, 5 ]).take(100).collect(); + let bytes: Vec<[u8; 5]> = std::iter::repeat([1, 2, 3, 4, 5]).take(100).collect(); - let ptrs: Vec = bytes.iter().map(|b| { - allocation::write_bytes(b.to_vec()) - }).collect(); + let ptrs: Vec = bytes + .iter() + .map(|b| allocation::write_bytes(b.to_vec())) + .collect(); for i in 0..ptrs.len() { // consuming the bytes should give a vector of the same bytes as the original bytes - assert_eq!( - bytes[i].to_vec(), - allocation::consume_bytes(ptrs[i], 5), - ); - }; + assert_eq!(bytes[i].to_vec(), allocation::consume_bytes(ptrs[i], 5),); + } // if we forget to deallocate properly then the number of allocated pages will grow old_pages = current_pages; From 2798fd8a54f0b30ad94074713caf517a02264502 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 18 Dec 2024 17:32:15 -0700 Subject: [PATCH 02/21] chore: move tests from module -> wasmer_sys to avoid public glob rexport shadowing --- crates/host/src/module.rs | 45 --------------------------- crates/host/src/module/wasmer_sys.rs | 45 +++++++++++++++++++++++++++ crates/host/src/module/wasmer_wamr.rs | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/crates/host/src/module.rs b/crates/host/src/module.rs index 3728eec5..871f7b0c 100644 --- a/crates/host/src/module.rs +++ b/crates/host/src/module.rs @@ -372,48 +372,3 @@ impl ModuleCache { Ok(module) } } - -#[cfg(test)] -pub mod tests { - use super::{CacheKey, ModuleCache, PlruCache}; - - #[test] - fn cache_test() { - // simple example wasm taken from wasmer docs - // https://docs.rs/wasmer/latest/wasmer/struct.Module.html#example - let wasm: Vec = vec![ - 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01, 0x60, 0x01, 0x7f, - 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0b, 0x01, 0x07, 0x61, 0x64, 0x64, 0x5f, - 0x6f, 0x6e, 0x65, 0x00, 0x00, 0x0a, 0x09, 0x01, 0x07, 0x00, 0x20, 0x00, 0x41, 0x01, - 0x6a, 0x0b, 0x00, 0x1a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x01, 0x0a, 0x01, 0x00, 0x07, - 0x61, 0x64, 0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x02, 0x07, 0x01, 0x00, 0x01, 0x00, 0x02, - 0x70, 0x30, - ]; - let module_cache = ModuleCache::new(None); - assert!(module_cache.serialized_module_cache.read().cache.is_empty()); - assert!(module_cache - .deserialized_module_cache - .read() - .cache - .is_empty()); - - let key: CacheKey = [0u8; 32]; - let module = module_cache.get(key, &wasm).unwrap(); - - // make sure module has been stored in serialized cache under key - { - let serialized_cached_module = - module_cache.serialized_module_cache.write().get_item(&key); - assert!(serialized_cached_module.is_some()); - } - // make sure module has been stored in deserialized cache under key - { - let deserialized_cached_module = module_cache - .deserialized_module_cache - .write() - .get_item(&key) - .unwrap(); - assert_eq!(*deserialized_cached_module, *module); - } - } -} diff --git a/crates/host/src/module/wasmer_sys.rs b/crates/host/src/module/wasmer_sys.rs index 82b010d3..69e12bca 100644 --- a/crates/host/src/module/wasmer_sys.rs +++ b/crates/host/src/module/wasmer_sys.rs @@ -74,3 +74,48 @@ pub fn get_ios_module_from_file(path: &Path) -> Result let engine = Engine::headless(); unsafe { Module::deserialize_from_file(&engine, path) } } + +#[cfg(test)] +mod tests { + use crate::module::{CacheKey, ModuleCache, PlruCache}; + + #[test] + fn cache_test() { + // simple example wasm taken from wasmer docs + // https://docs.rs/wasmer/latest/wasmer/struct.Module.html#example + let wasm: Vec = vec![ + 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01, 0x60, 0x01, 0x7f, + 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0b, 0x01, 0x07, 0x61, 0x64, 0x64, 0x5f, + 0x6f, 0x6e, 0x65, 0x00, 0x00, 0x0a, 0x09, 0x01, 0x07, 0x00, 0x20, 0x00, 0x41, 0x01, + 0x6a, 0x0b, 0x00, 0x1a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x01, 0x0a, 0x01, 0x00, 0x07, + 0x61, 0x64, 0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x02, 0x07, 0x01, 0x00, 0x01, 0x00, 0x02, + 0x70, 0x30, + ]; + let module_cache = ModuleCache::new(None); + assert!(module_cache.serialized_module_cache.read().cache.is_empty()); + assert!(module_cache + .deserialized_module_cache + .read() + .cache + .is_empty()); + + let key: CacheKey = [0u8; 32]; + let module = module_cache.get(key, &wasm).unwrap(); + + // make sure module has been stored in serialized cache under key + { + let serialized_cached_module = + module_cache.serialized_module_cache.write().get_item(&key); + assert!(serialized_cached_module.is_some()); + } + // make sure module has been stored in deserialized cache under key + { + let deserialized_cached_module = module_cache + .deserialized_module_cache + .write() + .get_item(&key) + .unwrap(); + assert_eq!(*deserialized_cached_module, *module); + } + } +} diff --git a/crates/host/src/module/wasmer_wamr.rs b/crates/host/src/module/wasmer_wamr.rs index 8d620fe4..73392795 100644 --- a/crates/host/src/module/wasmer_wamr.rs +++ b/crates/host/src/module/wasmer_wamr.rs @@ -36,7 +36,7 @@ pub fn get_ios_module_from_file(_path: &Path) -> Result Date: Wed, 18 Dec 2024 17:39:31 -0700 Subject: [PATCH 03/21] chore: root workspace includes test crate --- scripts/fuzz-wasmer_sys_dev.sh | 1 - scripts/fuzz-wasmer_sys_prod.sh | 1 - scripts/fuzz-wasmer_wamr.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/scripts/fuzz-wasmer_sys_dev.sh b/scripts/fuzz-wasmer_sys_dev.sh index f6832e9f..49c7822f 100755 --- a/scripts/fuzz-wasmer_sys_dev.sh +++ b/scripts/fuzz-wasmer_sys_dev.sh @@ -1,5 +1,4 @@ #! /usr/bin/env bash cargo test -cargo test --manifest-path test/Cargo.toml cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_sys_dev diff --git a/scripts/fuzz-wasmer_sys_prod.sh b/scripts/fuzz-wasmer_sys_prod.sh index 5a9d3a4b..4b2fe278 100755 --- a/scripts/fuzz-wasmer_sys_prod.sh +++ b/scripts/fuzz-wasmer_sys_prod.sh @@ -1,5 +1,4 @@ #! /usr/bin/env bash cargo test -cargo test --manifest-path test/Cargo.toml cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_sys_prod diff --git a/scripts/fuzz-wasmer_wamr.sh b/scripts/fuzz-wasmer_wamr.sh index 88c39567..9815e00c 100755 --- a/scripts/fuzz-wasmer_wamr.sh +++ b/scripts/fuzz-wasmer_wamr.sh @@ -1,5 +1,4 @@ #! /usr/bin/env bash cargo test -cargo test --manifest-path test/Cargo.toml cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_wamr \ No newline at end of file From 89d85eaf3f7cf1e29b672a4e6852fb2a5b2bb931 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 18 Dec 2024 17:41:19 -0700 Subject: [PATCH 04/21] chore: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82fb7638..e435a4b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Upgrade wasmer to 5.x - **BREAKING CHANGE** The `wasmer_sys` feature has been renamed to `wasmer_sys_dev` +- Removed separate cargo workspaces for `guest` and `test` and separate cargo projects for test wasm dirs. Now all are members of a signel cargo workspace. ### Added - A new feature flag, `wasmer_sys_prod` which enables the Wasmer LLVM compiler. The default, with the `wasmer_sys_dev` feature From b3787b8e59adce890407fca76e21b609a8f715c1 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 18 Dec 2024 17:45:35 -0700 Subject: [PATCH 05/21] chore: missed a cargo.lock --- Cargo.lock | 2 +- test/common/Cargo.lock | 535 ----------------------------------------- 2 files changed, 1 insertion(+), 536 deletions(-) delete mode 100644 test/common/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock index a4bf9b81..a2a72c00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1031,7 +1031,7 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.96" +version = "0.0.97" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", diff --git a/test/common/Cargo.lock b/test/common/Cargo.lock deleted file mode 100644 index 4818c974..00000000 --- a/test/common/Cargo.lock +++ /dev/null @@ -1,535 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "camino" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cpufeatures" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.76", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.76", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "holochain_serialized_bytes" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" -dependencies = [ - "holochain_serialized_bytes_derive", - "rmp-serde", - "serde", - "serde-transcode", - "serde_bytes", - "serde_json", - "thiserror", -] - -[[package]] -name = "holochain_serialized_bytes_derive" -version = "0.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.96" -dependencies = [ - "holochain_serialized_bytes", - "serde", - "serde_bytes", - "test-fuzz", - "thiserror", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "prettyplease" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" -dependencies = [ - "proc-macro2", - "syn 2.0.76", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.76", -] - -[[package]] -name = "serde_json" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test-fuzz" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7a9bb33d134e863862ab9dad2ac7e022ac89707914627f498fe0f29248d9b" -dependencies = [ - "serde", - "test-fuzz-internal", - "test-fuzz-macro", - "test-fuzz-runtime", -] - -[[package]] -name = "test-fuzz-internal" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bef5dd380747bd7b6e636a8032a24aa34fcecaf843e59fc97d299681922e86" -dependencies = [ - "bincode", - "cargo_metadata", - "serde", -] - -[[package]] -name = "test-fuzz-macro" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500" -dependencies = [ - "darling", - "heck", - "itertools", - "once_cell", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.76", -] - -[[package]] -name = "test-fuzz-runtime" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fbe6fb7481ec6d9bf64ae2c5d49cb1b40f8da624a91031482af7b08168c679" -dependencies = [ - "hex", - "num-traits", - "serde", - "sha1", - "test-fuzz-internal", -] - -[[package]] -name = "test_common" -version = "0.0.90" -dependencies = [ - "holochain_wasmer_common", - "serde", - "serde_bytes", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.76", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" From 50bd5a20f13cc50fd0523c757f09eef8f3784b5e Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 18 Dec 2024 17:48:47 -0700 Subject: [PATCH 06/21] chore: move building test wasms before testing root workspace --- scripts/test-wasmer_sys_dev.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index 998e4c90..75ae513f 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -9,11 +9,11 @@ cargo fmt --check cargo clippy -- --deny warnings ( cd crates/guest && cargo clippy --target wasm32-unknown-unknown -- --deny warnings ) -# tests the root workspace -cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture - # test that test wasms build cargo build --release -p test_wasm --target wasm32-unknown-unknown +# tests the root workspace +cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture + # build wasm and run the "full" tests for wasmer_sys_dev cargo test --release -p test --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture From 067fb8e511f63ff3a82212066335acd5d602b49a Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 18 Dec 2024 20:49:49 -0700 Subject: [PATCH 07/21] refactor: instead of nesting crates within "test" crate, move all to same level within "test-crates" dir --- Cargo.toml | 2 +- {test => test-crates}/common/Cargo.toml | 0 {test => test-crates}/common/src/common.rs | 0 {test => test-crates}/test_wasm/Cargo.toml | 0 {test => test-crates}/test_wasm/src/wasm.rs | 0 {test => test-crates/tests}/Cargo.toml | 6 +++--- {test => test-crates/tests}/benches/bench.rs | 0 {test => test-crates/tests}/build.rs | 15 ++++++++++----- {test => test-crates/tests}/src/import.rs | 0 {test => test-crates/tests}/src/test.rs | 4 ++-- {test => test-crates/tests}/src/wasms.rs | 0 {test => test-crates}/wasm_empty/Cargo.toml | 0 {test => test-crates}/wasm_empty/src/wasm.rs | 0 {test => test-crates}/wasm_io/Cargo.toml | 0 {test => test-crates}/wasm_io/src/wasm.rs | 0 {test => test-crates}/wasm_memory/Cargo.toml | 0 {test => test-crates}/wasm_memory/src/wasm.rs | 0 17 files changed, 16 insertions(+), 11 deletions(-) rename {test => test-crates}/common/Cargo.toml (100%) rename {test => test-crates}/common/src/common.rs (100%) rename {test => test-crates}/test_wasm/Cargo.toml (100%) rename {test => test-crates}/test_wasm/src/wasm.rs (100%) rename {test => test-crates/tests}/Cargo.toml (81%) rename {test => test-crates/tests}/benches/bench.rs (100%) rename {test => test-crates/tests}/build.rs (76%) rename {test => test-crates/tests}/src/import.rs (100%) rename {test => test-crates/tests}/src/test.rs (99%) rename {test => test-crates/tests}/src/wasms.rs (100%) rename {test => test-crates}/wasm_empty/Cargo.toml (100%) rename {test => test-crates}/wasm_empty/src/wasm.rs (100%) rename {test => test-crates}/wasm_io/Cargo.toml (100%) rename {test => test-crates}/wasm_io/src/wasm.rs (100%) rename {test => test-crates}/wasm_memory/Cargo.toml (100%) rename {test => test-crates}/wasm_memory/src/wasm.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 2c71daf9..ad08dc24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["crates/*", "test", "test/common", "test/test_wasm", "test/wasm_empty", "test/wasm_io", "test/wasm_memory"] +members = ["crates/*", "test-crates/*"] default-members = ["crates/*"] resolver = "2" diff --git a/test/common/Cargo.toml b/test-crates/common/Cargo.toml similarity index 100% rename from test/common/Cargo.toml rename to test-crates/common/Cargo.toml diff --git a/test/common/src/common.rs b/test-crates/common/src/common.rs similarity index 100% rename from test/common/src/common.rs rename to test-crates/common/src/common.rs diff --git a/test/test_wasm/Cargo.toml b/test-crates/test_wasm/Cargo.toml similarity index 100% rename from test/test_wasm/Cargo.toml rename to test-crates/test_wasm/Cargo.toml diff --git a/test/test_wasm/src/wasm.rs b/test-crates/test_wasm/src/wasm.rs similarity index 100% rename from test/test_wasm/src/wasm.rs rename to test-crates/test_wasm/src/wasm.rs diff --git a/test/Cargo.toml b/test-crates/tests/Cargo.toml similarity index 81% rename from test/Cargo.toml rename to test-crates/tests/Cargo.toml index 2aa577bd..6b922a54 100644 --- a/test/Cargo.toml +++ b/test-crates/tests/Cargo.toml @@ -5,11 +5,11 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -holochain_wasmer_common = { path = "../crates/common" } -holochain_wasmer_host = { path = "../crates/host", default-features = false, features = ["error_as_host"] } +holochain_wasmer_common = { path = "../../crates/common" } +holochain_wasmer_host = { path = "../../crates/host", default-features = false, features = ["error_as_host"] } holochain_serialized_bytes = "=0.0.55" serde = "1" -test_common = { path = "./common", default-features = false } +test_common = { path = "../common", default-features = false } criterion = { version = "0.5", features = ["html_reports"] } rand = "0.8" serde_bytes = "0.11" diff --git a/test/benches/bench.rs b/test-crates/tests/benches/bench.rs similarity index 100% rename from test/benches/bench.rs rename to test-crates/tests/benches/bench.rs diff --git a/test/build.rs b/test-crates/tests/build.rs similarity index 76% rename from test/build.rs rename to test-crates/tests/build.rs index 1f607680..2fa9e367 100644 --- a/test/build.rs +++ b/test-crates/tests/build.rs @@ -5,16 +5,21 @@ fn main() { println!("cargo:rerun-if-changed=*"); - for &m in ["test_wasm", "wasm_memory", "wasm_empty", "wasm_io"].iter() { - let cargo_toml = Path::new(m).join("Cargo.toml"); - + for &m in [ + "test_wasm", + "test_wasm_memory", + "test_wasm_empty", + "test_wasm_io", + ] + .iter() + { let cargo_command = std::env::var_os("CARGO"); let cargo_command = cargo_command.as_deref().unwrap_or_else(|| "cargo".as_ref()); let status = std::process::Command::new(cargo_command) .arg("build") - .arg("--manifest-path") - .arg(cargo_toml) + .arg("-p") + .arg(m) .arg("--release") .arg("--target") .arg("wasm32-unknown-unknown") diff --git a/test/src/import.rs b/test-crates/tests/src/import.rs similarity index 100% rename from test/src/import.rs rename to test-crates/tests/src/import.rs diff --git a/test/src/test.rs b/test-crates/tests/src/test.rs similarity index 99% rename from test/src/test.rs rename to test-crates/tests/src/test.rs index 9069e8c1..809c320e 100644 --- a/test/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -391,7 +391,7 @@ pub mod tests { match err { Err(runtime_error) => assert_eq!( WasmError { - file: "test/test_wasm/src/wasm.rs".into(), + file: "test-crates/test_wasm/src/wasm.rs".into(), line: 102, error: WasmErrorInner::Guest("oh no!".into()), }, @@ -432,7 +432,7 @@ pub mod tests { Err(runtime_error) => { assert_eq!( WasmError { - file: "test/test_wasm/src/wasm.rs".into(), + file: "test-crates/test_wasm/src/wasm.rs".into(), line: 130, error: WasmErrorInner::Guest("it fails!: ()".into()), }, diff --git a/test/src/wasms.rs b/test-crates/tests/src/wasms.rs similarity index 100% rename from test/src/wasms.rs rename to test-crates/tests/src/wasms.rs diff --git a/test/wasm_empty/Cargo.toml b/test-crates/wasm_empty/Cargo.toml similarity index 100% rename from test/wasm_empty/Cargo.toml rename to test-crates/wasm_empty/Cargo.toml diff --git a/test/wasm_empty/src/wasm.rs b/test-crates/wasm_empty/src/wasm.rs similarity index 100% rename from test/wasm_empty/src/wasm.rs rename to test-crates/wasm_empty/src/wasm.rs diff --git a/test/wasm_io/Cargo.toml b/test-crates/wasm_io/Cargo.toml similarity index 100% rename from test/wasm_io/Cargo.toml rename to test-crates/wasm_io/Cargo.toml diff --git a/test/wasm_io/src/wasm.rs b/test-crates/wasm_io/src/wasm.rs similarity index 100% rename from test/wasm_io/src/wasm.rs rename to test-crates/wasm_io/src/wasm.rs diff --git a/test/wasm_memory/Cargo.toml b/test-crates/wasm_memory/Cargo.toml similarity index 100% rename from test/wasm_memory/Cargo.toml rename to test-crates/wasm_memory/Cargo.toml diff --git a/test/wasm_memory/src/wasm.rs b/test-crates/wasm_memory/src/wasm.rs similarity index 100% rename from test/wasm_memory/src/wasm.rs rename to test-crates/wasm_memory/src/wasm.rs From cecca25370847bb877673a61f9b5502cf7d1bfff Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 12:53:53 -0700 Subject: [PATCH 08/21] chore: rename test_wasm to test_wasm_core to clarify which crates are wasms used for tests vs actual test implementations --- Cargo.lock | 10 ++-- scripts/test-wasmer_sys_dev.sh | 2 +- test-crates/tests/benches/bench.rs | 12 ++--- test-crates/tests/build.rs | 4 +- test-crates/tests/src/test.rs | 46 +++++++++---------- test-crates/tests/src/wasms.rs | 12 ++--- .../{test_wasm => wasm_core}/Cargo.toml | 4 +- .../{test_wasm => wasm_core}/src/wasm.rs | 0 8 files changed, 44 insertions(+), 46 deletions(-) rename test-crates/{test_wasm => wasm_core}/Cargo.toml (88%) rename test-crates/{test_wasm => wasm_core}/src/wasm.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index a2a72c00..b05f1d00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -294,9 +294,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" dependencies = [ "jobserver", "libc", @@ -1340,9 +1340,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.168" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" @@ -2419,7 +2419,7 @@ dependencies = [ ] [[package]] -name = "test_wasm" +name = "test_wasm_core" version = "0.0.90" dependencies = [ "holochain_serialized_bytes", diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index 75ae513f..9fc335c7 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -10,7 +10,7 @@ cargo clippy -- --deny warnings ( cd crates/guest && cargo clippy --target wasm32-unknown-unknown -- --deny warnings ) # test that test wasms build -cargo build --release -p test_wasm --target wasm32-unknown-unknown +cargo build --release -p test_wasm_core --target wasm32-unknown-unknown # tests the root workspace cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture diff --git a/test-crates/tests/benches/bench.rs b/test-crates/tests/benches/bench.rs index 1d566c5a..cc23f703 100644 --- a/test-crates/tests/benches/bench.rs +++ b/test-crates/tests/benches/bench.rs @@ -16,7 +16,7 @@ pub fn wasm_module_compile(c: &mut Criterion) { for wasm in [ TestWasm::Empty, TestWasm::Io, - TestWasm::Test, + TestWasm::Core, TestWasm::Memory, ] { group.bench_function(BenchmarkId::new("wasm_module_compile", wasm.name()), |b| { @@ -34,7 +34,7 @@ pub fn wasm_module_deserialize_from_file(c: &mut Criterion) { for wasm in [ TestWasm::Empty, TestWasm::Io, - TestWasm::Test, + TestWasm::Core, TestWasm::Memory, ] { let tmpdir = TempDir::new().unwrap(); @@ -59,7 +59,7 @@ pub fn wasm_module(c: &mut Criterion) { for wasm in [ TestWasm::Empty, TestWasm::Io, - TestWasm::Test, + TestWasm::Core, TestWasm::Memory, ] { group.bench_function(BenchmarkId::new("wasm_module", wasm.name()), |b| { @@ -79,7 +79,7 @@ pub fn wasm_instance(c: &mut Criterion) { for wasm in [ TestWasm::Empty, TestWasm::Io, - TestWasm::Test, + TestWasm::Core, TestWasm::Memory, ] { group.bench_function(BenchmarkId::new("wasm_instance", wasm.name()), |b| { @@ -211,7 +211,7 @@ pub fn wasm_call_n(c: &mut Criterion) { pub fn test_process_string(c: &mut Criterion) { let mut group = c.benchmark_group("test_process_string"); - let instance_with_store = TestWasm::Test.unmetered_instance(); + let instance_with_store = TestWasm::Core.unmetered_instance(); for n in [0, 1, 1_000, 1_000_000] { group.throughput(Throughput::Bytes(n)); @@ -249,7 +249,7 @@ pub fn test_instances(c: &mut Criterion) { let mut jhs = Vec::new(); for _ in 0..25 { let input = input.clone(); - let instance_with_store = TestWasm::Test.unmetered_instance(); + let instance_with_store = TestWasm::Core.unmetered_instance(); let instance = instance_with_store.instance.clone(); let store = instance_with_store.store.clone(); let jh = std::thread::spawn(move || { diff --git a/test-crates/tests/build.rs b/test-crates/tests/build.rs index 2fa9e367..872aa2f3 100644 --- a/test-crates/tests/build.rs +++ b/test-crates/tests/build.rs @@ -1,12 +1,10 @@ -use std::path::Path; - fn main() { let out_dir = std::env::var_os("OUT_DIR").unwrap(); println!("cargo:rerun-if-changed=*"); for &m in [ - "test_wasm", + "test_wasm_core", "test_wasm_memory", "test_wasm_empty", "test_wasm_io", diff --git a/test-crates/tests/src/test.rs b/test-crates/tests/src/test.rs index 809c320e..64725d7c 100644 --- a/test-crates/tests/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -120,7 +120,7 @@ pub fn call_ping( let (env, mut store_mut) = function_env.data_and_store_mut(); // Call ping in a new guest instance - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: Vec = guest::call(&mut store.lock().as_store_mut(), instance, "ping", ()).unwrap(); @@ -145,7 +145,7 @@ pub mod tests { #[test] fn host_externs_toolable() { - let module = (*TestWasm::Test.module(false)).clone(); + let module = (*TestWasm::Core.module(false)).clone(); // Imports will be the minimal set of functions actually used by the wasm // NOT the complete list defined by `host_externs!`. assert_eq!( @@ -169,7 +169,7 @@ pub mod tests { fn infinite_loop() { // Instead of looping forever we want the metering to kick in and trap // the execution into an unreachable error. - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: Result<(), _> = guest::call( &mut store.lock().as_store_mut(), instance, @@ -181,7 +181,7 @@ pub mod tests { #[test] fn short_circuit() { - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: String = guest::call( &mut store.lock().as_store_mut(), instance, @@ -206,7 +206,7 @@ pub mod tests { #[test] fn stacked_test() { - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: String = guest::call( &mut store.lock().as_store_mut(), instance, @@ -221,7 +221,7 @@ pub mod tests { #[test] fn literal_bytes() { let input: Vec = vec![1, 2, 3]; - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: Vec = guest::call( &mut store.lock().as_store_mut(), instance, @@ -234,7 +234,7 @@ pub mod tests { #[test] fn ignore_args_process_string_test() { - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: StringType = guest::call( &mut store.lock().as_store_mut(), instance, @@ -249,7 +249,7 @@ pub mod tests { #[cfg(not(target_os = "windows"))] #[test_fuzz::test_fuzz] fn process_string_fuzz(s: String) { - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: StringType = guest::call( &mut store.lock().as_store_mut(), instance, @@ -269,7 +269,7 @@ pub mod tests { // and utf-8 are both working OK let starter_string = "╰▐ ✖ 〜 ✖ ▐╯".repeat(usize::try_from(10_u32 * u32::from(u16::MAX)).unwrap()); - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: StringType = guest::call( &mut store.lock().as_store_mut(), instance, @@ -292,11 +292,11 @@ pub mod tests { let InstanceWithStore { store: store_1, instance: instance_1, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let InstanceWithStore { store: store_2, instance: instance_2, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let call_1 = thread::spawn({ let some_struct = some_struct.clone(); @@ -329,7 +329,7 @@ pub mod tests { let some_inner = "foo"; let some_struct = SomeStruct::new(some_inner.into()); - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: SomeStruct = guest::call( &mut store.lock().as_store_mut(), @@ -347,7 +347,7 @@ pub mod tests { let some_inner = "foo"; let some_struct = SomeStruct::new(some_inner.into()); - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: SomeStruct = guest::call( &mut store.lock().as_store_mut(), @@ -366,7 +366,7 @@ pub mod tests { let InstanceWithStore { store: store_foo, instance: instance_foo, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let some_struct: SomeStruct = guest::call( &mut store_foo.lock().as_store_mut(), @@ -380,7 +380,7 @@ pub mod tests { let InstanceWithStore { store: store_ret_err, instance: instance_ret_err, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let err: Result = guest::call( &mut store_ret_err.lock().as_store_mut(), @@ -391,7 +391,7 @@ pub mod tests { match err { Err(runtime_error) => assert_eq!( WasmError { - file: "test-crates/test_wasm/src/wasm.rs".into(), + file: "test-crates/wasm_core/src/wasm.rs".into(), line: 102, error: WasmErrorInner::Guest("oh no!".into()), }, @@ -406,7 +406,7 @@ pub mod tests { let InstanceWithStore { store: store_succeed, instance: instance_succeed, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let success_result: Result = guest::call( &mut store_succeed.lock().as_store_mut(), @@ -420,7 +420,7 @@ pub mod tests { let InstanceWithStore { store: store_fail, instance: instance_fail, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let fail_result: Result<(), wasmer::RuntimeError> = guest::call( &mut store_fail.lock().as_store_mut(), @@ -432,7 +432,7 @@ pub mod tests { Err(runtime_error) => { assert_eq!( WasmError { - file: "test-crates/test_wasm/src/wasm.rs".into(), + file: "test-crates/wasm_core/src/wasm.rs".into(), line: 130, error: WasmErrorInner::Guest("it fails!: ()".into()), }, @@ -446,7 +446,7 @@ pub mod tests { #[test] #[cfg_attr(not(feature = "wasmer_sys"), ignore)] fn decrease_points_test() { - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let dec_by = 1_000_000_u64; let points_before: u64 = instance .exports @@ -487,7 +487,7 @@ pub mod tests { // Call a guest fn // which calls a host fn // which calls a guest fn in a new instance - let InstanceWithStore { store, instance } = TestWasm::Test.instance(); + let InstanceWithStore { store, instance } = TestWasm::Core.instance(); let result: Vec = guest::call( &mut store.lock().as_store_mut(), instance, @@ -504,7 +504,7 @@ pub mod tests { let InstanceWithStore { store: store_1, instance: instance_1, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let result: Vec = guest::call( &mut store_1.lock().as_store_mut(), instance_1.clone(), @@ -518,7 +518,7 @@ pub mod tests { let InstanceWithStore { store: store_2, instance: instance_2, - } = TestWasm::Test.instance(); + } = TestWasm::Core.instance(); let result: Vec = guest::call(&mut store_2.lock().as_store_mut(), instance_2, "ping", ()) .expect("call ping via host"); diff --git a/test-crates/tests/src/wasms.rs b/test-crates/tests/src/wasms.rs index a9ca8fef..4fbecd4a 100644 --- a/test-crates/tests/src/wasms.rs +++ b/test-crates/tests/src/wasms.rs @@ -25,7 +25,7 @@ use wasmer_middlewares::Metering; pub enum TestWasm { Empty, Io, - Test, + Core, Memory, } @@ -44,9 +44,9 @@ impl TestWasm { env!("OUT_DIR"), "/wasm32-unknown-unknown/release/test_wasm_io.wasm" )), - TestWasm::Test => include_bytes!(concat!( + TestWasm::Core => include_bytes!(concat!( env!("OUT_DIR"), - "/wasm32-unknown-unknown/release/test_wasm.wasm" + "/wasm32-unknown-unknown/release/test_wasm_core.wasm" )), TestWasm::Memory => include_bytes!(concat!( env!("OUT_DIR"), @@ -59,7 +59,7 @@ impl TestWasm { match self { TestWasm::Empty => "empty", TestWasm::Io => "io", - TestWasm::Test => "test", + TestWasm::Core => "core", TestWasm::Memory => "memory", } } @@ -70,8 +70,8 @@ impl TestWasm { (TestWasm::Empty, true) => [1; 32], (TestWasm::Io, false) => [2; 32], (TestWasm::Io, true) => [3; 32], - (TestWasm::Test, false) => [4; 32], - (TestWasm::Test, true) => [5; 32], + (TestWasm::Core, false) => [4; 32], + (TestWasm::Core, true) => [5; 32], (TestWasm::Memory, false) => [6; 32], (TestWasm::Memory, true) => [7; 32], } diff --git a/test-crates/test_wasm/Cargo.toml b/test-crates/wasm_core/Cargo.toml similarity index 88% rename from test-crates/test_wasm/Cargo.toml rename to test-crates/wasm_core/Cargo.toml index 0a55e969..72d386d1 100644 --- a/test-crates/test_wasm/Cargo.toml +++ b/test-crates/wasm_core/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "test_wasm" +name = "test_wasm_core" version = "0.0.90" authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [lib] -name = "test_wasm" +name = "test_wasm_core" crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" diff --git a/test-crates/test_wasm/src/wasm.rs b/test-crates/wasm_core/src/wasm.rs similarity index 100% rename from test-crates/test_wasm/src/wasm.rs rename to test-crates/wasm_core/src/wasm.rs From 1287eba5a4af41a482b34e8473b41eaf335760c2 Mon Sep 17 00:00:00 2001 From: mattyg Date: Thu, 19 Dec 2024 12:55:32 -0700 Subject: [PATCH 09/21] chore: changelog clarity --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca588682..31cd477c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] -- Removed separate cargo workspaces for `guest` and `test` and separate cargo projects for test wasm dirs. Now all are members of a signel cargo workspace. +- Removed separate cargo workspaces for `crates/guest` and `test` and separate cargo projects for test wasms. Now all crates are members of a single cargo workspace. ## [0.0.96] From 71cc10d5b51e956e90048bb6b61839a206f59af3 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 13:01:26 -0700 Subject: [PATCH 10/21] fix: path to test crate --- scripts/bench-wasmer_sys_dev.sh | 2 +- scripts/bench-wasmer_sys_prod.sh | 2 +- scripts/bench-wasmer_wamr.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bench-wasmer_sys_dev.sh b/scripts/bench-wasmer_sys_dev.sh index ab6ded2c..02c5d06f 100755 --- a/scripts/bench-wasmer_sys_dev.sh +++ b/scripts/bench-wasmer_sys_dev.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash ( - cd test && \ + cd test-crates/test && \ cargo bench --no-default-features --features wasmer_sys_dev ) diff --git a/scripts/bench-wasmer_sys_prod.sh b/scripts/bench-wasmer_sys_prod.sh index fd73eced..9798ef5a 100755 --- a/scripts/bench-wasmer_sys_prod.sh +++ b/scripts/bench-wasmer_sys_prod.sh @@ -1,5 +1,5 @@ #! /usr/bin/env bash ( - cd test && \ + cd test-crates/test && \ cargo bench --no-default-features --features wasmer_sys_prod ) diff --git a/scripts/bench-wasmer_wamr.sh b/scripts/bench-wasmer_wamr.sh index 0fe9b6a8..8ba0358d 100755 --- a/scripts/bench-wasmer_wamr.sh +++ b/scripts/bench-wasmer_wamr.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash ( - cd test && \ + cd test-crates/test && \ cargo bench --no-default-features --features wasmer_wamr ) From 2e43788f3ac5d56a3b843fa3e079a9dd85f5e258 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 15:41:54 -0700 Subject: [PATCH 11/21] chore: fix bench paths, remove unused script --- Cargo.lock | 44 ++++++++++++++++---------------- Cargo.toml | 2 +- scripts/bench-wasmer_sys_dev.sh | 7 ++--- scripts/bench-wasmer_sys_prod.sh | 6 ++--- scripts/bench-wasmer_wamr.sh | 6 ++--- scripts/bump_version.sh | 15 ----------- scripts/test-wasmer_sys_dev.sh | 2 +- scripts/test-wasmer_sys_prod.sh | 2 +- scripts/test-wasmer_wamr.sh | 2 +- test-crates/tests/Cargo.toml | 2 +- 10 files changed, 33 insertions(+), 55 deletions(-) delete mode 100755 scripts/bump_version.sh diff --git a/Cargo.lock b/Cargo.lock index b05f1d00..00c3a078 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2335,28 +2335,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "test" -version = "0.0.90" -dependencies = [ - "criterion", - "ctor", - "env_logger", - "holochain_serialized_bytes", - "holochain_wasmer_common", - "holochain_wasmer_host", - "once_cell", - "parking_lot", - "rand", - "serde", - "serde_bytes", - "tempfile", - "test-fuzz", - "test_common", - "wasmer", - "wasmer-middlewares", -] - [[package]] name = "test-fuzz" version = "6.0.0" @@ -2457,6 +2435,28 @@ dependencies = [ "test_common", ] +[[package]] +name = "tests" +version = "0.0.90" +dependencies = [ + "criterion", + "ctor", + "env_logger", + "holochain_serialized_bytes", + "holochain_wasmer_common", + "holochain_wasmer_host", + "once_cell", + "parking_lot", + "rand", + "serde", + "serde_bytes", + "tempfile", + "test-fuzz", + "test_common", + "wasmer", + "wasmer-middlewares", +] + [[package]] name = "thiserror" version = "1.0.69" diff --git a/Cargo.toml b/Cargo.toml index ad08dc24..bc8a6a45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,5 +3,5 @@ members = ["crates/*", "test-crates/*"] default-members = ["crates/*"] resolver = "2" -[profile.release.package.test] +[profile.release.package.tests] debug = true diff --git a/scripts/bench-wasmer_sys_dev.sh b/scripts/bench-wasmer_sys_dev.sh index 02c5d06f..f96fc4b5 100755 --- a/scripts/bench-wasmer_sys_dev.sh +++ b/scripts/bench-wasmer_sys_dev.sh @@ -1,10 +1,7 @@ #! /usr/bin/env bash -( - cd test-crates/test && \ - cargo bench --no-default-features --features wasmer_sys_dev -) + +cargo bench -p tests --no-default-features --features wasmer_sys_dev # it's possible to flamegraph the benchmarks like this: # -# cd test # flamegraph cargo bench --bench bench -- --profile-time 10 diff --git a/scripts/bench-wasmer_sys_prod.sh b/scripts/bench-wasmer_sys_prod.sh index 9798ef5a..e7102008 100755 --- a/scripts/bench-wasmer_sys_prod.sh +++ b/scripts/bench-wasmer_sys_prod.sh @@ -1,5 +1,3 @@ #! /usr/bin/env bash -( - cd test-crates/test && \ - cargo bench --no-default-features --features wasmer_sys_prod -) + +cargo bench -p tests --no-default-features --features wasmer_sys_prod diff --git a/scripts/bench-wasmer_wamr.sh b/scripts/bench-wasmer_wamr.sh index 8ba0358d..ff7896e3 100755 --- a/scripts/bench-wasmer_wamr.sh +++ b/scripts/bench-wasmer_wamr.sh @@ -1,8 +1,6 @@ #! /usr/bin/env bash -( - cd test-crates/test && \ - cargo bench --no-default-features --features wasmer_wamr -) + +cargo bench -p tests --no-default-features --features wasmer_wamr # it's possible to flamegraph the benchmarks like this: # diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh deleted file mode 100755 index d5bb887c..00000000 --- a/scripts/bump_version.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell ../shell.nix -#! nix-shell -i bash - -set -xe - -FROM_VERSION="${1:?}" -TO_VERSION="${2:?}" - -find crates -name Cargo.toml -exec sed -i "s,${FROM_VERSION},${TO_VERSION},g" {} \; -find crates -name Cargo.toml -exec cargo check --manifest-path={} \; -find test -name Cargo.toml -exec sed -i "s,${FROM_VERSION},${TO_VERSION},g" {} \; -find test -name Cargo.toml -exec cargo check --manifest-path={} \; -./test.sh -git commit crates test -m "bumping versions from ${FROM_VERSION} to ${TO_VERSION}" diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index 9fc335c7..d0a2969a 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -16,4 +16,4 @@ cargo build --release -p test_wasm_core --target wasm32-unknown-unknown cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_sys_dev -cargo test --release -p test --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture +cargo test --release -p tests --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture diff --git a/scripts/test-wasmer_sys_prod.sh b/scripts/test-wasmer_sys_prod.sh index d25e73f5..9c68fad5 100755 --- a/scripts/test-wasmer_sys_prod.sh +++ b/scripts/test-wasmer_sys_prod.sh @@ -8,4 +8,4 @@ export WASMER_BACKTRACE=1 cargo test --no-default-features --features error_as_host,wasmer_sys_prod ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_sys_prod -cargo test --release -p test --no-default-features --features wasmer_sys_prod ${1-} -- --nocapture +cargo test --release -p tests --no-default-features --features wasmer_sys_prod ${1-} -- --nocapture diff --git a/scripts/test-wasmer_wamr.sh b/scripts/test-wasmer_wamr.sh index 79b72369..d52c8660 100755 --- a/scripts/test-wasmer_wamr.sh +++ b/scripts/test-wasmer_wamr.sh @@ -9,4 +9,4 @@ export WASMER_BACKTRACE=1 cargo test --no-default-features --features error_as_host,wasmer_wamr ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_wamr -cargo test --release -p test --no-default-features --features wasmer_wamr ${1-} -- --nocapture +cargo test --release -p tests --no-default-features --features wasmer_wamr ${1-} -- --nocapture diff --git a/test-crates/tests/Cargo.toml b/test-crates/tests/Cargo.toml index 6b922a54..6bdcb878 100644 --- a/test-crates/tests/Cargo.toml +++ b/test-crates/tests/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "test" +name = "tests" version = "0.0.90" authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" From c9e7d6e06624ebc002377985ad9f3f5e9c033a16 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 16:07:00 -0700 Subject: [PATCH 12/21] fix: windows tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12b8d48c..ecd656a4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,4 +75,4 @@ jobs: shell: pwsh run: | $env:LLVM_SYS_180_PREFIX="$(pwd)/.llvm" - cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture + cargo test --release -p tests --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture From e8274e79a268eb59d774b3c530e1e3c887e5e36e Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 16:29:43 -0700 Subject: [PATCH 13/21] wip: debug windows file path --- test-crates/tests/src/test.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test-crates/tests/src/test.rs b/test-crates/tests/src/test.rs index 64725d7c..e8d76836 100644 --- a/test-crates/tests/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -682,4 +682,10 @@ pub mod tests { assert!(res.is_ok()); } + + #[test] + fn test_file_macro() { + println!("Direct file!() output: {}", file!()); + println!("As debug: {:?}", file!()); + } } From 81ae4a1d929dc4a0a9304ba63e5b0ef686d1510f Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 16:52:52 -0700 Subject: [PATCH 14/21] fix: normalize file path formatting on windows and explain with comment --- crates/common/src/result.rs | 8 +++++++- crates/host/src/error.rs | 8 +++++++- test-crates/tests/src/test.rs | 6 ------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/crates/common/src/result.rs b/crates/common/src/result.rs index a013cd43..69e34f8f 100644 --- a/crates/common/src/result.rs +++ b/crates/common/src/result.rs @@ -135,7 +135,13 @@ pub struct WasmError { macro_rules! wasm_error { ($e:expr) => { $crate::WasmError { - file: file!().to_string(), + // On Windows the `file!()` macro returns a path with inconsistent formatting: + // from the workspace to the package root it uses backwards-slashes, + // then within the package it uses forwards-slashes. + // i.e. "test-crates\\wasm_core\\src/wasm.rs" + // + // To remedy this we normalize the formatting here. + file: file!().replace('\\', "/").to_string(), line: line!(), error: $e.into(), } diff --git a/crates/host/src/error.rs b/crates/host/src/error.rs index dfe1dcc4..8b69adcd 100644 --- a/crates/host/src/error.rs +++ b/crates/host/src/error.rs @@ -32,7 +32,13 @@ impl From for wasmer::RuntimeError { macro_rules! wasm_host_error { ($e:expr) => { WasmHostError(WasmError { - file: file!().to_string(), + // On Windows the `file!()` macro returns a path with inconsistent formatting: + // from the workspace to the package root it uses backwards-slashes, + // then within the package it uses forwards-slashes. + // i.e. "test-crates\\wasm_core\\src/wasm.rs" + // + // To remedy this we normalize the formatting here. + file: file!().replace('\\', "/").to_string(), line: line!(), error: $e.into(), }) diff --git a/test-crates/tests/src/test.rs b/test-crates/tests/src/test.rs index e8d76836..64725d7c 100644 --- a/test-crates/tests/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -682,10 +682,4 @@ pub mod tests { assert!(res.is_ok()); } - - #[test] - fn test_file_macro() { - println!("Direct file!() output: {}", file!()); - println!("As debug: {:?}", file!()); - } } From a386df55cadbfeaeb5d093d9df8513af7900d5bc Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 19 Dec 2024 16:58:08 -0700 Subject: [PATCH 15/21] chore: fmt --- crates/host/src/error.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/host/src/error.rs b/crates/host/src/error.rs index 8b69adcd..01f7d38c 100644 --- a/crates/host/src/error.rs +++ b/crates/host/src/error.rs @@ -32,12 +32,12 @@ impl From for wasmer::RuntimeError { macro_rules! wasm_host_error { ($e:expr) => { WasmHostError(WasmError { - // On Windows the `file!()` macro returns a path with inconsistent formatting: - // from the workspace to the package root it uses backwards-slashes, - // then within the package it uses forwards-slashes. - // i.e. "test-crates\\wasm_core\\src/wasm.rs" - // - // To remedy this we normalize the formatting here. + // On Windows the `file!()` macro returns a path with inconsistent formatting: + // from the workspace to the package root it uses backwards-slashes, + // then within the package it uses forwards-slashes. + // i.e. "test-crates\\wasm_core\\src/wasm.rs" + // + // To remedy this we normalize the formatting here. file: file!().replace('\\', "/").to_string(), line: line!(), error: $e.into(), From 44cdb170640493779d20c6466e2057448392e08b Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 20 Dec 2024 10:02:06 -0700 Subject: [PATCH 16/21] chore: long arg --- test-crates/tests/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-crates/tests/build.rs b/test-crates/tests/build.rs index 872aa2f3..a7325fe6 100644 --- a/test-crates/tests/build.rs +++ b/test-crates/tests/build.rs @@ -16,7 +16,7 @@ fn main() { let status = std::process::Command::new(cargo_command) .arg("build") - .arg("-p") + .arg("--package") .arg(m) .arg("--release") .arg("--target") From 21d0d6a1648290cc502973a71d9e71e712fe38c7 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 20 Dec 2024 10:02:17 -0700 Subject: [PATCH 17/21] chore: move example wasms into test-crates/wasms dir, use workspace for shared deps --- Cargo.toml | 7 ++++++- crates/common/Cargo.toml | 2 +- crates/guest/Cargo.toml | 6 +++--- crates/host/Cargo.toml | 8 ++++---- test-crates/common/Cargo.toml | 2 +- test-crates/tests/Cargo.toml | 12 ++++++------ test-crates/tests/src/test.rs | 4 ++-- test-crates/{ => wasms}/wasm_core/Cargo.toml | 6 +++--- test-crates/{ => wasms}/wasm_core/src/wasm.rs | 0 test-crates/{ => wasms}/wasm_empty/Cargo.toml | 2 +- test-crates/{ => wasms}/wasm_empty/src/wasm.rs | 0 test-crates/{ => wasms}/wasm_io/Cargo.toml | 6 +++--- test-crates/{ => wasms}/wasm_io/src/wasm.rs | 0 test-crates/{ => wasms}/wasm_memory/Cargo.toml | 6 +++--- test-crates/{ => wasms}/wasm_memory/src/wasm.rs | 0 15 files changed, 33 insertions(+), 28 deletions(-) rename test-crates/{ => wasms}/wasm_core/Cargo.toml (60%) rename test-crates/{ => wasms}/wasm_core/src/wasm.rs (100%) rename test-crates/{ => wasms}/wasm_empty/Cargo.toml (80%) rename test-crates/{ => wasms}/wasm_empty/src/wasm.rs (100%) rename test-crates/{ => wasms}/wasm_io/Cargo.toml (61%) rename test-crates/{ => wasms}/wasm_io/src/wasm.rs (100%) rename test-crates/{ => wasms}/wasm_memory/Cargo.toml (61%) rename test-crates/{ => wasms}/wasm_memory/src/wasm.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index bc8a6a45..5a6f3265 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,12 @@ [workspace] -members = ["crates/*", "test-crates/*"] +members = ["crates/*", "test-crates/common", "test-crates/tests", "test-crates/wasms/*"] default-members = ["crates/*"] resolver = "2" [profile.release.package.tests] debug = true + +[dependencies] +holochain_serialized_bytes = "=0.0.55" +wasmer = "5.0.2" +wasmer-middlewares = "5.0.2" \ No newline at end of file diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 0e920a5f..e6282090 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -7,7 +7,7 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -holochain_serialized_bytes = "=0.0.55" +holochain_serialized_bytes = { workspace = true } serde = "1" thiserror = "2" serde_bytes = "0.11" diff --git a/crates/guest/Cargo.toml b/crates/guest/Cargo.toml index c1e78ec6..61d38f33 100644 --- a/crates/guest/Cargo.toml +++ b/crates/guest/Cargo.toml @@ -12,12 +12,12 @@ crate-type = ["cdylib", "rlib"] path = "src/guest.rs" [dependencies] -holochain_serialized_bytes = "=0.0.55" -holochain_wasmer_common = { version = "=0.0.97", path = "../common" } +holochain_serialized_bytes = { workspace = true } +holochain_wasmer_common = { workspace = true } serde = "1" tracing = "0.1" paste = "1.0" [dev-dependencies] -holochain_wasmer_common = { version = "=0.0.97", path = "../common", features = ["fuzzing"] } +holochain_wasmer_common = { workspace = true, features = ["fuzzing"] } test-fuzz = "6.0.0" diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index c3dd311f..939691a3 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -7,11 +7,11 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -wasmer = { version = "5.0.2", default-features = false } -wasmer-middlewares = { version = "5.0.2", optional = true } +wasmer = { workspace = true, default-features = false } +wasmer-middlewares = { workspace = true, optional = true } -holochain_wasmer_common = { version = "=0.0.97", path = "../common" } -holochain_serialized_bytes = "=0.0.55" +holochain_wasmer_common = { workspace = true } +holochain_serialized_bytes = { workspace = true } serde = "1" tracing = "0.1" parking_lot = "0.12" diff --git a/test-crates/common/Cargo.toml b/test-crates/common/Cargo.toml index a382cbb3..8db14fe6 100644 --- a/test-crates/common/Cargo.toml +++ b/test-crates/common/Cargo.toml @@ -10,6 +10,6 @@ crate-type = [ "cdylib", "rlib" ] path = "src/common.rs" [dependencies] -holochain_wasmer_common = { path = "../../crates/common" } +holochain_wasmer_common = { workspace = true } serde = "1" serde_bytes = "0.11" diff --git a/test-crates/tests/Cargo.toml b/test-crates/tests/Cargo.toml index 6bdcb878..27a0d250 100644 --- a/test-crates/tests/Cargo.toml +++ b/test-crates/tests/Cargo.toml @@ -5,11 +5,11 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -holochain_wasmer_common = { path = "../../crates/common" } -holochain_wasmer_host = { path = "../../crates/host", default-features = false, features = ["error_as_host"] } -holochain_serialized_bytes = "=0.0.55" +holochain_wasmer_common = { workspace = true } +holochain_wasmer_host = { workspace = true, default-features = false, features = ["error_as_host"] } +holochain_serialized_bytes = { workspace = true } serde = "1" -test_common = { path = "../common", default-features = false } +test_common = { workspace = true, default-features = false } criterion = { version = "0.5", features = ["html_reports"] } rand = "0.8" serde_bytes = "0.11" @@ -18,8 +18,8 @@ test-fuzz = "=6.0.0" once_cell = "1" tempfile = "3" -wasmer = { version = "5.0.2", default-features = false } -wasmer-middlewares = { version = "5.0.2", optional = true } +wasmer = { workspace = true, default-features = false } +wasmer-middlewares = { workspace = true, optional = true } [dev-dependencies] env_logger = "0.8" diff --git a/test-crates/tests/src/test.rs b/test-crates/tests/src/test.rs index 64725d7c..c60e682e 100644 --- a/test-crates/tests/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -391,7 +391,7 @@ pub mod tests { match err { Err(runtime_error) => assert_eq!( WasmError { - file: "test-crates/wasm_core/src/wasm.rs".into(), + file: "test-crates/wasms/wasm_core/src/wasm.rs".into(), line: 102, error: WasmErrorInner::Guest("oh no!".into()), }, @@ -432,7 +432,7 @@ pub mod tests { Err(runtime_error) => { assert_eq!( WasmError { - file: "test-crates/wasm_core/src/wasm.rs".into(), + file: "test-crates/wasms/wasm_core/src/wasm.rs".into(), line: 130, error: WasmErrorInner::Guest("it fails!: ()".into()), }, diff --git a/test-crates/wasm_core/Cargo.toml b/test-crates/wasms/wasm_core/Cargo.toml similarity index 60% rename from test-crates/wasm_core/Cargo.toml rename to test-crates/wasms/wasm_core/Cargo.toml index 72d386d1..7dd39a6d 100644 --- a/test-crates/wasm_core/Cargo.toml +++ b/test-crates/wasms/wasm_core/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } -test_common = { path = "../common", default-features = false } -holochain_serialized_bytes = "=0.0.55" +holochain_wasmer_guest = { workspace = true } +test_common = { workspace = true, default-features = false } +holochain_serialized_bytes = { workspace = true } serde = "1" diff --git a/test-crates/wasm_core/src/wasm.rs b/test-crates/wasms/wasm_core/src/wasm.rs similarity index 100% rename from test-crates/wasm_core/src/wasm.rs rename to test-crates/wasms/wasm_core/src/wasm.rs diff --git a/test-crates/wasm_empty/Cargo.toml b/test-crates/wasms/wasm_empty/Cargo.toml similarity index 80% rename from test-crates/wasm_empty/Cargo.toml rename to test-crates/wasms/wasm_empty/Cargo.toml index ce730a94..5465bff9 100644 --- a/test-crates/wasm_empty/Cargo.toml +++ b/test-crates/wasms/wasm_empty/Cargo.toml @@ -10,4 +10,4 @@ crate-type = [ "cdylib", "rlib" ] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } +holochain_wasmer_guest = { workspace = true } diff --git a/test-crates/wasm_empty/src/wasm.rs b/test-crates/wasms/wasm_empty/src/wasm.rs similarity index 100% rename from test-crates/wasm_empty/src/wasm.rs rename to test-crates/wasms/wasm_empty/src/wasm.rs diff --git a/test-crates/wasm_io/Cargo.toml b/test-crates/wasms/wasm_io/Cargo.toml similarity index 61% rename from test-crates/wasm_io/Cargo.toml rename to test-crates/wasms/wasm_io/Cargo.toml index 1708631a..98140920 100644 --- a/test-crates/wasm_io/Cargo.toml +++ b/test-crates/wasms/wasm_io/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } -test_common = { path = "../common", default-features = false} -holochain_serialized_bytes = "=0.0.55" +holochain_wasmer_guest = { workspace = true } +test_common = { workspace = true, default-features = false} +holochain_serialized_bytes = { workspace = true } paste = "0.1" serde = "1" diff --git a/test-crates/wasm_io/src/wasm.rs b/test-crates/wasms/wasm_io/src/wasm.rs similarity index 100% rename from test-crates/wasm_io/src/wasm.rs rename to test-crates/wasms/wasm_io/src/wasm.rs diff --git a/test-crates/wasm_memory/Cargo.toml b/test-crates/wasms/wasm_memory/Cargo.toml similarity index 61% rename from test-crates/wasm_memory/Cargo.toml rename to test-crates/wasms/wasm_memory/Cargo.toml index 42ec7fda..3b905e4d 100644 --- a/test-crates/wasm_memory/Cargo.toml +++ b/test-crates/wasms/wasm_memory/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } -test_common = { path = "../common", default-features = false } -holochain_serialized_bytes = "=0.0.55" +holochain_wasmer_guest = { workspace = true } +test_common = { workspace = true, default-features = false } +holochain_serialized_bytes = { workspace = true } paste = "0.1" serde = "1" diff --git a/test-crates/wasm_memory/src/wasm.rs b/test-crates/wasms/wasm_memory/src/wasm.rs similarity index 100% rename from test-crates/wasm_memory/src/wasm.rs rename to test-crates/wasms/wasm_memory/src/wasm.rs From 83eec5ba0b34f985c758dbef569dc2d21a56d0c5 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 20 Dec 2024 10:05:51 -0700 Subject: [PATCH 18/21] Revert "chore: move example wasms into test-crates/wasms dir, use workspace for shared deps" This reverts commit 21d0d6a1648290cc502973a71d9e71e712fe38c7. --- Cargo.toml | 7 +------ crates/common/Cargo.toml | 2 +- crates/guest/Cargo.toml | 6 +++--- crates/host/Cargo.toml | 8 ++++---- test-crates/common/Cargo.toml | 2 +- test-crates/tests/Cargo.toml | 12 ++++++------ test-crates/tests/src/test.rs | 4 ++-- test-crates/{wasms => }/wasm_core/Cargo.toml | 6 +++--- test-crates/{wasms => }/wasm_core/src/wasm.rs | 0 test-crates/{wasms => }/wasm_empty/Cargo.toml | 2 +- test-crates/{wasms => }/wasm_empty/src/wasm.rs | 0 test-crates/{wasms => }/wasm_io/Cargo.toml | 6 +++--- test-crates/{wasms => }/wasm_io/src/wasm.rs | 0 test-crates/{wasms => }/wasm_memory/Cargo.toml | 6 +++--- test-crates/{wasms => }/wasm_memory/src/wasm.rs | 0 15 files changed, 28 insertions(+), 33 deletions(-) rename test-crates/{wasms => }/wasm_core/Cargo.toml (60%) rename test-crates/{wasms => }/wasm_core/src/wasm.rs (100%) rename test-crates/{wasms => }/wasm_empty/Cargo.toml (80%) rename test-crates/{wasms => }/wasm_empty/src/wasm.rs (100%) rename test-crates/{wasms => }/wasm_io/Cargo.toml (61%) rename test-crates/{wasms => }/wasm_io/src/wasm.rs (100%) rename test-crates/{wasms => }/wasm_memory/Cargo.toml (61%) rename test-crates/{wasms => }/wasm_memory/src/wasm.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 5a6f3265..bc8a6a45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,7 @@ [workspace] -members = ["crates/*", "test-crates/common", "test-crates/tests", "test-crates/wasms/*"] +members = ["crates/*", "test-crates/*"] default-members = ["crates/*"] resolver = "2" [profile.release.package.tests] debug = true - -[dependencies] -holochain_serialized_bytes = "=0.0.55" -wasmer = "5.0.2" -wasmer-middlewares = "5.0.2" \ No newline at end of file diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index e6282090..0e920a5f 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -7,7 +7,7 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -holochain_serialized_bytes = { workspace = true } +holochain_serialized_bytes = "=0.0.55" serde = "1" thiserror = "2" serde_bytes = "0.11" diff --git a/crates/guest/Cargo.toml b/crates/guest/Cargo.toml index 61d38f33..c1e78ec6 100644 --- a/crates/guest/Cargo.toml +++ b/crates/guest/Cargo.toml @@ -12,12 +12,12 @@ crate-type = ["cdylib", "rlib"] path = "src/guest.rs" [dependencies] -holochain_serialized_bytes = { workspace = true } -holochain_wasmer_common = { workspace = true } +holochain_serialized_bytes = "=0.0.55" +holochain_wasmer_common = { version = "=0.0.97", path = "../common" } serde = "1" tracing = "0.1" paste = "1.0" [dev-dependencies] -holochain_wasmer_common = { workspace = true, features = ["fuzzing"] } +holochain_wasmer_common = { version = "=0.0.97", path = "../common", features = ["fuzzing"] } test-fuzz = "6.0.0" diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index 939691a3..c3dd311f 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -7,11 +7,11 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -wasmer = { workspace = true, default-features = false } -wasmer-middlewares = { workspace = true, optional = true } +wasmer = { version = "5.0.2", default-features = false } +wasmer-middlewares = { version = "5.0.2", optional = true } -holochain_wasmer_common = { workspace = true } -holochain_serialized_bytes = { workspace = true } +holochain_wasmer_common = { version = "=0.0.97", path = "../common" } +holochain_serialized_bytes = "=0.0.55" serde = "1" tracing = "0.1" parking_lot = "0.12" diff --git a/test-crates/common/Cargo.toml b/test-crates/common/Cargo.toml index 8db14fe6..a382cbb3 100644 --- a/test-crates/common/Cargo.toml +++ b/test-crates/common/Cargo.toml @@ -10,6 +10,6 @@ crate-type = [ "cdylib", "rlib" ] path = "src/common.rs" [dependencies] -holochain_wasmer_common = { workspace = true } +holochain_wasmer_common = { path = "../../crates/common" } serde = "1" serde_bytes = "0.11" diff --git a/test-crates/tests/Cargo.toml b/test-crates/tests/Cargo.toml index 27a0d250..6bdcb878 100644 --- a/test-crates/tests/Cargo.toml +++ b/test-crates/tests/Cargo.toml @@ -5,11 +5,11 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -holochain_wasmer_common = { workspace = true } -holochain_wasmer_host = { workspace = true, default-features = false, features = ["error_as_host"] } -holochain_serialized_bytes = { workspace = true } +holochain_wasmer_common = { path = "../../crates/common" } +holochain_wasmer_host = { path = "../../crates/host", default-features = false, features = ["error_as_host"] } +holochain_serialized_bytes = "=0.0.55" serde = "1" -test_common = { workspace = true, default-features = false } +test_common = { path = "../common", default-features = false } criterion = { version = "0.5", features = ["html_reports"] } rand = "0.8" serde_bytes = "0.11" @@ -18,8 +18,8 @@ test-fuzz = "=6.0.0" once_cell = "1" tempfile = "3" -wasmer = { workspace = true, default-features = false } -wasmer-middlewares = { workspace = true, optional = true } +wasmer = { version = "5.0.2", default-features = false } +wasmer-middlewares = { version = "5.0.2", optional = true } [dev-dependencies] env_logger = "0.8" diff --git a/test-crates/tests/src/test.rs b/test-crates/tests/src/test.rs index c60e682e..64725d7c 100644 --- a/test-crates/tests/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -391,7 +391,7 @@ pub mod tests { match err { Err(runtime_error) => assert_eq!( WasmError { - file: "test-crates/wasms/wasm_core/src/wasm.rs".into(), + file: "test-crates/wasm_core/src/wasm.rs".into(), line: 102, error: WasmErrorInner::Guest("oh no!".into()), }, @@ -432,7 +432,7 @@ pub mod tests { Err(runtime_error) => { assert_eq!( WasmError { - file: "test-crates/wasms/wasm_core/src/wasm.rs".into(), + file: "test-crates/wasm_core/src/wasm.rs".into(), line: 130, error: WasmErrorInner::Guest("it fails!: ()".into()), }, diff --git a/test-crates/wasms/wasm_core/Cargo.toml b/test-crates/wasm_core/Cargo.toml similarity index 60% rename from test-crates/wasms/wasm_core/Cargo.toml rename to test-crates/wasm_core/Cargo.toml index 7dd39a6d..72d386d1 100644 --- a/test-crates/wasms/wasm_core/Cargo.toml +++ b/test-crates/wasm_core/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { workspace = true } -test_common = { workspace = true, default-features = false } -holochain_serialized_bytes = { workspace = true } +holochain_wasmer_guest = { path = "../../crates/guest" } +test_common = { path = "../common", default-features = false } +holochain_serialized_bytes = "=0.0.55" serde = "1" diff --git a/test-crates/wasms/wasm_core/src/wasm.rs b/test-crates/wasm_core/src/wasm.rs similarity index 100% rename from test-crates/wasms/wasm_core/src/wasm.rs rename to test-crates/wasm_core/src/wasm.rs diff --git a/test-crates/wasms/wasm_empty/Cargo.toml b/test-crates/wasm_empty/Cargo.toml similarity index 80% rename from test-crates/wasms/wasm_empty/Cargo.toml rename to test-crates/wasm_empty/Cargo.toml index 5465bff9..ce730a94 100644 --- a/test-crates/wasms/wasm_empty/Cargo.toml +++ b/test-crates/wasm_empty/Cargo.toml @@ -10,4 +10,4 @@ crate-type = [ "cdylib", "rlib" ] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { workspace = true } +holochain_wasmer_guest = { path = "../../crates/guest" } diff --git a/test-crates/wasms/wasm_empty/src/wasm.rs b/test-crates/wasm_empty/src/wasm.rs similarity index 100% rename from test-crates/wasms/wasm_empty/src/wasm.rs rename to test-crates/wasm_empty/src/wasm.rs diff --git a/test-crates/wasms/wasm_io/Cargo.toml b/test-crates/wasm_io/Cargo.toml similarity index 61% rename from test-crates/wasms/wasm_io/Cargo.toml rename to test-crates/wasm_io/Cargo.toml index 98140920..1708631a 100644 --- a/test-crates/wasms/wasm_io/Cargo.toml +++ b/test-crates/wasm_io/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { workspace = true } -test_common = { workspace = true, default-features = false} -holochain_serialized_bytes = { workspace = true } +holochain_wasmer_guest = { path = "../../crates/guest" } +test_common = { path = "../common", default-features = false} +holochain_serialized_bytes = "=0.0.55" paste = "0.1" serde = "1" diff --git a/test-crates/wasms/wasm_io/src/wasm.rs b/test-crates/wasm_io/src/wasm.rs similarity index 100% rename from test-crates/wasms/wasm_io/src/wasm.rs rename to test-crates/wasm_io/src/wasm.rs diff --git a/test-crates/wasms/wasm_memory/Cargo.toml b/test-crates/wasm_memory/Cargo.toml similarity index 61% rename from test-crates/wasms/wasm_memory/Cargo.toml rename to test-crates/wasm_memory/Cargo.toml index 3b905e4d..42ec7fda 100644 --- a/test-crates/wasms/wasm_memory/Cargo.toml +++ b/test-crates/wasm_memory/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { workspace = true } -test_common = { workspace = true, default-features = false } -holochain_serialized_bytes = { workspace = true } +holochain_wasmer_guest = { path = "../../crates/guest" } +test_common = { path = "../common", default-features = false } +holochain_serialized_bytes = "=0.0.55" paste = "0.1" serde = "1" diff --git a/test-crates/wasms/wasm_memory/src/wasm.rs b/test-crates/wasm_memory/src/wasm.rs similarity index 100% rename from test-crates/wasms/wasm_memory/src/wasm.rs rename to test-crates/wasm_memory/src/wasm.rs From d2d18c7445d14effa1131e27556e336d152765be Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 20 Dec 2024 10:11:49 -0700 Subject: [PATCH 19/21] chore: move example wasms into test-crates/wasms dir --- Cargo.toml | 2 +- test-crates/tests/src/test.rs | 4 ++-- test-crates/{ => wasms}/wasm_core/Cargo.toml | 4 ++-- test-crates/{ => wasms}/wasm_core/src/wasm.rs | 0 test-crates/{ => wasms}/wasm_empty/Cargo.toml | 2 +- test-crates/{ => wasms}/wasm_empty/src/wasm.rs | 0 test-crates/{ => wasms}/wasm_io/Cargo.toml | 4 ++-- test-crates/{ => wasms}/wasm_io/src/wasm.rs | 0 test-crates/{ => wasms}/wasm_memory/Cargo.toml | 4 ++-- test-crates/{ => wasms}/wasm_memory/src/wasm.rs | 0 10 files changed, 10 insertions(+), 10 deletions(-) rename test-crates/{ => wasms}/wasm_core/Cargo.toml (68%) rename test-crates/{ => wasms}/wasm_core/src/wasm.rs (100%) rename test-crates/{ => wasms}/wasm_empty/Cargo.toml (79%) rename test-crates/{ => wasms}/wasm_empty/src/wasm.rs (100%) rename test-crates/{ => wasms}/wasm_io/Cargo.toml (69%) rename test-crates/{ => wasms}/wasm_io/src/wasm.rs (100%) rename test-crates/{ => wasms}/wasm_memory/Cargo.toml (70%) rename test-crates/{ => wasms}/wasm_memory/src/wasm.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index bc8a6a45..f46f59ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["crates/*", "test-crates/*"] +members = ["crates/*", "test-crates/tests", "test-crates/common", "test-crates/wasms/*"] default-members = ["crates/*"] resolver = "2" diff --git a/test-crates/tests/src/test.rs b/test-crates/tests/src/test.rs index 64725d7c..c60e682e 100644 --- a/test-crates/tests/src/test.rs +++ b/test-crates/tests/src/test.rs @@ -391,7 +391,7 @@ pub mod tests { match err { Err(runtime_error) => assert_eq!( WasmError { - file: "test-crates/wasm_core/src/wasm.rs".into(), + file: "test-crates/wasms/wasm_core/src/wasm.rs".into(), line: 102, error: WasmErrorInner::Guest("oh no!".into()), }, @@ -432,7 +432,7 @@ pub mod tests { Err(runtime_error) => { assert_eq!( WasmError { - file: "test-crates/wasm_core/src/wasm.rs".into(), + file: "test-crates/wasms/wasm_core/src/wasm.rs".into(), line: 130, error: WasmErrorInner::Guest("it fails!: ()".into()), }, diff --git a/test-crates/wasm_core/Cargo.toml b/test-crates/wasms/wasm_core/Cargo.toml similarity index 68% rename from test-crates/wasm_core/Cargo.toml rename to test-crates/wasms/wasm_core/Cargo.toml index 72d386d1..258b911c 100644 --- a/test-crates/wasm_core/Cargo.toml +++ b/test-crates/wasms/wasm_core/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } -test_common = { path = "../common", default-features = false } +holochain_wasmer_guest = { path = "../../../crates/guest" } +test_common = { path = "../../common", default-features = false } holochain_serialized_bytes = "=0.0.55" serde = "1" diff --git a/test-crates/wasm_core/src/wasm.rs b/test-crates/wasms/wasm_core/src/wasm.rs similarity index 100% rename from test-crates/wasm_core/src/wasm.rs rename to test-crates/wasms/wasm_core/src/wasm.rs diff --git a/test-crates/wasm_empty/Cargo.toml b/test-crates/wasms/wasm_empty/Cargo.toml similarity index 79% rename from test-crates/wasm_empty/Cargo.toml rename to test-crates/wasms/wasm_empty/Cargo.toml index ce730a94..a8616f78 100644 --- a/test-crates/wasm_empty/Cargo.toml +++ b/test-crates/wasms/wasm_empty/Cargo.toml @@ -10,4 +10,4 @@ crate-type = [ "cdylib", "rlib" ] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } +holochain_wasmer_guest = { path = "../../../crates/guest" } diff --git a/test-crates/wasm_empty/src/wasm.rs b/test-crates/wasms/wasm_empty/src/wasm.rs similarity index 100% rename from test-crates/wasm_empty/src/wasm.rs rename to test-crates/wasms/wasm_empty/src/wasm.rs diff --git a/test-crates/wasm_io/Cargo.toml b/test-crates/wasms/wasm_io/Cargo.toml similarity index 69% rename from test-crates/wasm_io/Cargo.toml rename to test-crates/wasms/wasm_io/Cargo.toml index 1708631a..4762c7e5 100644 --- a/test-crates/wasm_io/Cargo.toml +++ b/test-crates/wasms/wasm_io/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } -test_common = { path = "../common", default-features = false} +holochain_wasmer_guest = { path = "../../../crates/guest" } +test_common = { path = "../../common", default-features = false} holochain_serialized_bytes = "=0.0.55" paste = "0.1" serde = "1" diff --git a/test-crates/wasm_io/src/wasm.rs b/test-crates/wasms/wasm_io/src/wasm.rs similarity index 100% rename from test-crates/wasm_io/src/wasm.rs rename to test-crates/wasms/wasm_io/src/wasm.rs diff --git a/test-crates/wasm_memory/Cargo.toml b/test-crates/wasms/wasm_memory/Cargo.toml similarity index 70% rename from test-crates/wasm_memory/Cargo.toml rename to test-crates/wasms/wasm_memory/Cargo.toml index 42ec7fda..5b7679b5 100644 --- a/test-crates/wasm_memory/Cargo.toml +++ b/test-crates/wasms/wasm_memory/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"] path = "src/wasm.rs" [dependencies] -holochain_wasmer_guest = { path = "../../crates/guest" } -test_common = { path = "../common", default-features = false } +holochain_wasmer_guest = { path = "../../../crates/guest" } +test_common = { path = "../../common", default-features = false } holochain_serialized_bytes = "=0.0.55" paste = "0.1" serde = "1" diff --git a/test-crates/wasm_memory/src/wasm.rs b/test-crates/wasms/wasm_memory/src/wasm.rs similarity index 100% rename from test-crates/wasm_memory/src/wasm.rs rename to test-crates/wasms/wasm_memory/src/wasm.rs From abcdab45a059e85cba57e7bdd47454fbe1f9fd51 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 20 Dec 2024 10:34:45 -0700 Subject: [PATCH 20/21] chore: move tests of default behavior of 'wasm_error!()' into common crate where it is defined --- crates/common/src/result.rs | 44 +++++++++++++++++++++++++++++++++ crates/host/src/guest.rs | 23 ----------------- scripts/test-wasmer_sys_dev.sh | 3 +++ scripts/test-wasmer_sys_prod.sh | 3 +++ scripts/test-wasmer_wamr.sh | 3 +++ 5 files changed, 53 insertions(+), 23 deletions(-) diff --git a/crates/common/src/result.rs b/crates/common/src/result.rs index 69e34f8f..5279f9ed 100644 --- a/crates/common/src/result.rs +++ b/crates/common/src/result.rs @@ -189,3 +189,47 @@ impl From<&str> for WasmErrorInner { s.to_string().into() } } + + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + #[cfg(not(feature = "error_as_host"))] + fn wasm_error_macro_guest() { + assert_eq!( + wasm_error!("foo").error, + WasmErrorInner::Guest("foo".into()), + ); + + assert_eq!( + wasm_error!("{} {}", "foo", "bar").error, + WasmErrorInner::Guest("foo bar".into()) + ); + + assert_eq!( + wasm_error!(WasmErrorInner::Host("foo".into())).error, + WasmErrorInner::Host("foo".into()), + ); + } + + #[test] + #[cfg(feature = "error_as_host")] + fn wasm_error_macro_host() { + assert_eq!( + wasm_error!("foo").error, + WasmErrorInner::Host("foo".into()), + ); + + assert_eq!( + wasm_error!("{} {}", "foo", "bar").error, + WasmErrorInner::Host("foo bar".into()) + ); + + assert_eq!( + wasm_error!(WasmErrorInner::Guest("foo".into())).error, + WasmErrorInner::Guest("foo".into()), + ); + } +} diff --git a/crates/host/src/guest.rs b/crates/host/src/guest.rs index 5279a236..57228728 100644 --- a/crates/host/src/guest.rs +++ b/crates/host/src/guest.rs @@ -261,26 +261,3 @@ where return_value.map_err(|e| WasmHostError(e).into()) } - -#[cfg(test)] -pub mod tests { - use super::*; - - #[test] - fn wasm_error_macro_host() { - assert_eq!( - wasm_error!("foo").0.error, - WasmErrorInner::Host("foo".into()), - ); - - assert_eq!( - wasm_error!("{} {}", "foo", "bar").0.error, - WasmErrorInner::Host("foo bar".into()) - ); - - assert_eq!( - wasm_error!(WasmErrorInner::Host("foo".into())).0.error, - WasmErrorInner::Host("foo".into()), - ); - } -} diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index d0a2969a..fbe1c755 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -13,6 +13,9 @@ cargo clippy -- --deny warnings cargo build --release -p test_wasm_core --target wasm32-unknown-unknown # tests the root workspace +cargo test --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture + +# tests the root workspace, error_as_host cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_sys_dev diff --git a/scripts/test-wasmer_sys_prod.sh b/scripts/test-wasmer_sys_prod.sh index 9c68fad5..54ae3d69 100755 --- a/scripts/test-wasmer_sys_prod.sh +++ b/scripts/test-wasmer_sys_prod.sh @@ -5,6 +5,9 @@ export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 # tests the root workspace +cargo test --no-default-features --features wasmer_sys_prod ${1-} -- --nocapture + +# tests the root workspace, error_as_host cargo test --no-default-features --features error_as_host,wasmer_sys_prod ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_sys_prod diff --git a/scripts/test-wasmer_wamr.sh b/scripts/test-wasmer_wamr.sh index d52c8660..8c713bb0 100755 --- a/scripts/test-wasmer_wamr.sh +++ b/scripts/test-wasmer_wamr.sh @@ -6,6 +6,9 @@ export WASMER_BACKTRACE=1 # tests the root workspace +cargo test --no-default-features --features wasmer_wamr ${1-} -- --nocapture + +# tests the root workspace, error_as_host cargo test --no-default-features --features error_as_host,wasmer_wamr ${1-} -- --nocapture # build wasm and run the "full" tests for wasmer_wamr From 40088c01a724575c7723fb47dcc0a806243ac41a Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 20 Dec 2024 10:41:26 -0700 Subject: [PATCH 21/21] chore: fmt + clippy --- crates/common/src/result.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/common/src/result.rs b/crates/common/src/result.rs index 5279f9ed..91c381a0 100644 --- a/crates/common/src/result.rs +++ b/crates/common/src/result.rs @@ -190,7 +190,6 @@ impl From<&str> for WasmErrorInner { } } - #[cfg(test)] mod tests { use super::*; @@ -217,10 +216,7 @@ mod tests { #[test] #[cfg(feature = "error_as_host")] fn wasm_error_macro_host() { - assert_eq!( - wasm_error!("foo").error, - WasmErrorInner::Host("foo".into()), - ); + assert_eq!(wasm_error!("foo").error, WasmErrorInner::Host("foo".into()),); assert_eq!( wasm_error!("{} {}", "foo", "bar").error,