From 0982d48f6607ce80adb330b5c2677df44d4e7750 Mon Sep 17 00:00:00 2001 From: kajacx Date: Mon, 22 May 2023 20:48:12 +0200 Subject: [PATCH 01/10] Use wasmer cloned from source --- Cargo.lock | 976 +++++++++++++++++++++-------------- crates/gen-wasmer/Cargo.toml | 10 +- 2 files changed, 582 insertions(+), 404 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab4a9ef0..388d9dbf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,6 +58,12 @@ version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + [[package]] name = "async-trait" version = "0.1.56" @@ -94,19 +100,13 @@ checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" version = "0.13.0" @@ -128,6 +128,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -154,19 +166,20 @@ checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "bytecheck" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ "bytecheck_derive", "ptr_meta", + "simdutf8", ] [[package]] name = "bytecheck_derive" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ "proc-macro2", "quote", @@ -260,12 +273,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -326,12 +333,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "corosensei" version = "0.1.3" @@ -339,10 +340,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", - "windows-sys", + "windows-sys 0.33.0", ] [[package]] @@ -351,7 +352,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -381,6 +382,15 @@ dependencies = [ "cranelift-entity 0.86.1", ] +[[package]] +name = "cranelift-bforest" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" +dependencies = [ + "cranelift-entity 0.91.1", +] + [[package]] name = "cranelift-codegen" version = "0.85.0" @@ -417,6 +427,27 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-codegen" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" +dependencies = [ + "arrayvec", + "bumpalo", + "cranelift-bforest 0.91.1", + "cranelift-codegen-meta 0.91.1", + "cranelift-codegen-shared 0.91.1", + "cranelift-egraph", + "cranelift-entity 0.91.1", + "cranelift-isle 0.91.1", + "gimli", + "log", + "regalloc2 0.5.1", + "smallvec", + "target-lexicon", +] + [[package]] name = "cranelift-codegen-meta" version = "0.85.0" @@ -435,6 +466,15 @@ dependencies = [ "cranelift-codegen-shared 0.86.1", ] +[[package]] +name = "cranelift-codegen-meta" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" +dependencies = [ + "cranelift-codegen-shared 0.91.1", +] + [[package]] name = "cranelift-codegen-shared" version = "0.85.0" @@ -447,6 +487,26 @@ version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866" +[[package]] +name = "cranelift-codegen-shared" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" + +[[package]] +name = "cranelift-egraph" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" +dependencies = [ + "cranelift-entity 0.91.1", + "fxhash", + "hashbrown 0.12.3", + "indexmap", + "log", + "smallvec", +] + [[package]] name = "cranelift-entity" version = "0.85.0" @@ -462,6 +522,12 @@ version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e" +[[package]] +name = "cranelift-entity" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" + [[package]] name = "cranelift-frontend" version = "0.85.0" @@ -486,6 +552,18 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-frontend" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" +dependencies = [ + "cranelift-codegen 0.91.1", + "log", + "smallvec", + "target-lexicon", +] + [[package]] name = "cranelift-isle" version = "0.85.0" @@ -498,6 +576,12 @@ version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad" +[[package]] +name = "cranelift-isle" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" + [[package]] name = "cranelift-native" version = "0.85.0" @@ -531,7 +615,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -540,7 +624,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -550,7 +634,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -562,9 +646,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.6.5", "once_cell", "scopeguard", ] @@ -575,7 +659,7 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -623,6 +707,19 @@ dependencies = [ "syn", ] +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if", + "hashbrown 0.12.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "derivative" version = "2.2.0" @@ -655,7 +752,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -665,7 +762,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -680,12 +777,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "either" version = "1.6.1" @@ -790,7 +881,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "winapi", @@ -802,6 +893,15 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + [[package]] name = "fs-set-times" version = "0.15.0" @@ -813,6 +913,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures-core" version = "0.3.21" @@ -859,15 +965,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "generational-arena" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601" -dependencies = [ - "cfg-if 0.1.10", -] - [[package]] name = "generic-array" version = "0.14.5" @@ -884,7 +981,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -930,9 +1027,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash", ] @@ -988,6 +1085,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "ignore" version = "0.4.18" @@ -1013,7 +1120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.1", + "hashbrown 0.12.3", "serde", ] @@ -1121,13 +1228,23 @@ version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1178,6 +1295,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "miniz_oxide" version = "0.5.3" @@ -1242,12 +1368,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + [[package]] name = "paste" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1312,12 +1457,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.40" @@ -1376,6 +1515,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.8.5" @@ -1474,6 +1619,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.5.6" @@ -1517,33 +1674,36 @@ dependencies = [ [[package]] name = "rend" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" dependencies = [ "bytecheck", ] [[package]] name = "rkyv" -version = "0.7.39" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ + "bitvec", "bytecheck", - "hashbrown 0.12.1", + "hashbrown 0.12.3", "indexmap", "ptr_meta", "rend", "rkyv_derive", "seahash", + "tinyvec", + "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.39" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" dependencies = [ "proc-macro2", "quote", @@ -1556,15 +1716,6 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.33.7" @@ -1608,21 +1759,6 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.137" @@ -1665,21 +1801,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" @@ -1687,7 +1808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", "opaque-debug", @@ -1702,6 +1823,12 @@ dependencies = [ "dirs-next", ] +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "slab" version = "0.4.6" @@ -1726,64 +1853,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.8.0" @@ -1847,6 +1916,12 @@ dependencies = [ "winx", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "target-lexicon" version = "0.12.4" @@ -1873,15 +1948,15 @@ dependencies = [ "proc-macro2", "quote", "wai-bindgen-gen-c", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-rust-wasm", "wai-bindgen-gen-spidermonkey", - "wai-bindgen-gen-wasmer", + "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", - "wai-parser", + "wai-parser 0.2.3", ] [[package]] @@ -1936,44 +2011,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2004,7 +2041,7 @@ version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -2046,6 +2083,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" version = "1.0.1" @@ -2080,8 +2123,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] -name = "vec_map" -version = "0.8.2" +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" + +[[package]] +name = "vec_map" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" @@ -2098,12 +2158,12 @@ dependencies = [ "anyhow", "structopt", "wai-bindgen-gen-c", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", "wai-bindgen-gen-rust-wasm", "wai-bindgen-gen-spidermonkey", - "wai-bindgen-gen-wasmer", + "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", @@ -2114,12 +2174,12 @@ name = "wai-bindgen-demo" version = "0.0.0" dependencies = [ "wai-bindgen-gen-c", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", "wai-bindgen-gen-rust-wasm", "wai-bindgen-gen-spidermonkey", - "wai-bindgen-gen-wasmer", + "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", @@ -2134,7 +2194,7 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", ] [[package]] @@ -2142,7 +2202,17 @@ name = "wai-bindgen-gen-core" version = "0.2.3" dependencies = [ "anyhow", - "wai-parser", + "wai-parser 0.2.3", +] + +[[package]] +name = "wai-bindgen-gen-core" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aa3dc41b510811122b3088197234c27e08fcad63ef936306dd8e11e2803876c" +dependencies = [ + "anyhow", + "wai-parser 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2152,7 +2222,7 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", ] [[package]] @@ -2162,7 +2232,7 @@ dependencies = [ "heck 0.3.3", "pulldown-cmark", "structopt", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", ] [[package]] @@ -2170,7 +2240,17 @@ name = "wai-bindgen-gen-rust" version = "0.2.3" dependencies = [ "heck 0.3.3", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", +] + +[[package]] +name = "wai-bindgen-gen-rust" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc05e8380515c4337c40ef03b2ff233e391315b178a320de8640703d522efe" +dependencies = [ + "heck 0.3.3", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2180,8 +2260,8 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", - "wai-bindgen-gen-rust", + "wai-bindgen-gen-core 0.2.3", + "wai-bindgen-gen-rust 0.2.3", "wai-bindgen-rust", ] @@ -2193,7 +2273,7 @@ dependencies = [ "lazy_static", "structopt", "test-helpers", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", "wasm-encoder 0.8.0", "wasmparser 0.80.2", ] @@ -2206,11 +2286,21 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", - "wai-bindgen-gen-rust", - "wai-bindgen-wasmer", - "wasmer", - "wasmer-wasi", + "wai-bindgen-gen-core 0.2.3", + "wai-bindgen-gen-rust 0.2.3", + "wai-bindgen-wasmer 0.4.0", + "wasmer 3.3.0", +] + +[[package]] +name = "wai-bindgen-gen-wasmer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f61484185d8c520a86d5a7f7f8265f446617c2f9774b2e20a52de19b6e53432" +dependencies = [ + "heck 0.3.3", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2220,7 +2310,7 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", ] [[package]] @@ -2231,8 +2321,8 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", - "wai-bindgen-gen-rust", + "wai-bindgen-gen-core 0.2.3", + "wai-bindgen-gen-rust 0.2.3", "wai-bindgen-wasmtime", "wasmtime", "wasmtime-wasi", @@ -2245,7 +2335,7 @@ dependencies = [ "heck 0.3.3", "structopt", "test-helpers", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", ] [[package]] @@ -2263,7 +2353,7 @@ version = "0.2.3" dependencies = [ "proc-macro2", "syn", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-rust-wasm", ] @@ -2277,8 +2367,21 @@ dependencies = [ "once_cell", "thiserror", "tracing", - "wai-bindgen-wasmer-impl", - "wasmer", + "wai-bindgen-wasmer-impl 0.2.3", + "wasmer 3.1.1", +] + +[[package]] +name = "wai-bindgen-wasmer" +version = "0.4.0" +dependencies = [ + "anyhow", + "bitflags", + "once_cell", + "thiserror", + "tracing", + "wai-bindgen-wasmer-impl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer 3.3.0", ] [[package]] @@ -2287,8 +2390,20 @@ version = "0.2.3" dependencies = [ "proc-macro2", "syn", - "wai-bindgen-gen-core", - "wai-bindgen-gen-wasmer", + "wai-bindgen-gen-core 0.2.3", + "wai-bindgen-gen-wasmer 0.2.3", +] + +[[package]] +name = "wai-bindgen-wasmer-impl" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b3488ed88d4dd0e3bf85bad4e27dac6cb31aae5d122a5dda2424803c8dc863a" +dependencies = [ + "proc-macro2", + "syn", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-wasmer 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2310,7 +2425,7 @@ version = "0.2.3" dependencies = [ "proc-macro2", "syn", - "wai-bindgen-gen-core", + "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-wasmtime", ] @@ -2325,7 +2440,7 @@ dependencies = [ "indexmap", "log", "pretty_assertions", - "wai-parser", + "wai-parser 0.2.3", "wasm-encoder 0.13.0", "wasmparser 0.86.0", "wasmprinter", @@ -2347,6 +2462,19 @@ dependencies = [ "wast 33.0.0", ] +[[package]] +name = "wai-parser" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd0acb6d70885ea0c343749019ba74f015f64a9d30542e66db69b49b7e28186" +dependencies = [ + "anyhow", + "id-arena", + "pulldown-cmark", + "unicode-normalization", + "unicode-xid", +] + [[package]] name = "walkdir" version = "2.3.2" @@ -2412,7 +2540,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2508,7 +2636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "840af6d21701220cb805dc7201af301cb99e9b4f646f48a41befbc1d949f0f90" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "indexmap", "js-sys", "more-asserts", @@ -2518,16 +2646,42 @@ dependencies = [ "thiserror", "wasm-bindgen", "wasm-bindgen-downcast", - "wasmer-compiler", - "wasmer-compiler-cranelift", - "wasmer-derive", - "wasmer-types", - "wasmer-vm", + "wasmer-compiler 3.1.1", + "wasmer-compiler-cranelift 3.1.1", + "wasmer-derive 3.1.1", + "wasmer-types 3.1.1", + "wasmer-vm 3.1.1", "wasmparser 0.83.0", "wat", "winapi", ] +[[package]] +name = "wasmer" +version = "3.3.0" +dependencies = [ + "bytes", + "cfg-if", + "derivative", + "indexmap", + "js-sys", + "more-asserts", + "rustc-demangle", + "serde", + "serde-wasm-bindgen", + "target-lexicon", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-downcast", + "wasmer-compiler 3.3.0", + "wasmer-compiler-cranelift 3.3.0", + "wasmer-derive 3.3.0", + "wasmer-types 3.3.0", + "wasmer-vm 3.3.0", + "wat", + "winapi", +] + [[package]] name = "wasmer-compiler" version = "3.1.1" @@ -2535,7 +2689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b86fab98beaaace77380cb04e681773739473860d1b8499ea6b14f920923e0c5" dependencies = [ "backtrace", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2546,12 +2700,33 @@ dependencies = [ "rustc-demangle", "smallvec", "thiserror", - "wasmer-types", - "wasmer-vm", + "wasmer-types 3.1.1", + "wasmer-vm 3.1.1", "wasmparser 0.83.0", "winapi", ] +[[package]] +name = "wasmer-compiler" +version = "3.3.0" +dependencies = [ + "backtrace", + "cfg-if", + "enum-iterator", + "enumset", + "lazy_static", + "leb128", + "memmap2", + "more-asserts", + "region 3.0.0", + "smallvec", + "thiserror", + "wasmer-types 3.3.0", + "wasmer-vm 3.3.0", + "wasmparser 0.95.0", + "winapi", +] + [[package]] name = "wasmer-compiler-cranelift" version = "3.1.1" @@ -2567,8 +2742,25 @@ dependencies = [ "smallvec", "target-lexicon", "tracing", - "wasmer-compiler", - "wasmer-types", + "wasmer-compiler 3.1.1", + "wasmer-types 3.1.1", +] + +[[package]] +name = "wasmer-compiler-cranelift" +version = "3.3.0" +dependencies = [ + "cranelift-codegen 0.91.1", + "cranelift-entity 0.91.1", + "cranelift-frontend 0.91.1", + "gimli", + "more-asserts", + "rayon", + "smallvec", + "target-lexicon", + "tracing", + "wasmer-compiler 3.3.0", + "wasmer-types 3.3.0", ] [[package]] @@ -2583,6 +2775,16 @@ dependencies = [ "syn", ] +[[package]] +name = "wasmer-derive" +version = "3.3.0" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "wasmer-types" version = "3.1.1" @@ -2599,24 +2801,17 @@ dependencies = [ ] [[package]] -name = "wasmer-vbus" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b42f76b9f09c68084de3a35fdf4907609f4b5005ecf3767fa1839a669dcbdb" +name = "wasmer-types" +version = "3.3.0" dependencies = [ + "bytecheck", + "enum-iterator", + "enumset", + "indexmap", + "more-asserts", + "rkyv", + "target-lexicon", "thiserror", - "wasmer-vfs", -] - -[[package]] -name = "wasmer-vfs" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34bfbd243503d64aed4fc8a194657a561cae6c2d782dbcf649211d7f4db9e413" -dependencies = [ - "libc", - "thiserror", - "tracing", ] [[package]] @@ -2627,153 +2822,47 @@ checksum = "9fc68a7f0a003e6cb63845b7510065097d289553201d64afb9a5e1744da3c6a0" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "enum-iterator", "indexmap", "lazy_static", "libc", "mach", - "memoffset", + "memoffset 0.6.5", "more-asserts", "region 3.0.0", "scopeguard", "thiserror", - "wasmer-types", + "wasmer-types 3.1.1", "winapi", ] [[package]] -name = "wasmer-vnet" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc4fe3b48ccc620901bdcdfac98d8a76ef3487412c221752814750c2e7db4c1" -dependencies = [ - "bytes", - "thiserror", - "wasmer-vfs", -] - -[[package]] -name = "wasmer-wasi" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e893ecd57c63db83b17dacfaee90f660e1d7f5b26d2f9d88ea6aa2e8c4bc301d" +name = "wasmer-vm" +version = "3.3.0" dependencies = [ - "bytes", - "cfg-if 1.0.0", + "backtrace", + "cc", + "cfg-if", + "corosensei", + "dashmap", "derivative", - "generational-arena", - "getrandom", + "enum-iterator", + "fnv", + "indexmap", + "lazy_static", "libc", + "mach", + "memoffset 0.8.0", + "more-asserts", + "region 3.0.0", + "scopeguard", "thiserror", - "tracing", - "wasm-bindgen", - "wasmer", - "wasmer-vbus", - "wasmer-vfs", - "wasmer-vnet", - "wasmer-wasi-local-networking", - "wasmer-wasi-types", + "wasmer-types 3.3.0", "winapi", ] -[[package]] -name = "wasmer-wasi-local-networking" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd65882d8cee793848776f26e979b7ff3e139d927947d87304c940c89527a730" -dependencies = [ - "bytes", - "tracing", - "wasmer-vfs", - "wasmer-vnet", -] - -[[package]] -name = "wasmer-wasi-types" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1afdec83c62d22bf7110b83d662a08f708332fd728a213399919a045a1061d4" -dependencies = [ - "byteorder", - "time", - "wasmer", - "wasmer-derive", - "wasmer-types", - "wasmer-wit-bindgen-gen-core", - "wasmer-wit-bindgen-gen-rust-wasm", - "wasmer-wit-bindgen-rust", - "wasmer-wit-parser", -] - -[[package]] -name = "wasmer-wit-bindgen-gen-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8aa5be5ae5d61f5e151dc2c0e603093fe28395d2083b65ef7a3547844054fe" -dependencies = [ - "anyhow", - "wasmer-wit-parser", -] - -[[package]] -name = "wasmer-wit-bindgen-gen-rust" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "438bce7c4589842bf100cc9b312443a9b5fc6440e58ab0b8c114e460219c3c3b" -dependencies = [ - "heck 0.3.3", - "wasmer-wit-bindgen-gen-core", -] - -[[package]] -name = "wasmer-wit-bindgen-gen-rust-wasm" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505f5168cfee591840e13e158a5c5e2f95d6df1df710839021564f36bee7bafc" -dependencies = [ - "heck 0.3.3", - "wasmer-wit-bindgen-gen-core", - "wasmer-wit-bindgen-gen-rust", -] - -[[package]] -name = "wasmer-wit-bindgen-rust" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968747f1271f74aab9b70d9c5d4921db9bd13b4ec3ba5506506e6e7dc58c918c" -dependencies = [ - "async-trait", - "bitflags", - "wasmer-wit-bindgen-rust-impl", -] - -[[package]] -name = "wasmer-wit-bindgen-rust-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd26fe00d08bd2119870b017d13413dfbd51e7750b6634d649fc7a7bbc057b85" -dependencies = [ - "proc-macro2", - "syn", - "wasmer-wit-bindgen-gen-core", - "wasmer-wit-bindgen-gen-rust-wasm", -] - -[[package]] -name = "wasmer-wit-parser" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46c9a15086be8a2eb3790613902b9d3a9a687833b17cd021de263a20378585a" -dependencies = [ - "anyhow", - "id-arena", - "pulldown-cmark", - "unicode-normalization", - "unicode-xid", -] - [[package]] name = "wasmparser" version = "0.80.2" @@ -2804,6 +2893,16 @@ dependencies = [ "indexmap", ] +[[package]] +name = "wasmparser" +version = "0.95.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +dependencies = [ + "indexmap", + "url", +] + [[package]] name = "wasmprinter" version = "0.2.36" @@ -2824,7 +2923,7 @@ dependencies = [ "async-trait", "backtrace", "bincode", - "cfg-if 1.0.0", + "cfg-if", "indexmap", "lazy_static", "libc", @@ -2930,7 +3029,7 @@ dependencies = [ "addr2line", "anyhow", "bincode", - "cfg-if 1.0.0", + "cfg-if", "cpp_demangle", "gimli", "ittapi-rs", @@ -2968,13 +3067,13 @@ dependencies = [ "anyhow", "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "indexmap", "libc", "log", "mach", "memfd", - "memoffset", + "memoffset 0.6.5", "more-asserts", "rand", "region 2.2.0", @@ -3129,43 +3228,109 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.33.0", + "windows_i686_gnu 0.33.0", + "windows_i686_msvc 0.33.0", + "windows_x86_64_gnu 0.33.0", + "windows_x86_64_msvc 0.33.0", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_i686_gnu" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_msvc" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "winx" version = "0.31.0" @@ -3189,6 +3354,15 @@ dependencies = [ "wast 35.0.2", ] +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/crates/gen-wasmer/Cargo.toml b/crates/gen-wasmer/Cargo.toml index bb6f718c..8f70b8b3 100644 --- a/crates/gen-wasmer/Cargo.toml +++ b/crates/gen-wasmer/Cargo.toml @@ -25,6 +25,10 @@ anyhow = "1.0" test-helpers = { path = "../test-helpers", features = [ "wai-bindgen-gen-wasmer", ] } -wai-bindgen-wasmer = { path = "../wasmer", features = ["tracing"] } -wasmer = "3.0" -wasmer-wasi = "3.0" +# wai-bindgen-wasmer = { path = "../wasmer", features = ["tracing"] } +# wasmer = "3.0" +# wasmer-wasi = "3.0" + +# Use wasmer from source for testing. REMOVE BEFORE MAKING A PULL REQUEST!!! +wai-bindgen-wasmer = { path = "../../../wasmer/lib/wai-bindgen-wasmer", features = ["tracing"] } +wasmer = { path = "../../../wasmer/lib/api" } From f9f1126ff45cd72fb774df69f8fc3df2c2af7ab5 Mon Sep 17 00:00:00 2001 From: kajacx Date: Mon, 22 May 2023 21:09:26 +0200 Subject: [PATCH 02/10] Add generated code to a separate crate for easier testing --- Cargo.lock | 13 +++ crates/gen-wasmer/src/lib.rs | 169 +++++++++++++++++++++++++++++++++++ crates/test/Cargo.toml | 27 ++++++ crates/test/src/lib.rs | 169 +++++++++++++++++++++++++++++++++++ 4 files changed, 378 insertions(+) create mode 100644 crates/test/Cargo.toml create mode 100644 crates/test/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 388d9dbf..8289be19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2313,6 +2313,19 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", ] +[[package]] +name = "wai-bindgen-gen-wasmer-test" +version = "0.2.3" +dependencies = [ + "anyhow", + "heck 0.3.3", + "structopt", + "wai-bindgen-gen-core 0.2.3", + "wai-bindgen-gen-rust 0.2.3", + "wai-bindgen-wasmer 0.4.0", + "wasmer 3.3.0", +] + [[package]] name = "wai-bindgen-gen-wasmtime" version = "0.2.3" diff --git a/crates/gen-wasmer/src/lib.rs b/crates/gen-wasmer/src/lib.rs index 5015a718..f8a419e1 100644 --- a/crates/gen-wasmer/src/lib.rs +++ b/crates/gen-wasmer/src/lib.rs @@ -2374,3 +2374,172 @@ fn sorted_iter(map: &HashMap) -> impl Iterator list.sort_by_key(|p| p.0); list.into_iter() } + + +#[cfg(test)] +pub mod simple_lists { + #[allow(unused_imports)] + use wai_bindgen_wasmer::{anyhow, wasmer}; + pub trait SimpleLists: Sized + Send + Sync + 'static{ + fn simple_list1(&mut self,l: &[Le],) -> (); + + fn simple_list2(&mut self,) -> Vec; + + fn simple_list4(&mut self,l: Vec<&[Le]>,) -> Vec>; + + } + pub struct LazyInitialized { + memory: wasmer::Memory, + func_canonical_abi_realloc: wasmer::TypedFunction<(i32, i32, i32, i32), i32>, + } + + #[must_use = "The returned initializer function must be called + with the instance and the store before starting the runtime"] + pub fn add_to_imports(store: &mut wasmer::Store, imports: &mut wasmer::Imports, data: T) + -> impl FnOnce(&wasmer::Instance, &dyn wasmer::AsStoreRef) -> Result<(), anyhow::Error> + where T: SimpleLists + { + #[derive(Clone)]struct EnvWrapper { + data: T, + lazy: std::rc::Rc>, + } + unsafe impl Send for EnvWrapper {} + unsafe impl Sync for EnvWrapper {} + let lazy = std::rc::Rc::new(OnceCell::new()); + let env = EnvWrapper { + data, + lazy: std::rc::Rc::clone(&lazy), + }; + let env = wasmer::FunctionEnv::new(&mut *store, env); + let mut exports = wasmer::Exports::new(); + let mut store = store.as_store_mut(); + exports.insert( + "simple-list1", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32| -> Result<(), wasmer::RuntimeError> { + let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let _memory_view = _memory.view(&store); + let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { + _memory_view.data_unchecked_mut() + }); + let data_mut = store.data_mut(); + let ptr0 = arg0; + let len0 = arg1; + let param0 = _bc.slice(ptr0, len0)?; + let host = &mut data_mut.data; + let result = host.simple_list1(param0, ); + let () = result; + Ok(()) + } + )); + exports.insert( + "simple-list2", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move |mut store: wasmer::FunctionEnvMut>,arg0:i32| -> Result<(), wasmer::RuntimeError> { + let func_canonical_abi_realloc = store + .data() + .lazy + .get() + .unwrap() + .func_canonical_abi_realloc + .clone(); + let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let data_mut = store.data_mut(); + let host = &mut data_mut.data; + let result = host.simple_list2(); + let vec0 = result; + let ptr0 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec0.len() as i32) * 4)?; + let _memory_view = _memory.view(&store); + let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; + caller_memory.store_many(ptr0, &vec0)?; + caller_memory.store(arg0 + 4, wai_bindgen_wasmer::rt::as_i32(vec0.len() as i32))?; + caller_memory.store(arg0 + 0, wai_bindgen_wasmer::rt::as_i32(ptr0))?; + Ok(()) + } + )); + exports.insert( + "simple-list4", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32,arg2:i32| -> Result<(), wasmer::RuntimeError> { + let func_canonical_abi_realloc = store + .data() + .lazy + .get() + .unwrap() + .func_canonical_abi_realloc + .clone(); + let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let _memory_view = _memory.view(&store); + let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { + _memory_view.data_unchecked_mut() + }); + let data_mut = store.data_mut(); + let len3 = arg1; + let base3 = arg0; + let mut result3 = Vec::with_capacity(len3 as usize); + for i in 0..len3 { + let base = base3 + i *8; + result3.push({ + let load0 = _bc.load::(base + 0)?; + let load1 = _bc.load::(base + 4)?; + let ptr2 = load0; + let len2 = load1; + _bc.slice(ptr2, len2)? + }); + } + let param0 = result3; + let host = &mut data_mut.data; + let result = host.simple_list4(param0, ); + let vec5 = result; + let len5 = vec5.len() as i32; + let result5 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, len5 * 8)?; + for (i, e) in vec5.into_iter().enumerate() { + let base = result5 + (i as i32) * 8; + { + let vec4 = e; + let ptr4 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec4.len() as i32) * 4)?; + let _memory_view = _memory.view(&store); + let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; + caller_memory.store_many(ptr4, &vec4)?; + caller_memory.store(base + 4, wai_bindgen_wasmer::rt::as_i32(vec4.len() as i32))?; + caller_memory.store(base + 0, wai_bindgen_wasmer::rt::as_i32(ptr4))?; + }}let _memory_view = _memory.view(&store); + let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; + caller_memory.store(arg2 + 4, wai_bindgen_wasmer::rt::as_i32(len5))?; + caller_memory.store(arg2 + 0, wai_bindgen_wasmer::rt::as_i32(result5))?; + Ok(()) + } + )); + imports.register_namespace("simple-lists", exports); + move |_instance: &wasmer::Instance, _store: &dyn wasmer::AsStoreRef| { + let memory = _instance.exports.get_memory("memory")?.clone(); + let func_canonical_abi_realloc = _instance + .exports + .get_typed_function( + &_store.as_store_ref(), + "canonical_abi_realloc", + ) + .unwrap() + .clone(); + lazy.set(LazyInitialized { + memory, + func_canonical_abi_realloc, + }) + .map_err(|_e| anyhow::anyhow!("Couldn't set lazy initialized data"))?; + Ok(()) + } + } + use wai_bindgen_wasmer::once_cell::unsync::OnceCell; + #[allow(unused_imports)] + use wasmer::AsStoreMut as _; + #[allow(unused_imports)] + use wasmer::AsStoreRef as _; + use wai_bindgen_wasmer::rt::RawMem; + use wai_bindgen_wasmer::Le; + } diff --git a/crates/test/Cargo.toml b/crates/test/Cargo.toml new file mode 100644 index 00000000..858681f6 --- /dev/null +++ b/crates/test/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "wai-bindgen-gen-wasmer-test" +description = "for testing, please REMOVE BEFORE MAKING A PULL REQUEST" +authors.workspace = true +edition.workspace = true +homepage.workspace = true +license.workspace = true +readme.workspace = true +repository.workspace = true +rust-version.workspace = true +version.workspace = true + +[lib] +test = false +doctest = false + +[dependencies] +wai-bindgen-gen-core = { path = "../gen-core", version = "0.2.3" } +wai-bindgen-gen-rust = { path = "../gen-rust", version = "0.2.3" } +heck = "0.3" +structopt = { version = "0.3", default-features = false, optional = true } + +anyhow = "1.0" + +# Use wasmer from source for testing. REMOVE BEFORE MAKING A PULL REQUEST!!! +wai-bindgen-wasmer = { path = "../../../wasmer/lib/wai-bindgen-wasmer", features = ["tracing"] } +wasmer = { path = "../../../wasmer/lib/api" } diff --git a/crates/test/src/lib.rs b/crates/test/src/lib.rs new file mode 100644 index 00000000..e1492975 --- /dev/null +++ b/crates/test/src/lib.rs @@ -0,0 +1,169 @@ + +#[allow(clippy::all)] +pub mod simple_lists { + #[allow(unused_imports)] + use wai_bindgen_wasmer::{anyhow, wasmer}; + pub trait SimpleLists: Sized + Send + Sync + 'static{ + fn simple_list1(&mut self,l: &[Le],) -> (); + + fn simple_list2(&mut self,) -> Vec; + + fn simple_list4(&mut self,l: Vec<&[Le]>,) -> Vec>; + + } + pub struct LazyInitialized { + memory: wasmer::Memory, + func_canonical_abi_realloc: wasmer::TypedFunction<(i32, i32, i32, i32), i32>, + } + + #[must_use = "The returned initializer function must be called + with the instance and the store before starting the runtime"] + pub fn add_to_imports(store: &mut wasmer::Store, imports: &mut wasmer::Imports, data: T) + -> impl FnOnce(&wasmer::Instance, &dyn wasmer::AsStoreRef) -> Result<(), anyhow::Error> + where T: SimpleLists + { + #[derive(Clone)]struct EnvWrapper { + data: T, + lazy: std::rc::Rc>, + } + unsafe impl Send for EnvWrapper {} + unsafe impl Sync for EnvWrapper {} + let lazy = std::rc::Rc::new(OnceCell::new()); + let env = EnvWrapper { + data, + lazy: std::rc::Rc::clone(&lazy), + }; + let env = wasmer::FunctionEnv::new(&mut *store, env); + let mut exports = wasmer::Exports::new(); + let mut store = store.as_store_mut(); + exports.insert( + "simple-list1", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32| -> Result<(), wasmer::RuntimeError> { + let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let _memory_view = _memory.view(&store); + let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { + _memory_view.data_unchecked_mut() + }); + let data_mut = store.data_mut(); + let ptr0 = arg0; + let len0 = arg1; + let param0 = _bc.slice(ptr0, len0)?; + let host = &mut data_mut.data; + let result = host.simple_list1(param0, ); + let () = result; + Ok(()) + } + )); + exports.insert( + "simple-list2", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move |mut store: wasmer::FunctionEnvMut>,arg0:i32| -> Result<(), wasmer::RuntimeError> { + let func_canonical_abi_realloc = store + .data() + .lazy + .get() + .unwrap() + .func_canonical_abi_realloc + .clone(); + let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let data_mut = store.data_mut(); + let host = &mut data_mut.data; + let result = host.simple_list2(); + let vec0 = result; + let ptr0 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec0.len() as i32) * 4)?; + let _memory_view = _memory.view(&store); + let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; + caller_memory.store_many(ptr0, &vec0)?; + caller_memory.store(arg0 + 4, wai_bindgen_wasmer::rt::as_i32(vec0.len() as i32))?; + caller_memory.store(arg0 + 0, wai_bindgen_wasmer::rt::as_i32(ptr0))?; + Ok(()) + } + )); + exports.insert( + "simple-list4", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32,arg2:i32| -> Result<(), wasmer::RuntimeError> { + let func_canonical_abi_realloc = store + .data() + .lazy + .get() + .unwrap() + .func_canonical_abi_realloc + .clone(); + let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let _memory_view = _memory.view(&store); + let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { + _memory_view.data_unchecked_mut() + }); + let data_mut = store.data_mut(); + let len3 = arg1; + let base3 = arg0; + let mut result3 = Vec::with_capacity(len3 as usize); + for i in 0..len3 { + let base = base3 + i *8; + result3.push({ + let load0 = _bc.load::(base + 0)?; + let load1 = _bc.load::(base + 4)?; + let ptr2 = load0; + let len2 = load1; + _bc.slice(ptr2, len2)? + }); + } + let param0 = result3; + let host = &mut data_mut.data; + let result = host.simple_list4(param0, ); + let vec5 = result; + let len5 = vec5.len() as i32; + let result5 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, len5 * 8)?; + for (i, e) in vec5.into_iter().enumerate() { + let base = result5 + (i as i32) * 8; + { + let vec4 = e; + let ptr4 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec4.len() as i32) * 4)?; + let _memory_view = _memory.view(&store); + let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; + caller_memory.store_many(ptr4, &vec4)?; + caller_memory.store(base + 4, wai_bindgen_wasmer::rt::as_i32(vec4.len() as i32))?; + caller_memory.store(base + 0, wai_bindgen_wasmer::rt::as_i32(ptr4))?; + }}let _memory_view = _memory.view(&store); + let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; + caller_memory.store(arg2 + 4, wai_bindgen_wasmer::rt::as_i32(len5))?; + caller_memory.store(arg2 + 0, wai_bindgen_wasmer::rt::as_i32(result5))?; + Ok(()) + } + )); + imports.register_namespace("simple-lists", exports); + move |_instance: &wasmer::Instance, _store: &dyn wasmer::AsStoreRef| { + let memory = _instance.exports.get_memory("memory")?.clone(); + let func_canonical_abi_realloc = _instance + .exports + .get_typed_function( + &_store.as_store_ref(), + "canonical_abi_realloc", + ) + .unwrap() + .clone(); + lazy.set(LazyInitialized { + memory, + func_canonical_abi_realloc, + }) + .map_err(|_e| anyhow::anyhow!("Couldn't set lazy initialized data"))?; + Ok(()) + } + } + use wai_bindgen_wasmer::once_cell::unsync::OnceCell; + #[allow(unused_imports)] + use wasmer::AsStoreMut as _; + #[allow(unused_imports)] + use wasmer::AsStoreRef as _; + use wai_bindgen_wasmer::rt::RawMem; + use wai_bindgen_wasmer::Le; + } + \ No newline at end of file From c1249bf9de2e99cf47d4ed740571a301ce69f02d Mon Sep 17 00:00:00 2001 From: kajacx Date: Tue, 23 May 2023 15:49:59 +0200 Subject: [PATCH 03/10] Try to make changes to the generated code --- crates/gen-wasmer/src/lib.rs | 5 ++++- crates/test/src/lib.rs | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/crates/gen-wasmer/src/lib.rs b/crates/gen-wasmer/src/lib.rs index f8a419e1..635c4074 100644 --- a/crates/gen-wasmer/src/lib.rs +++ b/crates/gen-wasmer/src/lib.rs @@ -666,6 +666,9 @@ impl Generator for Wasmer { ); } + self.src.push_str("#[allow(unused_mut)]\n"); + self.src.push_str("let (data_mut, mut store) = store.data_and_store_mut();\n"); + if needs_borrow_checker { // TODO: This isn't actually sound and should be replaced with use // of WasmPtr/WasmCell. @@ -677,7 +680,7 @@ impl Generator for Wasmer { ); } - self.src.push_str("let data_mut = store.data_mut();\n"); + // self.src.push_str("let data_mut = store.data_mut();\n"); if !self.all_needed_handles.is_empty() { self.src diff --git a/crates/test/src/lib.rs b/crates/test/src/lib.rs index e1492975..a97ad13a 100644 --- a/crates/test/src/lib.rs +++ b/crates/test/src/lib.rs @@ -43,11 +43,13 @@ pub mod simple_lists { &env, move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32| -> Result<(), wasmer::RuntimeError> { let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - let _memory_view = _memory.view(&store); + + let (data_mut, my_store) = store.data_and_store_mut(); + + let _memory_view = _memory.view(&my_store); let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { _memory_view.data_unchecked_mut() }); - let data_mut = store.data_mut(); let ptr0 = arg0; let len0 = arg1; let param0 = _bc.slice(ptr0, len0)?; @@ -98,11 +100,11 @@ pub mod simple_lists { .func_canonical_abi_realloc .clone(); let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); + let (data_mut, mut store) = store.data_and_store_mut(); let _memory_view = _memory.view(&store); let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { _memory_view.data_unchecked_mut() }); - let data_mut = store.data_mut(); let len3 = arg1; let base3 = arg0; let mut result3 = Vec::with_capacity(len3 as usize); From 528be37f6f51c36f2846563f6baf1a642c573364 Mon Sep 17 00:00:00 2001 From: kajacx Date: Tue, 23 May 2023 16:17:44 +0200 Subject: [PATCH 04/10] Try to update more code --- crates/gen-wasmer/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/gen-wasmer/src/lib.rs b/crates/gen-wasmer/src/lib.rs index 635c4074..f9a82ce4 100644 --- a/crates/gen-wasmer/src/lib.rs +++ b/crates/gen-wasmer/src/lib.rs @@ -666,7 +666,7 @@ impl Generator for Wasmer { ); } - self.src.push_str("#[allow(unused_mut)]\n"); + self.src.push_str("#[allow(unused_mut, unused_variables)]\n"); self.src.push_str("let (data_mut, mut store) = store.data_and_store_mut();\n"); if needs_borrow_checker { @@ -1666,7 +1666,7 @@ impl Bindgen for FunctionBindgen<'_> { let name = &iface.resources[*ty].name; results.push(format!( "{{ - let data_mut = store.data_mut(); + // let data_mut = store.data_mut(); let mut tables = data_mut.tables.borrow_mut(); tables.{}_table.insert({}) as i32 }}", From 9259d98cc12fbe79f70759524cff042a4526f59d Mon Sep 17 00:00:00 2001 From: kajacx Date: Tue, 23 May 2023 19:49:58 +0200 Subject: [PATCH 05/10] Try to use wasix --- Cargo.lock | 1824 ++++++++++++++++++++++++---- crates/gen-wasmer/Cargo.toml | 3 + crates/gen-wasmer/tests/runtime.rs | 2 +- 3 files changed, 1572 insertions(+), 257 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8289be19..5db96e8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,11 +52,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "any_ascii" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" + [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arrayvec" @@ -72,7 +78,16 @@ checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", +] + +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", ] [[package]] @@ -107,12 +122,24 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + [[package]] name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" + [[package]] name = "bincode" version = "1.3.3" @@ -149,6 +176,15 @@ dependencies = [ "generic-array", ] +[[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 = "bstr" version = "0.2.17" @@ -183,7 +219,7 @@ checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -194,9 +230,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "cap-fs-ext" @@ -206,7 +245,7 @@ checksum = "e54b86398b5852ddd45784b1d9b196b98beb39171821bad4b8b44534a1e87927" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes", + "io-lifetimes 0.5.3", "winapi", ] @@ -217,13 +256,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8fca3e81fae1d91a36e9784ca22a39ef623702b5f7904d89dc31f10184a178" dependencies = [ "ambient-authority", - "errno", + "errno 0.2.8", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 0.5.3", "ipnet", "maybe-owned", - "rustix", + "rustix 0.33.7", "winapi", "winapi-util", "winx", @@ -247,9 +286,9 @@ checksum = "2247568946095c7765ad2b441a56caffc08027734c634a6d5edda648f04e32eb" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes", + "io-lifetimes 0.5.3", "ipnet", - "rustix", + "rustix 0.33.7", ] [[package]] @@ -260,7 +299,7 @@ checksum = "c50472b6ebc302af0401fa3fb939694cd8ff00e0d4c9182001e434fc822ab83a" dependencies = [ "cap-primitives", "once_cell", - "rustix", + "rustix 0.33.7", "winx", ] @@ -321,7 +360,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -333,6 +372,34 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cooked-waker" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "corosensei" version = "0.1.3" @@ -373,15 +440,6 @@ dependencies = [ "cranelift-entity 0.85.0", ] -[[package]] -name = "cranelift-bforest" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529ffacce2249ac60edba2941672dfedf3d96558b415d0d8083cd007456e0f55" -dependencies = [ - "cranelift-entity 0.86.1", -] - [[package]] name = "cranelift-bforest" version = "0.91.1" @@ -409,24 +467,6 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "cranelift-codegen" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427d105f617efc8cb55f8d036a7fded2e227892d8780b4985e5551f8d27c4a92" -dependencies = [ - "cranelift-bforest 0.86.1", - "cranelift-codegen-meta 0.86.1", - "cranelift-codegen-shared 0.86.1", - "cranelift-entity 0.86.1", - "cranelift-isle 0.86.1", - "gimli", - "log", - "regalloc2 0.3.2", - "smallvec", - "target-lexicon", -] - [[package]] name = "cranelift-codegen" version = "0.91.1" @@ -457,15 +497,6 @@ dependencies = [ "cranelift-codegen-shared 0.85.0", ] -[[package]] -name = "cranelift-codegen-meta" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551674bed85b838d45358e3eab4f0ffaa6790c70dc08184204b9a54b41cdb7d1" -dependencies = [ - "cranelift-codegen-shared 0.86.1", -] - [[package]] name = "cranelift-codegen-meta" version = "0.91.1" @@ -481,12 +512,6 @@ version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712fbebd119a476f59122b4ba51fdce893a66309b5c92bd5506bfb11a0587496" -[[package]] -name = "cranelift-codegen-shared" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866" - [[package]] name = "cranelift-codegen-shared" version = "0.91.1" @@ -516,12 +541,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cranelift-entity" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e" - [[package]] name = "cranelift-entity" version = "0.91.1" @@ -540,18 +559,6 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "cranelift-frontend" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544ee8f4d1c9559c9aa6d46e7aaeac4a13856d620561094f35527356c7d21bd0" -dependencies = [ - "cranelift-codegen 0.86.1", - "log", - "smallvec", - "target-lexicon", -] - [[package]] name = "cranelift-frontend" version = "0.91.1" @@ -570,12 +577,6 @@ version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86d4f53bc86fb458e59c695c6a95ce8346e6a8377ee7ffc058e3ac08b5f94cb1" -[[package]] -name = "cranelift-isle" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad" - [[package]] name = "cranelift-isle" version = "0.91.1" @@ -618,6 +619,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + [[package]] name = "crossbeam-channel" version = "0.5.5" @@ -663,6 +670,16 @@ dependencies = [ "once_cell", ] +[[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.22" @@ -670,7 +687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -693,7 +710,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -704,7 +721,7 @@ checksum = "b21dd6b221dd547528bd6fb15f1a3b7ab03b9a06f76bff288a8c629bcfbe7f0e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -728,7 +745,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -746,6 +763,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", +] + [[package]] name = "directories-next" version = "2.0.0" @@ -777,12 +804,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + [[package]] name = "either" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum-iterator" version = "0.7.0" @@ -800,7 +842,7 @@ checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -822,7 +864,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -849,6 +891,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -865,6 +918,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -877,14 +939,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.16" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "winapi", + "redox_syscall 0.2.13", + "windows-sys 0.48.0", ] [[package]] @@ -893,6 +955,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.1.0" @@ -908,23 +985,71 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df62ee66ee2d532ea8d567b5a3f0d03ecd64636b98bad5be1e93dcc918b92aa" dependencies = [ - "io-lifetimes", - "rustix", + "io-lifetimes 0.5.3", + "rustix 0.33.7", "winapi", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-core" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + [[package]] name = "futures-macro" version = "0.3.21" @@ -933,9 +1058,15 @@ checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + [[package]] name = "futures-task" version = "0.3.21" @@ -948,9 +1079,13 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -982,8 +1117,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -1016,6 +1153,40 @@ dependencies = [ "regex", ] +[[package]] +name = "h2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -1034,6 +1205,19 @@ dependencies = [ "ahash", ] +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.0", + "spin 0.9.8", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.3.3" @@ -1068,69 +1252,174 @@ dependencies = [ ] [[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "id-arena" -version = "2.2.1" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] -name = "ident_case" -version = "1.0.1" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "idna" -version = "0.3.0" +name = "http" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "bytes", + "fnv", + "itoa", ] [[package]] -name = "ignore" -version = "0.4.18" +name = "http-body" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "crossbeam-utils", - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", + "bytes", + "http", + "pin-project-lite", ] [[package]] -name = "indexmap" -version = "1.9.1" +name = "httparse" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] -name = "io-extras" -version = "0.13.2" +name = "httpdate" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c937cc9891c12eaa8c63ad347e4a288364b1328b924886970b47a14ab8f8f8" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +dependencies = [ + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[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", + "serde", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-extras" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c937cc9891c12eaa8c63ad347e4a288364b1328b924886970b47a14ab8f8f8" dependencies = [ - "io-lifetimes", + "io-lifetimes 0.5.3", "winapi", ] @@ -1144,6 +1433,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" version = "2.5.0" @@ -1157,8 +1457,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c89a757e762896bdbdfadf2860d0f8b0cea5e363d8cf3e7bdfeb63d1d976352" dependencies = [ "hermit-abi 0.2.1", - "io-lifetimes", - "rustix", + "io-lifetimes 0.5.3", + "rustix 0.33.7", "winapi", ] @@ -1216,11 +1516,35 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +[[package]] +name = "lexical-sort" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" +dependencies = [ + "any_ascii", +] + [[package]] name = "libc" -version = "0.2.126" +version = "0.2.144" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] [[package]] name = "linux-raw-sys" @@ -1228,6 +1552,12 @@ version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "lock_api" version = "0.4.9" @@ -1304,6 +1634,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.5.3" @@ -1313,12 +1649,42 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.45.0", +] + [[package]] name = "more-asserts" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "num_cpus" version = "1.13.1" @@ -1329,6 +1695,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.98", +] + [[package]] name = "object" version = "0.28.3" @@ -1353,6 +1740,50 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "os_str_bytes" version = "6.1.0" @@ -1376,7 +1807,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.13", "smallvec", "windows-sys 0.45.0", ] @@ -1387,12 +1818,38 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +[[package]] +name = "path-clean" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" + [[package]] name = "percent-encoding" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1405,6 +1862,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1442,7 +1905,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.98", "version_check", ] @@ -1457,11 +1920,17 @@ dependencies = [ "version_check", ] +[[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.40" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] @@ -1492,7 +1961,7 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -1508,9 +1977,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.20" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1584,6 +2053,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -1591,7 +2069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.13", "thiserror", ] @@ -1607,18 +2085,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "regalloc2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - [[package]] name = "regalloc2" version = "0.5.1" @@ -1681,6 +2147,63 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "rkyv" version = "0.7.42" @@ -1707,7 +2230,7 @@ checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -1717,21 +2240,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] -name = "rustix" -version = "0.33.7" +name = "rustc_version" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.17", +] + +[[package]] +name = "rustix" +version = "0.33.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", - "errno", - "io-lifetimes", + "errno 0.2.8", + "io-lifetimes 0.5.3", "itoa", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.42", "once_cell", "winapi", ] +[[package]] +name = "rustix" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes 1.0.10", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.1", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "ryu" version = "1.0.10" @@ -1747,18 +2333,81 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "seahash" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "serde" version = "1.0.137" @@ -1779,6 +2428,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.137" @@ -1787,7 +2446,7 @@ checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -1801,19 +2460,69 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + [[package]] name = "sha2" version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "shellexpand" version = "2.1.0" @@ -1823,6 +2532,15 @@ dependencies = [ "dirs-next", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "simdutf8" version = "0.1.4" @@ -1847,12 +2565,95 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn 1.0.98", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn 1.0.98", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strsim" version = "0.8.0" @@ -1886,7 +2687,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -1900,6 +2701,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "system-interface" version = "0.20.0" @@ -1910,8 +2722,8 @@ dependencies = [ "bitflags", "cap-fs-ext", "cap-std", - "io-lifetimes", - "rustix", + "io-lifetimes 0.5.3", + "rustix 0.33.7", "winapi", "winx", ] @@ -1928,6 +2740,29 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix 0.37.19", + "windows-sys 0.45.0", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "termcolor" version = "1.1.3" @@ -1937,6 +2772,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + [[package]] name = "test-helpers" version = "0.0.0" @@ -1950,7 +2794,7 @@ dependencies = [ "wai-bindgen-gen-c", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", "wai-bindgen-gen-spidermonkey", "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", @@ -1964,7 +2808,7 @@ name = "test-rust-wasm" version = "0.2.3" dependencies = [ "futures-util", - "wai-bindgen-rust", + "wai-bindgen-rust 0.2.3", ] [[package]] @@ -1984,22 +2828,22 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -2011,6 +2855,44 @@ dependencies = [ "once_cell", ] +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.98", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -2026,6 +2908,69 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +[[package]] +name = "tokio" +version = "1.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.9" @@ -2035,6 +2980,12 @@ dependencies = [ "serde", ] +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + [[package]] name = "tracing" version = "0.1.35" @@ -2056,7 +3007,7 @@ checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] @@ -2068,6 +3019,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + [[package]] name = "typenum" version = "1.15.0" @@ -2122,6 +3079,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.3.1" @@ -2131,14 +3094,27 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" + [[package]] name = "uuid" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "vec_map" version = "0.8.2" @@ -2151,6 +3127,40 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "virtual-fs" +version = "0.2.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "derivative", + "filetime", + "fs_extra", + "getrandom", + "indexmap", + "lazy_static", + "libc", + "pin-project-lite", + "slab", + "thiserror", + "tokio", + "tracing", + "webc", +] + +[[package]] +name = "virtual-net" +version = "0.1.0" +dependencies = [ + "async-trait", + "bytes", + "libc", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "wai-bindgen-cli" version = "0.2.3" @@ -2161,7 +3171,7 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", "wai-bindgen-gen-spidermonkey", "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", @@ -2177,13 +3187,13 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", "wai-bindgen-gen-spidermonkey", "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", - "wai-bindgen-rust", + "wai-bindgen-rust 0.2.3", "wasmprinter", ] @@ -2262,7 +3272,18 @@ dependencies = [ "test-helpers", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-rust 0.2.3", - "wai-bindgen-rust", + "wai-bindgen-rust 0.2.3", +] + +[[package]] +name = "wai-bindgen-gen-rust-wasm" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f35ce5e74086fac87f3a7bd50f643f00fe3559adb75c88521ecaa01c8a6199" +dependencies = [ + "heck 0.3.3", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2290,6 +3311,7 @@ dependencies = [ "wai-bindgen-gen-rust 0.2.3", "wai-bindgen-wasmer 0.4.0", "wasmer 3.3.0", + "wasmer-wasix", ] [[package]] @@ -2357,7 +3379,17 @@ version = "0.2.3" dependencies = [ "async-trait", "bitflags", - "wai-bindgen-rust-impl", + "wai-bindgen-rust-impl 0.2.3", +] + +[[package]] +name = "wai-bindgen-rust" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5601c6f448c063e83a5e931b8fefcdf7e01ada424ad42372c948d2e3d67741" +dependencies = [ + "bitflags", + "wai-bindgen-rust-impl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2365,9 +3397,21 @@ name = "wai-bindgen-rust-impl" version = "0.2.3" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.98", "wai-bindgen-gen-core 0.2.3", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", +] + +[[package]] +name = "wai-bindgen-rust-impl" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeb5c1170246de8425a3e123e7ef260dc05ba2b522a1d369fe2315376efea4" +dependencies = [ + "proc-macro2", + "syn 1.0.98", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust-wasm 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2381,7 +3425,7 @@ dependencies = [ "thiserror", "tracing", "wai-bindgen-wasmer-impl 0.2.3", - "wasmer 3.1.1", + "wasmer 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2402,7 +3446,7 @@ name = "wai-bindgen-wasmer-impl" version = "0.2.3" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.98", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-wasmer 0.2.3", ] @@ -2414,7 +3458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b3488ed88d4dd0e3bf85bad4e27dac6cb31aae5d122a5dda2424803c8dc863a" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.98", "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "wai-bindgen-gen-wasmer 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2437,7 +3481,7 @@ name = "wai-bindgen-wasmtime-impl" version = "0.2.3" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.98", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-wasmtime", ] @@ -2488,6 +3532,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "walkdir" version = "2.3.2" @@ -2499,6 +3549,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2519,10 +3579,10 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 0.5.3", "is-terminal", "lazy_static", - "rustix", + "rustix 0.33.7", "system-interface", "tracing", "wasi-common", @@ -2540,7 +3600,7 @@ dependencies = [ "cap-rand", "cap-std", "io-extras", - "rustix", + "rustix 0.33.7", "thiserror", "tracing", "wiggle", @@ -2568,7 +3628,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.98", "wasm-bindgen-shared", ] @@ -2592,7 +3652,19 @@ checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -2613,7 +3685,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2644,27 +3716,26 @@ dependencies = [ [[package]] name = "wasmer" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840af6d21701220cb805dc7201af301cb99e9b4f646f48a41befbc1d949f0f90" +version = "3.3.0" dependencies = [ "bytes", "cfg-if", + "derivative", "indexmap", "js-sys", "more-asserts", + "rustc-demangle", "serde", "serde-wasm-bindgen", "target-lexicon", "thiserror", "wasm-bindgen", "wasm-bindgen-downcast", - "wasmer-compiler 3.1.1", - "wasmer-compiler-cranelift 3.1.1", - "wasmer-derive 3.1.1", - "wasmer-types 3.1.1", - "wasmer-vm 3.1.1", - "wasmparser 0.83.0", + "wasmer-compiler 3.3.0", + "wasmer-compiler-cranelift 3.3.0", + "wasmer-derive 3.3.0", + "wasmer-types 3.3.0", + "wasmer-vm 3.3.0", "wat", "winapi", ] @@ -2672,6 +3743,8 @@ dependencies = [ [[package]] name = "wasmer" version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52" dependencies = [ "bytes", "cfg-if", @@ -2686,20 +3759,20 @@ dependencies = [ "thiserror", "wasm-bindgen", "wasm-bindgen-downcast", - "wasmer-compiler 3.3.0", - "wasmer-compiler-cranelift 3.3.0", - "wasmer-derive 3.3.0", - "wasmer-types 3.3.0", - "wasmer-vm 3.3.0", + "wasmer-compiler 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-compiler-cranelift 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-types 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-vm 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.83.0", + "wasmparser 0.95.0", "wat", "winapi", ] [[package]] name = "wasmer-compiler" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86fab98beaaace77380cb04e681773739473860d1b8499ea6b14f920923e0c5" +version = "3.3.0" dependencies = [ "backtrace", "cfg-if", @@ -2710,18 +3783,19 @@ dependencies = [ "memmap2", "more-asserts", "region 3.0.0", - "rustc-demangle", "smallvec", "thiserror", - "wasmer-types 3.1.1", - "wasmer-vm 3.1.1", - "wasmparser 0.83.0", + "wasmer-types 3.3.0", + "wasmer-vm 3.3.0", + "wasmparser 0.95.0", "winapi", ] [[package]] name = "wasmer-compiler" version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180" dependencies = [ "backtrace", "cfg-if", @@ -2734,34 +3808,34 @@ dependencies = [ "region 3.0.0", "smallvec", "thiserror", - "wasmer-types 3.3.0", - "wasmer-vm 3.3.0", + "wasmer-types 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-vm 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.95.0", "winapi", ] [[package]] name = "wasmer-compiler-cranelift" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015eef629fc84889540dc1686bd7fa524b93da9fd2d275b16c49dbe96268e58f" +version = "3.3.0" dependencies = [ - "cranelift-codegen 0.86.1", - "cranelift-entity 0.86.1", - "cranelift-frontend 0.86.1", + "cranelift-codegen 0.91.1", + "cranelift-entity 0.91.1", + "cranelift-frontend 0.91.1", "gimli", "more-asserts", "rayon", "smallvec", "target-lexicon", "tracing", - "wasmer-compiler 3.1.1", - "wasmer-types 3.1.1", + "wasmer-compiler 3.3.0", + "wasmer-types 3.3.0", ] [[package]] name = "wasmer-compiler-cranelift" version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95" dependencies = [ "cranelift-codegen 0.91.1", "cranelift-entity 0.91.1", @@ -2772,43 +3846,43 @@ dependencies = [ "smallvec", "target-lexicon", "tracing", - "wasmer-compiler 3.3.0", - "wasmer-types 3.3.0", + "wasmer-compiler 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-types 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-derive" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff577b7c1cfcd3d7c5b3a09fe1a499b73f7c17084845ff71225c8250a6a63a9" +version = "3.3.0" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] name = "wasmer-derive" version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.98", ] [[package]] name = "wasmer-types" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9600f9da966abae3be0b0a4560e7d1f2c88415a2d01ce362ac06063cb1c473" +version = "3.3.0" dependencies = [ + "bytecheck", "enum-iterator", "enumset", "indexmap", "more-asserts", "rkyv", + "serde", "target-lexicon", "thiserror", ] @@ -2816,6 +3890,8 @@ dependencies = [ [[package]] name = "wasmer-types" version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b" dependencies = [ "bytecheck", "enum-iterator", @@ -2829,31 +3905,34 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc68a7f0a003e6cb63845b7510065097d289553201d64afb9a5e1744da3c6a0" +version = "3.3.0" dependencies = [ "backtrace", "cc", "cfg-if", "corosensei", + "dashmap", + "derivative", "enum-iterator", + "fnv", "indexmap", "lazy_static", "libc", "mach", - "memoffset 0.6.5", + "memoffset 0.8.0", "more-asserts", "region 3.0.0", "scopeguard", "thiserror", - "wasmer-types 3.1.1", + "wasmer-types 3.3.0", "winapi", ] [[package]] name = "wasmer-vm" version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f" dependencies = [ "backtrace", "cc", @@ -2872,10 +3951,83 @@ dependencies = [ "region 3.0.0", "scopeguard", "thiserror", + "wasmer-types 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", +] + +[[package]] +name = "wasmer-wasix" +version = "0.4.0" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "bytes", + "cfg-if", + "cooked-waker", + "dashmap", + "derivative", + "futures", + "getrandom", + "heapless", + "hex", + "http", + "lazy_static", + "libc", + "linked_hash_set", + "once_cell", + "pin-project", + "rand", + "reqwest", + "semver 1.0.17", + "serde", + "serde_derive", + "serde_json", + "serde_yaml", + "sha2 0.10.6", + "shellexpand", + "tempfile", + "term_size", + "termios", + "thiserror", + "tokio", + "tracing", + "url", + "urlencoding", + "virtual-fs", + "virtual-net", + "wai-bindgen-wasmer 0.4.0", + "waker-fn", + "wasm-bindgen", + "wasmer 3.3.0", "wasmer-types 3.3.0", + "wasmer-wasix-types", + "webc", + "weezl", "winapi", ] +[[package]] +name = "wasmer-wasix-types" +version = "0.4.0" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "cfg-if", + "num_enum", + "serde", + "time", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust-wasm 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-parser 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer 3.3.0", + "wasmer-derive 3.3.0", + "wasmer-types 3.3.0", +] + [[package]] name = "wasmparser" version = "0.80.2" @@ -2967,14 +4119,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce2aa752e864a33eef2a6629edc59554e75f0bc1719431dac5e49eed516af69" dependencies = [ "anyhow", - "base64", + "base64 0.13.0", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.33.7", "serde", - "sha2", + "sha2 0.9.9", "toml", "winapi", "zstd", @@ -3029,7 +4181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e078bd1a01b8bacd982280eca4dfc22093ae2b19607ae6a38a97278f45aa5fa" dependencies = [ "cc", - "rustix", + "rustix 0.33.7", "winapi", ] @@ -3050,7 +4202,7 @@ dependencies = [ "object", "region 2.2.0", "rustc-demangle", - "rustix", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", @@ -3068,7 +4220,7 @@ checksum = "e6d5dd480cc6dc0a401653e45b79796a3317f8228990d84bc2271bdaf0810071" dependencies = [ "lazy_static", "object", - "rustix", + "rustix 0.33.7", ] [[package]] @@ -3090,7 +4242,7 @@ dependencies = [ "more-asserts", "rand", "region 2.2.0", - "rustix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", "wasmtime-fiber", @@ -3162,6 +4314,67 @@ dependencies = [ "wast 42.0.0", ] +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webc" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06bee486f9207604f99bfa3c95afcd03272d95db5872c6c1b11470be4390d514" +dependencies = [ + "anyhow", + "base64 0.21.1", + "byteorder", + "bytes", + "indexmap", + "leb128", + "lexical-sort", + "memmap2", + "once_cell", + "path-clean", + "rand", + "serde", + "serde_cbor", + "serde_json", + "sha2 0.10.6", + "thiserror", + "url", + "walkdir", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + [[package]] name = "wiggle" version = "0.38.0" @@ -3188,7 +4401,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn", + "syn 1.0.98", "witx", ] @@ -3200,7 +4413,7 @@ checksum = "78983b50f8f23b1ce4b2e6ba34ffda88e36f131eb54d4136d9e6e8e0139794db" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.98", "wiggle-generate", ] @@ -3248,13 +4461,37 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -3263,21 +4500,42 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -3290,6 +4548,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -3302,6 +4566,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -3314,6 +4584,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -3326,12 +4602,24 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -3344,6 +4632,21 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "winx" version = "0.31.0" @@ -3351,7 +4654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d5973cb8cd94a77d03ad7e23bbe14889cb29805da1cec0e4aff75e21aebded" dependencies = [ "bitflags", - "io-lifetimes", + "io-lifetimes 0.5.3", "winapi", ] @@ -3376,6 +4679,15 @@ dependencies = [ "tap", ] +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/crates/gen-wasmer/Cargo.toml b/crates/gen-wasmer/Cargo.toml index 8f70b8b3..ab2ee0bf 100644 --- a/crates/gen-wasmer/Cargo.toml +++ b/crates/gen-wasmer/Cargo.toml @@ -28,7 +28,10 @@ test-helpers = { path = "../test-helpers", features = [ # wai-bindgen-wasmer = { path = "../wasmer", features = ["tracing"] } # wasmer = "3.0" # wasmer-wasi = "3.0" +# wasmer = "3.3" +# wasmer-wasix = "0.4.0" # Use wasmer from source for testing. REMOVE BEFORE MAKING A PULL REQUEST!!! wai-bindgen-wasmer = { path = "../../../wasmer/lib/wai-bindgen-wasmer", features = ["tracing"] } wasmer = { path = "../../../wasmer/lib/api" } +wasmer-wasix = { path = "../../../wasmer/lib/wasi" } diff --git a/crates/gen-wasmer/tests/runtime.rs b/crates/gen-wasmer/tests/runtime.rs index 99f88843..d6c4d02b 100644 --- a/crates/gen-wasmer/tests/runtime.rs +++ b/crates/gen-wasmer/tests/runtime.rs @@ -1,6 +1,6 @@ use anyhow::Result; use wasmer::{Imports, Instance, Module, Store}; -use wasmer_wasi::WasiState; +use wasmer_wasix::WasiState; test_helpers::runtime_tests_wasmer!(); From 9c16223532e0960314623df3b3930d635bf03890 Mon Sep 17 00:00:00 2001 From: kajacx Date: Tue, 23 May 2023 20:08:50 +0200 Subject: [PATCH 06/10] Remove wasi completely to avoid the compile error --- Cargo.lock | 1449 ++-------------------------- crates/gen-wasmer/Cargo.toml | 2 +- crates/gen-wasmer/tests/runtime.rs | 26 +- 3 files changed, 86 insertions(+), 1391 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5db96e8b..9df03dc3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,12 +52,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "any_ascii" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" - [[package]] name = "anyhow" version = "1.0.71" @@ -81,15 +75,6 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - [[package]] name = "atty" version = "0.2.14" @@ -122,24 +107,12 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "base64" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" - [[package]] name = "bincode" version = "1.3.3" @@ -176,15 +149,6 @@ dependencies = [ "generic-array", ] -[[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 = "bstr" version = "0.2.17" @@ -233,9 +197,6 @@ name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" -dependencies = [ - "serde", -] [[package]] name = "cap-fs-ext" @@ -245,7 +206,7 @@ checksum = "e54b86398b5852ddd45784b1d9b196b98beb39171821bad4b8b44534a1e87927" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes 0.5.3", + "io-lifetimes", "winapi", ] @@ -256,13 +217,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8fca3e81fae1d91a36e9784ca22a39ef623702b5f7904d89dc31f10184a178" dependencies = [ "ambient-authority", - "errno 0.2.8", + "errno", "fs-set-times", "io-extras", - "io-lifetimes 0.5.3", + "io-lifetimes", "ipnet", "maybe-owned", - "rustix 0.33.7", + "rustix", "winapi", "winapi-util", "winx", @@ -286,9 +247,9 @@ checksum = "2247568946095c7765ad2b441a56caffc08027734c634a6d5edda648f04e32eb" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes 0.5.3", + "io-lifetimes", "ipnet", - "rustix 0.33.7", + "rustix", ] [[package]] @@ -299,7 +260,7 @@ checksum = "c50472b6ebc302af0401fa3fb939694cd8ff00e0d4c9182001e434fc822ab83a" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.33.7", + "rustix", "winx", ] @@ -372,34 +333,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "cooked-waker" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - [[package]] name = "corosensei" version = "0.1.3" @@ -619,12 +552,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - [[package]] name = "crossbeam-channel" version = "0.5.5" @@ -670,16 +597,6 @@ dependencies = [ "once_cell", ] -[[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.22" @@ -763,16 +680,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", -] - [[package]] name = "directories-next" version = "2.0.0" @@ -804,27 +711,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "either" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum-iterator" version = "0.7.0" @@ -891,17 +783,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -918,15 +799,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -945,7 +817,7 @@ checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "windows-sys 0.48.0", ] @@ -955,21 +827,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.1.0" @@ -985,71 +842,23 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df62ee66ee2d532ea8d567b5a3f0d03ecd64636b98bad5be1e93dcc918b92aa" dependencies = [ - "io-lifetimes 0.5.3", - "rustix 0.33.7", + "io-lifetimes", + "rustix", "winapi", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - [[package]] name = "futures-macro" version = "0.3.21" @@ -1061,12 +870,6 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - [[package]] name = "futures-task" version = "0.3.21" @@ -1079,13 +882,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1117,10 +916,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1153,40 +950,6 @@ dependencies = [ "regex", ] -[[package]] -name = "h2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[package]] name = "hashbrown" version = "0.11.2" @@ -1205,19 +968,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "heapless" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version 0.4.0", - "spin 0.9.8", - "stable_deref_trait", -] - [[package]] name = "heck" version = "0.3.3" @@ -1251,108 +1001,12 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" -dependencies = [ - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "id-arena" version = "2.2.1" @@ -1404,22 +1058,13 @@ dependencies = [ "serde", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "io-extras" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0c937cc9891c12eaa8c63ad347e4a288364b1328b924886970b47a14ab8f8f8" dependencies = [ - "io-lifetimes 0.5.3", + "io-lifetimes", "winapi", ] @@ -1433,17 +1078,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.5.0" @@ -1457,8 +1091,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c89a757e762896bdbdfadf2860d0f8b0cea5e363d8cf3e7bdfeb63d1d976352" dependencies = [ "hermit-abi 0.2.1", - "io-lifetimes 0.5.3", - "rustix 0.33.7", + "io-lifetimes", + "rustix", "winapi", ] @@ -1516,48 +1150,18 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" -[[package]] -name = "lexical-sort" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" -dependencies = [ - "any_ascii", -] - [[package]] name = "libc" version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linked_hash_set" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "linux-raw-sys" version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "lock_api" version = "0.4.9" @@ -1634,12 +1238,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "miniz_oxide" version = "0.5.3" @@ -1650,41 +1248,11 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.45.0", -] - -[[package]] -name = "more-asserts" -version = "0.2.2" +name = "more-asserts" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "num_cpus" version = "1.13.1" @@ -1695,27 +1263,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.98", -] - [[package]] name = "object" version = "0.28.3" @@ -1740,50 +1287,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl" -version = "0.10.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "os_str_bytes" version = "6.1.0" @@ -1807,7 +1310,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "windows-sys 0.45.0", ] @@ -1818,38 +1321,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" -[[package]] -name = "path-clean" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" - [[package]] name = "percent-encoding" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", -] - [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1862,12 +1339,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1920,12 +1391,6 @@ dependencies = [ "version_check", ] -[[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.58" @@ -2053,15 +1518,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -2069,7 +1525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall 0.2.13", + "redox_syscall", "thiserror", ] @@ -2147,63 +1603,6 @@ dependencies = [ "bytecheck", ] -[[package]] -name = "reqwest" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" -dependencies = [ - "base64 0.21.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - [[package]] name = "rkyv" version = "0.7.42" @@ -2239,24 +1638,6 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.17", -] - [[package]] name = "rustix" version = "0.33.7" @@ -2264,60 +1645,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", - "errno 0.2.8", - "io-lifetimes 0.5.3", + "errno", + "io-lifetimes", "itoa", "libc", - "linux-raw-sys 0.0.42", + "linux-raw-sys", "once_cell", "winapi", ] -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.1", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "ryu" version = "1.0.10" @@ -2333,81 +1669,18 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "security-framework" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.137" @@ -2428,16 +1701,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.137" @@ -2460,69 +1723,19 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer 0.9.0", + "block-buffer", "cfg-if", "cpufeatures", - "digest 0.9.0", + "digest", "opaque-debug", ] -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "shellexpand" version = "2.1.0" @@ -2532,15 +1745,6 @@ dependencies = [ "dirs-next", ] -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - [[package]] name = "simdutf8" version = "0.1.4" @@ -2565,95 +1769,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.98", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.98", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.8.0" @@ -2722,8 +1843,8 @@ dependencies = [ "bitflags", "cap-fs-ext", "cap-std", - "io-lifetimes 0.5.3", - "rustix 0.33.7", + "io-lifetimes", + "rustix", "winapi", "winx", ] @@ -2740,29 +1861,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -2772,15 +1870,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - [[package]] name = "test-helpers" version = "0.0.0" @@ -2794,7 +1883,7 @@ dependencies = [ "wai-bindgen-gen-c", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", - "wai-bindgen-gen-rust-wasm 0.2.3", + "wai-bindgen-gen-rust-wasm", "wai-bindgen-gen-spidermonkey", "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", @@ -2804,133 +1893,42 @@ dependencies = [ ] [[package]] -name = "test-rust-wasm" -version = "0.2.3" -dependencies = [ - "futures-util", - "wai-bindgen-rust 0.2.3", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +name = "test-rust-wasm" +version = "0.2.3" dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.98", + "futures-util", + "wai-bindgen-rust", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "textwrap" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "tinyvec_macros", + "unicode-width", ] [[package]] -name = "tinyvec_macros" -version = "0.1.0" +name = "textwrap" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] -name = "tokio" -version = "1.28.1" +name = "thiserror" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", + "thiserror-impl", ] [[package]] -name = "tokio-macros" -version = "2.1.0" +name = "thiserror-impl" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", @@ -2938,38 +1936,28 @@ dependencies = [ ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "thread_local" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "native-tls", - "tokio", + "once_cell", ] [[package]] -name = "tokio-rustls" -version = "0.24.0" +name = "tinyvec" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ - "rustls", - "tokio", + "tinyvec_macros", ] [[package]] -name = "tokio-util" -version = "0.7.8" +name = "tinyvec_macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" @@ -2980,12 +1968,6 @@ dependencies = [ "serde", ] -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - [[package]] name = "tracing" version = "0.1.35" @@ -3019,12 +2001,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - [[package]] name = "typenum" version = "1.15.0" @@ -3079,12 +2055,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "2.3.1" @@ -3094,27 +2064,14 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - [[package]] name = "uuid" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" @@ -3127,40 +2084,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "virtual-fs" -version = "0.2.0" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "derivative", - "filetime", - "fs_extra", - "getrandom", - "indexmap", - "lazy_static", - "libc", - "pin-project-lite", - "slab", - "thiserror", - "tokio", - "tracing", - "webc", -] - -[[package]] -name = "virtual-net" -version = "0.1.0" -dependencies = [ - "async-trait", - "bytes", - "libc", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "wai-bindgen-cli" version = "0.2.3" @@ -3171,7 +2094,7 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", - "wai-bindgen-gen-rust-wasm 0.2.3", + "wai-bindgen-gen-rust-wasm", "wai-bindgen-gen-spidermonkey", "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", @@ -3187,13 +2110,13 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", - "wai-bindgen-gen-rust-wasm 0.2.3", + "wai-bindgen-gen-rust-wasm", "wai-bindgen-gen-spidermonkey", "wai-bindgen-gen-wasmer 0.2.3", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", - "wai-bindgen-rust 0.2.3", + "wai-bindgen-rust", "wasmprinter", ] @@ -3272,18 +2195,7 @@ dependencies = [ "test-helpers", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-rust 0.2.3", - "wai-bindgen-rust 0.2.3", -] - -[[package]] -name = "wai-bindgen-gen-rust-wasm" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f35ce5e74086fac87f3a7bd50f643f00fe3559adb75c88521ecaa01c8a6199" -dependencies = [ - "heck 0.3.3", - "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-rust", ] [[package]] @@ -3311,7 +2223,6 @@ dependencies = [ "wai-bindgen-gen-rust 0.2.3", "wai-bindgen-wasmer 0.4.0", "wasmer 3.3.0", - "wasmer-wasix", ] [[package]] @@ -3379,17 +2290,7 @@ version = "0.2.3" dependencies = [ "async-trait", "bitflags", - "wai-bindgen-rust-impl 0.2.3", -] - -[[package]] -name = "wai-bindgen-rust" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5601c6f448c063e83a5e931b8fefcdf7e01ada424ad42372c948d2e3d67741" -dependencies = [ - "bitflags", - "wai-bindgen-rust-impl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-rust-impl", ] [[package]] @@ -3399,19 +2300,7 @@ dependencies = [ "proc-macro2", "syn 1.0.98", "wai-bindgen-gen-core 0.2.3", - "wai-bindgen-gen-rust-wasm 0.2.3", -] - -[[package]] -name = "wai-bindgen-rust-impl" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdeeb5c1170246de8425a3e123e7ef260dc05ba2b522a1d369fe2315376efea4" -dependencies = [ - "proc-macro2", - "syn 1.0.98", - "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-gen-rust-wasm 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust-wasm", ] [[package]] @@ -3532,12 +2421,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" version = "2.3.2" @@ -3549,16 +2432,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3579,10 +2452,10 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes 0.5.3", + "io-lifetimes", "is-terminal", "lazy_static", - "rustix 0.33.7", + "rustix", "system-interface", "tracing", "wasi-common", @@ -3600,7 +2473,7 @@ dependencies = [ "cap-rand", "cap-std", "io-extras", - "rustix 0.33.7", + "rustix", "thiserror", "tracing", "wiggle", @@ -3655,18 +2528,6 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.83" @@ -3882,7 +2743,6 @@ dependencies = [ "indexmap", "more-asserts", "rkyv", - "serde", "target-lexicon", "thiserror", ] @@ -3955,79 +2815,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wasmer-wasix" -version = "0.4.0" -dependencies = [ - "anyhow", - "async-trait", - "bincode", - "bytes", - "cfg-if", - "cooked-waker", - "dashmap", - "derivative", - "futures", - "getrandom", - "heapless", - "hex", - "http", - "lazy_static", - "libc", - "linked_hash_set", - "once_cell", - "pin-project", - "rand", - "reqwest", - "semver 1.0.17", - "serde", - "serde_derive", - "serde_json", - "serde_yaml", - "sha2 0.10.6", - "shellexpand", - "tempfile", - "term_size", - "termios", - "thiserror", - "tokio", - "tracing", - "url", - "urlencoding", - "virtual-fs", - "virtual-net", - "wai-bindgen-wasmer 0.4.0", - "waker-fn", - "wasm-bindgen", - "wasmer 3.3.0", - "wasmer-types 3.3.0", - "wasmer-wasix-types", - "webc", - "weezl", - "winapi", -] - -[[package]] -name = "wasmer-wasix-types" -version = "0.4.0" -dependencies = [ - "anyhow", - "bitflags", - "byteorder", - "cfg-if", - "num_enum", - "serde", - "time", - "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-gen-rust-wasm 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-parser 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer 3.3.0", - "wasmer-derive 3.3.0", - "wasmer-types 3.3.0", -] - [[package]] name = "wasmparser" version = "0.80.2" @@ -4119,14 +2906,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce2aa752e864a33eef2a6629edc59554e75f0bc1719431dac5e49eed516af69" dependencies = [ "anyhow", - "base64 0.13.0", + "base64", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.33.7", + "rustix", "serde", - "sha2 0.9.9", + "sha2", "toml", "winapi", "zstd", @@ -4181,7 +2968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e078bd1a01b8bacd982280eca4dfc22093ae2b19607ae6a38a97278f45aa5fa" dependencies = [ "cc", - "rustix 0.33.7", + "rustix", "winapi", ] @@ -4202,7 +2989,7 @@ dependencies = [ "object", "region 2.2.0", "rustc-demangle", - "rustix 0.33.7", + "rustix", "serde", "target-lexicon", "thiserror", @@ -4220,7 +3007,7 @@ checksum = "e6d5dd480cc6dc0a401653e45b79796a3317f8228990d84bc2271bdaf0810071" dependencies = [ "lazy_static", "object", - "rustix 0.33.7", + "rustix", ] [[package]] @@ -4242,7 +3029,7 @@ dependencies = [ "more-asserts", "rand", "region 2.2.0", - "rustix 0.33.7", + "rustix", "thiserror", "wasmtime-environ", "wasmtime-fiber", @@ -4314,67 +3101,6 @@ dependencies = [ "wast 42.0.0", ] -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webc" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bee486f9207604f99bfa3c95afcd03272d95db5872c6c1b11470be4390d514" -dependencies = [ - "anyhow", - "base64 0.21.1", - "byteorder", - "bytes", - "indexmap", - "leb128", - "lexical-sort", - "memmap2", - "once_cell", - "path-clean", - "rand", - "serde", - "serde_cbor", - "serde_json", - "sha2 0.10.6", - "thiserror", - "url", - "walkdir", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - [[package]] name = "wiggle" version = "0.38.0" @@ -4461,21 +3187,6 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -4638,15 +3349,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - [[package]] name = "winx" version = "0.31.0" @@ -4654,7 +3356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d5973cb8cd94a77d03ad7e23bbe14889cb29805da1cec0e4aff75e21aebded" dependencies = [ "bitflags", - "io-lifetimes 0.5.3", + "io-lifetimes", "winapi", ] @@ -4679,15 +3381,6 @@ dependencies = [ "tap", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/crates/gen-wasmer/Cargo.toml b/crates/gen-wasmer/Cargo.toml index ab2ee0bf..2ea56cb7 100644 --- a/crates/gen-wasmer/Cargo.toml +++ b/crates/gen-wasmer/Cargo.toml @@ -34,4 +34,4 @@ test-helpers = { path = "../test-helpers", features = [ # Use wasmer from source for testing. REMOVE BEFORE MAKING A PULL REQUEST!!! wai-bindgen-wasmer = { path = "../../../wasmer/lib/wai-bindgen-wasmer", features = ["tracing"] } wasmer = { path = "../../../wasmer/lib/api" } -wasmer-wasix = { path = "../../../wasmer/lib/wasi" } +# wasmer-wasix = { path = "../../../wasmer/lib/wasi" } diff --git a/crates/gen-wasmer/tests/runtime.rs b/crates/gen-wasmer/tests/runtime.rs index d6c4d02b..4f39e28c 100644 --- a/crates/gen-wasmer/tests/runtime.rs +++ b/crates/gen-wasmer/tests/runtime.rs @@ -1,6 +1,6 @@ use anyhow::Result; use wasmer::{Imports, Instance, Module, Store}; -use wasmer_wasix::WasiState; +// use wasmer_wasix::WasiState; test_helpers::runtime_tests_wasmer!(); @@ -13,21 +13,23 @@ pub fn instantiate( where I: FnOnce(&Instance, &dyn wasmer::AsStoreRef) -> Result<(), anyhow::Error>, { - let module = Module::from_file(&*store, wasm)?; + // let module = Module::from_file(&*store, wasm)?; - let wasi_env = WasiState::new("test").finalize(store)?; - let mut imports = wasi_env - .import_object(store, &module) - .unwrap_or(Imports::new()); + // let wasi_env = WasiState::new("test").finalize(store)?; + // let mut imports = wasi_env + // .import_object(store, &module) + // .unwrap_or(Imports::new()); - let initializer = add_imports(store, &mut imports); + // let initializer = add_imports(store, &mut imports); - let (exports, instance) = mk_exports(store, &module, &mut imports)?; + // let (exports, instance) = mk_exports(store, &module, &mut imports)?; - let memory = instance.exports.get_memory("memory")?; - wasi_env.data_mut(store).set_memory(memory.clone()); + // let memory = instance.exports.get_memory("memory")?; + // wasi_env.data_mut(store).set_memory(memory.clone()); - initializer(&instance, store)?; + // initializer(&instance, store)?; - Ok(exports) + // Ok(exports) + + todo!() } From 8b5b8e9cef3964354409c3fd1150e923c393b8d3 Mon Sep 17 00:00:00 2001 From: kajacx Date: Tue, 23 May 2023 20:48:42 +0200 Subject: [PATCH 07/10] Something is very wrong. Codegen tests pass, but runtime test fail at compile error --- crates/test/expanded.rs | 463 +++++++++++++++++++++++++++++++++++ crates/test/src/lib.rs | 171 +------------ tests/codegen/my-imports.wai | 22 ++ 3 files changed, 486 insertions(+), 170 deletions(-) create mode 100644 crates/test/expanded.rs create mode 100644 tests/codegen/my-imports.wai diff --git a/crates/test/expanded.rs b/crates/test/expanded.rs new file mode 100644 index 00000000..e148267e --- /dev/null +++ b/crates/test/expanded.rs @@ -0,0 +1,463 @@ +#![feature(prelude_import)] +#[prelude_import] +use std::prelude::rust_2021::*; +#[macro_use] +extern crate std; +#[allow(clippy::all)] +pub mod imports { + #[allow(unused_imports)] + use wai_bindgen_wasmer::{anyhow, wasmer}; + pub trait Imports: Sized + Send + Sync + 'static { + fn many_arguments( + &mut self, + a1: u64, + a2: u64, + a3: u64, + a4: u64, + a5: u64, + a6: u64, + a7: u64, + a8: u64, + a9: u64, + a10: u64, + a11: u64, + a12: u64, + a13: u64, + a14: u64, + a15: u64, + a16: u64, + a17: u64, + a18: u64, + a19: u64, + a20: u64, + ) -> (); + } + pub struct LazyInitialized { + memory: wasmer::Memory, + } + #[must_use = "The returned initializer function must be called + with the instance and the store before starting the runtime"] + pub fn add_to_imports( + store: &mut wasmer::Store, + imports: &mut wasmer::Imports, + data: T, + ) -> impl FnOnce( + &wasmer::Instance, + &dyn wasmer::AsStoreRef, + ) -> Result<(), anyhow::Error> + where + T: Imports, + { + struct EnvWrapper { + data: T, + lazy: std::rc::Rc>, + } + #[automatically_derived] + impl ::core::clone::Clone for EnvWrapper { + #[inline] + fn clone(&self) -> EnvWrapper { + EnvWrapper { + data: ::core::clone::Clone::clone(&self.data), + lazy: ::core::clone::Clone::clone(&self.lazy), + } + } + } + unsafe impl Send for EnvWrapper {} + unsafe impl Sync for EnvWrapper {} + let lazy = std::rc::Rc::new(OnceCell::new()); + let env = EnvWrapper { + data, + lazy: std::rc::Rc::clone(&lazy), + }; + let env = wasmer::FunctionEnv::new(&mut *store, env); + let mut exports = wasmer::Exports::new(); + let mut store = store.as_store_mut(); + exports + .insert( + "many-arguments", + wasmer::Function::new_typed_with_env( + &mut store, + &env, + move | + mut store: wasmer::FunctionEnvMut>, + arg0: i32, + | -> Result<(), wasmer::RuntimeError> { + let span = { + use ::tracing::__macro_support::Callsite as _; + static CALLSITE: ::tracing::callsite::DefaultCallsite = { + static META: ::tracing::Metadata<'static> = { + ::tracing_core::metadata::Metadata::new( + "wai-bindgen abi", + "wai_bindgen_gen_wasmer_test::imports", + wai_bindgen_wasmer::tracing::Level::TRACE, + Some("crates/test/src/lib.rs"), + Some(2u32), + Some("wai_bindgen_gen_wasmer_test::imports"), + ::tracing_core::field::FieldSet::new( + &["module", "function"], + ::tracing_core::callsite::Identifier(&CALLSITE), + ), + ::tracing::metadata::Kind::SPAN, + ) + }; + ::tracing::callsite::DefaultCallsite::new(&META) + }; + let mut interest = ::tracing::subscriber::Interest::never(); + if wai_bindgen_wasmer::tracing::Level::TRACE + <= ::tracing::level_filters::STATIC_MAX_LEVEL + && wai_bindgen_wasmer::tracing::Level::TRACE + <= ::tracing::level_filters::LevelFilter::current() + && { + interest = CALLSITE.interest(); + !interest.is_never() + } + && ::tracing::__macro_support::__is_enabled( + CALLSITE.metadata(), + interest, + ) + { + let meta = CALLSITE.metadata(); + ::tracing::Span::new( + meta, + &{ + #[allow(unused_imports)] + use ::tracing::field::{debug, display, Value}; + let mut iter = meta.fields().iter(); + meta.fields() + .value_set( + &[ + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some(&"imports" as &Value), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some(&"many-arguments" as &Value), + ), + ], + ) + }, + ) + } else { + let span = ::tracing::__macro_support::__disabled_span( + CALLSITE.metadata(), + ); + {}; + span + } + }; + let _enter = span.enter(); + let _memory: wasmer::Memory = store + .data() + .lazy + .get() + .unwrap() + .memory + .clone(); + let _memory_view = _memory.view(&store); + let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { + _memory_view.data_unchecked_mut() + }); + let data_mut = store.data_mut(); + let load0 = _bc.load::(arg0 + 0)?; + let load1 = _bc.load::(arg0 + 8)?; + let load2 = _bc.load::(arg0 + 16)?; + let load3 = _bc.load::(arg0 + 24)?; + let load4 = _bc.load::(arg0 + 32)?; + let load5 = _bc.load::(arg0 + 40)?; + let load6 = _bc.load::(arg0 + 48)?; + let load7 = _bc.load::(arg0 + 56)?; + let load8 = _bc.load::(arg0 + 64)?; + let load9 = _bc.load::(arg0 + 72)?; + let load10 = _bc.load::(arg0 + 80)?; + let load11 = _bc.load::(arg0 + 88)?; + let load12 = _bc.load::(arg0 + 96)?; + let load13 = _bc.load::(arg0 + 104)?; + let load14 = _bc.load::(arg0 + 112)?; + let load15 = _bc.load::(arg0 + 120)?; + let load16 = _bc.load::(arg0 + 128)?; + let load17 = _bc.load::(arg0 + 136)?; + let load18 = _bc.load::(arg0 + 144)?; + let load19 = _bc.load::(arg0 + 152)?; + let param0 = load0 as u64; + let param1 = load1 as u64; + let param2 = load2 as u64; + let param3 = load3 as u64; + let param4 = load4 as u64; + let param5 = load5 as u64; + let param6 = load6 as u64; + let param7 = load7 as u64; + let param8 = load8 as u64; + let param9 = load9 as u64; + let param10 = load10 as u64; + let param11 = load11 as u64; + let param12 = load12 as u64; + let param13 = load13 as u64; + let param14 = load14 as u64; + let param15 = load15 as u64; + let param16 = load16 as u64; + let param17 = load17 as u64; + let param18 = load18 as u64; + let param19 = load19 as u64; + { + use ::tracing::__macro_support::Callsite as _; + static CALLSITE: ::tracing::callsite::DefaultCallsite = { + static META: ::tracing::Metadata<'static> = { + ::tracing_core::metadata::Metadata::new( + "event crates/test/src/lib.rs:2", + "wai_bindgen_gen_wasmer_test::imports", + wai_bindgen_wasmer::tracing::Level::TRACE, + Some("crates/test/src/lib.rs"), + Some(2u32), + Some("wai_bindgen_gen_wasmer_test::imports"), + ::tracing_core::field::FieldSet::new( + &[ + "a1", + "a2", + "a3", + "a4", + "a5", + "a6", + "a7", + "a8", + "a9", + "a10", + "a11", + "a12", + "a13", + "a14", + "a15", + "a16", + "a17", + "a18", + "a19", + "a20", + ], + ::tracing_core::callsite::Identifier(&CALLSITE), + ), + ::tracing::metadata::Kind::EVENT, + ) + }; + ::tracing::callsite::DefaultCallsite::new(&META) + }; + let enabled = wai_bindgen_wasmer::tracing::Level::TRACE + <= ::tracing::level_filters::STATIC_MAX_LEVEL + && wai_bindgen_wasmer::tracing::Level::TRACE + <= ::tracing::level_filters::LevelFilter::current() + && { + let interest = CALLSITE.interest(); + !interest.is_never() + && ::tracing::__macro_support::__is_enabled( + CALLSITE.metadata(), + interest, + ) + }; + if enabled { + (|value_set: ::tracing::field::ValueSet| { + let meta = CALLSITE.metadata(); + ::tracing::Event::dispatch(meta, &value_set); + })({ + #[allow(unused_imports)] + use ::tracing::field::{debug, display, Value}; + let mut iter = CALLSITE.metadata().fields().iter(); + CALLSITE + .metadata() + .fields() + .value_set( + &[ + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m0) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m1) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m2) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m3) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m4) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m5) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m6) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m7) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m8) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m9) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m10) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m11) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m12) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m13) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m14) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m15) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m16) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m17) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m18) + as &Value, + ), + ), + ( + &iter.next().expect("FieldSet corrupted (this is a bug)"), + Some( + &wai_bindgen_wasmer::tracing::field::debug(¶m19) + as &Value, + ), + ), + ], + ) + }); + } else { + } + }; + let host = &mut data_mut.data; + let result = host + .many_arguments( + param0, + param1, + param2, + param3, + param4, + param5, + param6, + param7, + param8, + param9, + param10, + param11, + param12, + param13, + param14, + param15, + param16, + param17, + param18, + param19, + ); + let () = result; + Ok(()) + }, + ), + ); + imports.register_namespace("imports", exports); + move |_instance: &wasmer::Instance, _store: &dyn wasmer::AsStoreRef| { + let memory = _instance.exports.get_memory("memory")?.clone(); + lazy.set(LazyInitialized { memory }) + .map_err(|_e| ::anyhow::__private::must_use({ + let error = ::anyhow::__private::format_err( + format_args!("Couldn\'t set lazy initialized data"), + ); + error + }))?; + Ok(()) + } + } + use wai_bindgen_wasmer::once_cell::unsync::OnceCell; + #[allow(unused_imports)] + use wasmer::AsStoreMut as _; + #[allow(unused_imports)] + use wasmer::AsStoreRef as _; + use wai_bindgen_wasmer::rt::RawMem; +} +const _: &str = "many-arguments: func(\n a1: u64,\n a2: u64,\n a3: u64,\n a4: u64,\n a5: u64,\n a6: u64,\n a7: u64,\n a8: u64,\n a9: u64,\n a10: u64,\n a11: u64,\n a12: u64,\n a13: u64,\n a14: u64,\n a15: u64,\n a16: u64,\n a17: u64,\n a18: u64,\n a19: u64,\n a20: u64,\n)\n"; diff --git a/crates/test/src/lib.rs b/crates/test/src/lib.rs index a97ad13a..43f59911 100644 --- a/crates/test/src/lib.rs +++ b/crates/test/src/lib.rs @@ -1,171 +1,2 @@ -#[allow(clippy::all)] -pub mod simple_lists { - #[allow(unused_imports)] - use wai_bindgen_wasmer::{anyhow, wasmer}; - pub trait SimpleLists: Sized + Send + Sync + 'static{ - fn simple_list1(&mut self,l: &[Le],) -> (); - - fn simple_list2(&mut self,) -> Vec; - - fn simple_list4(&mut self,l: Vec<&[Le]>,) -> Vec>; - - } - pub struct LazyInitialized { - memory: wasmer::Memory, - func_canonical_abi_realloc: wasmer::TypedFunction<(i32, i32, i32, i32), i32>, - } - - #[must_use = "The returned initializer function must be called - with the instance and the store before starting the runtime"] - pub fn add_to_imports(store: &mut wasmer::Store, imports: &mut wasmer::Imports, data: T) - -> impl FnOnce(&wasmer::Instance, &dyn wasmer::AsStoreRef) -> Result<(), anyhow::Error> - where T: SimpleLists - { - #[derive(Clone)]struct EnvWrapper { - data: T, - lazy: std::rc::Rc>, - } - unsafe impl Send for EnvWrapper {} - unsafe impl Sync for EnvWrapper {} - let lazy = std::rc::Rc::new(OnceCell::new()); - let env = EnvWrapper { - data, - lazy: std::rc::Rc::clone(&lazy), - }; - let env = wasmer::FunctionEnv::new(&mut *store, env); - let mut exports = wasmer::Exports::new(); - let mut store = store.as_store_mut(); - exports.insert( - "simple-list1", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32| -> Result<(), wasmer::RuntimeError> { - let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - - let (data_mut, my_store) = store.data_and_store_mut(); - - let _memory_view = _memory.view(&my_store); - let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { - _memory_view.data_unchecked_mut() - }); - let ptr0 = arg0; - let len0 = arg1; - let param0 = _bc.slice(ptr0, len0)?; - let host = &mut data_mut.data; - let result = host.simple_list1(param0, ); - let () = result; - Ok(()) - } - )); - exports.insert( - "simple-list2", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move |mut store: wasmer::FunctionEnvMut>,arg0:i32| -> Result<(), wasmer::RuntimeError> { - let func_canonical_abi_realloc = store - .data() - .lazy - .get() - .unwrap() - .func_canonical_abi_realloc - .clone(); - let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - let data_mut = store.data_mut(); - let host = &mut data_mut.data; - let result = host.simple_list2(); - let vec0 = result; - let ptr0 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec0.len() as i32) * 4)?; - let _memory_view = _memory.view(&store); - let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; - caller_memory.store_many(ptr0, &vec0)?; - caller_memory.store(arg0 + 4, wai_bindgen_wasmer::rt::as_i32(vec0.len() as i32))?; - caller_memory.store(arg0 + 0, wai_bindgen_wasmer::rt::as_i32(ptr0))?; - Ok(()) - } - )); - exports.insert( - "simple-list4", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32,arg2:i32| -> Result<(), wasmer::RuntimeError> { - let func_canonical_abi_realloc = store - .data() - .lazy - .get() - .unwrap() - .func_canonical_abi_realloc - .clone(); - let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - let (data_mut, mut store) = store.data_and_store_mut(); - let _memory_view = _memory.view(&store); - let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { - _memory_view.data_unchecked_mut() - }); - let len3 = arg1; - let base3 = arg0; - let mut result3 = Vec::with_capacity(len3 as usize); - for i in 0..len3 { - let base = base3 + i *8; - result3.push({ - let load0 = _bc.load::(base + 0)?; - let load1 = _bc.load::(base + 4)?; - let ptr2 = load0; - let len2 = load1; - _bc.slice(ptr2, len2)? - }); - } - let param0 = result3; - let host = &mut data_mut.data; - let result = host.simple_list4(param0, ); - let vec5 = result; - let len5 = vec5.len() as i32; - let result5 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, len5 * 8)?; - for (i, e) in vec5.into_iter().enumerate() { - let base = result5 + (i as i32) * 8; - { - let vec4 = e; - let ptr4 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec4.len() as i32) * 4)?; - let _memory_view = _memory.view(&store); - let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; - caller_memory.store_many(ptr4, &vec4)?; - caller_memory.store(base + 4, wai_bindgen_wasmer::rt::as_i32(vec4.len() as i32))?; - caller_memory.store(base + 0, wai_bindgen_wasmer::rt::as_i32(ptr4))?; - }}let _memory_view = _memory.view(&store); - let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; - caller_memory.store(arg2 + 4, wai_bindgen_wasmer::rt::as_i32(len5))?; - caller_memory.store(arg2 + 0, wai_bindgen_wasmer::rt::as_i32(result5))?; - Ok(()) - } - )); - imports.register_namespace("simple-lists", exports); - move |_instance: &wasmer::Instance, _store: &dyn wasmer::AsStoreRef| { - let memory = _instance.exports.get_memory("memory")?.clone(); - let func_canonical_abi_realloc = _instance - .exports - .get_typed_function( - &_store.as_store_ref(), - "canonical_abi_realloc", - ) - .unwrap() - .clone(); - lazy.set(LazyInitialized { - memory, - func_canonical_abi_realloc, - }) - .map_err(|_e| anyhow::anyhow!("Couldn't set lazy initialized data"))?; - Ok(()) - } - } - use wai_bindgen_wasmer::once_cell::unsync::OnceCell; - #[allow(unused_imports)] - use wasmer::AsStoreMut as _; - #[allow(unused_imports)] - use wasmer::AsStoreRef as _; - use wai_bindgen_wasmer::rt::RawMem; - use wai_bindgen_wasmer::Le; - } - \ No newline at end of file +wai_bindgen_wasmer::export!("../../tests/runtime/many_arguments/imports.wai"); \ No newline at end of file diff --git a/tests/codegen/my-imports.wai b/tests/codegen/my-imports.wai new file mode 100644 index 00000000..391bf261 --- /dev/null +++ b/tests/codegen/my-imports.wai @@ -0,0 +1,22 @@ +many-arguments: func( + a1: u64, + a2: u64, + a3: u64, + a4: u64, + a5: u64, + a6: u64, + a7: u64, + a8: u64, + a9: u64, + a10: u64, + a11: u64, + a12: u64, + a13: u64, + a14: u64, + a15: u64, + a16: u64, + a17: u64, + a18: u64, + a19: u64, + a20: u64, +) From d27a11c8aec763059bbf4381b9e45f1b4763f10d Mon Sep 17 00:00:00 2001 From: kajacx Date: Wed, 24 May 2023 21:05:27 +0200 Subject: [PATCH 08/10] Use wasix correctly, tests work --- crates/gen-wasmer/Cargo.toml | 2 +- crates/gen-wasmer/tests/runtime.rs | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/crates/gen-wasmer/Cargo.toml b/crates/gen-wasmer/Cargo.toml index 2ea56cb7..ab2ee0bf 100644 --- a/crates/gen-wasmer/Cargo.toml +++ b/crates/gen-wasmer/Cargo.toml @@ -34,4 +34,4 @@ test-helpers = { path = "../test-helpers", features = [ # Use wasmer from source for testing. REMOVE BEFORE MAKING A PULL REQUEST!!! wai-bindgen-wasmer = { path = "../../../wasmer/lib/wai-bindgen-wasmer", features = ["tracing"] } wasmer = { path = "../../../wasmer/lib/api" } -# wasmer-wasix = { path = "../../../wasmer/lib/wasi" } +wasmer-wasix = { path = "../../../wasmer/lib/wasi" } diff --git a/crates/gen-wasmer/tests/runtime.rs b/crates/gen-wasmer/tests/runtime.rs index 4f39e28c..8a4b5c09 100644 --- a/crates/gen-wasmer/tests/runtime.rs +++ b/crates/gen-wasmer/tests/runtime.rs @@ -1,6 +1,6 @@ use anyhow::Result; use wasmer::{Imports, Instance, Module, Store}; -// use wasmer_wasix::WasiState; +use wasmer_wasix::WasiEnvBuilder; test_helpers::runtime_tests_wasmer!(); @@ -13,23 +13,18 @@ pub fn instantiate( where I: FnOnce(&Instance, &dyn wasmer::AsStoreRef) -> Result<(), anyhow::Error>, { - // let module = Module::from_file(&*store, wasm)?; + let module = Module::from_file(&*store, wasm)?; - // let wasi_env = WasiState::new("test").finalize(store)?; - // let mut imports = wasi_env - // .import_object(store, &module) - // .unwrap_or(Imports::new()); + let wasi_env = WasiEnvBuilder::new("test").finalize(store)?; + let mut imports = wasi_env + .import_object(store, &module) + .unwrap_or(Imports::new()); - // let initializer = add_imports(store, &mut imports); + let initializer = add_imports(store, &mut imports); - // let (exports, instance) = mk_exports(store, &module, &mut imports)?; + let (exports, instance) = mk_exports(store, &module, &mut imports)?; - // let memory = instance.exports.get_memory("memory")?; - // wasi_env.data_mut(store).set_memory(memory.clone()); + initializer(&instance, store)?; - // initializer(&instance, store)?; - - // Ok(exports) - - todo!() + Ok(exports) } From 19c18554bb681336d711b731c9a3d2d5d0afec30 Mon Sep 17 00:00:00 2001 From: kajacx Date: Wed, 24 May 2023 21:13:27 +0200 Subject: [PATCH 09/10] Add changes in Cargo.lock --- Cargo.lock | 1476 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1380 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9df03dc3..3180b20b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,6 +52,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "any_ascii" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" + [[package]] name = "anyhow" version = "1.0.71" @@ -75,6 +81,15 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + [[package]] name = "atty" version = "0.2.14" @@ -107,12 +122,24 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + [[package]] name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" + [[package]] name = "bincode" version = "1.3.3" @@ -149,6 +176,15 @@ dependencies = [ "generic-array", ] +[[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 = "bstr" version = "0.2.17" @@ -197,6 +233,9 @@ name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "cap-fs-ext" @@ -206,7 +245,7 @@ checksum = "e54b86398b5852ddd45784b1d9b196b98beb39171821bad4b8b44534a1e87927" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes", + "io-lifetimes 0.5.3", "winapi", ] @@ -217,13 +256,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8fca3e81fae1d91a36e9784ca22a39ef623702b5f7904d89dc31f10184a178" dependencies = [ "ambient-authority", - "errno", + "errno 0.2.8", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 0.5.3", "ipnet", "maybe-owned", - "rustix", + "rustix 0.33.7", "winapi", "winapi-util", "winx", @@ -247,9 +286,9 @@ checksum = "2247568946095c7765ad2b441a56caffc08027734c634a6d5edda648f04e32eb" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes", + "io-lifetimes 0.5.3", "ipnet", - "rustix", + "rustix 0.33.7", ] [[package]] @@ -260,7 +299,7 @@ checksum = "c50472b6ebc302af0401fa3fb939694cd8ff00e0d4c9182001e434fc822ab83a" dependencies = [ "cap-primitives", "once_cell", - "rustix", + "rustix 0.33.7", "winx", ] @@ -333,6 +372,34 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cooked-waker" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "corosensei" version = "0.1.3" @@ -552,6 +619,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + [[package]] name = "crossbeam-channel" version = "0.5.5" @@ -597,6 +670,16 @@ dependencies = [ "once_cell", ] +[[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.22" @@ -680,6 +763,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", +] + [[package]] name = "directories-next" version = "2.0.0" @@ -711,12 +804,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + [[package]] name = "either" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum-iterator" version = "0.7.0" @@ -783,6 +891,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -799,6 +918,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -817,7 +945,7 @@ checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.13", "windows-sys 0.48.0", ] @@ -827,6 +955,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.1.0" @@ -842,23 +985,71 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df62ee66ee2d532ea8d567b5a3f0d03ecd64636b98bad5be1e93dcc918b92aa" dependencies = [ - "io-lifetimes", - "rustix", + "io-lifetimes 0.5.3", + "rustix 0.33.7", "winapi", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-core" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + [[package]] name = "futures-macro" version = "0.3.21" @@ -870,6 +1061,12 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + [[package]] name = "futures-task" version = "0.3.21" @@ -882,9 +1079,13 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -916,8 +1117,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -950,6 +1153,40 @@ dependencies = [ "regex", ] +[[package]] +name = "h2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -968,6 +1205,19 @@ dependencies = [ "ahash", ] +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.0", + "spin 0.9.8", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.3.3" @@ -1001,12 +1251,108 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -1058,13 +1404,22 @@ dependencies = [ "serde", ] +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + [[package]] name = "io-extras" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0c937cc9891c12eaa8c63ad347e4a288364b1328b924886970b47a14ab8f8f8" dependencies = [ - "io-lifetimes", + "io-lifetimes 0.5.3", "winapi", ] @@ -1078,6 +1433,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" version = "2.5.0" @@ -1091,8 +1457,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c89a757e762896bdbdfadf2860d0f8b0cea5e363d8cf3e7bdfeb63d1d976352" dependencies = [ "hermit-abi 0.2.1", - "io-lifetimes", - "rustix", + "io-lifetimes 0.5.3", + "rustix 0.33.7", "winapi", ] @@ -1150,18 +1516,48 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +[[package]] +name = "lexical-sort" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" +dependencies = [ + "any_ascii", +] + [[package]] name = "libc" version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "linux-raw-sys" version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "lock_api" version = "0.4.9" @@ -1238,6 +1634,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.5.3" @@ -1248,10 +1650,40 @@ dependencies = [ ] [[package]] -name = "more-asserts" -version = "0.2.2" +name = "mio" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.45.0", +] + +[[package]] +name = "more-asserts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] [[package]] name = "num_cpus" @@ -1263,6 +1695,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.98", +] + [[package]] name = "object" version = "0.28.3" @@ -1287,6 +1740,50 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "os_str_bytes" version = "6.1.0" @@ -1310,7 +1807,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.13", "smallvec", "windows-sys 0.45.0", ] @@ -1321,12 +1818,38 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +[[package]] +name = "path-clean" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" + [[package]] name = "percent-encoding" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1339,6 +1862,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1391,6 +1920,12 @@ dependencies = [ "version_check", ] +[[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.58" @@ -1518,6 +2053,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -1525,7 +2069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.13", "thiserror", ] @@ -1603,6 +2147,63 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "rkyv" version = "0.7.42" @@ -1638,6 +2239,24 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.17", +] + [[package]] name = "rustix" version = "0.33.7" @@ -1645,15 +2264,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", - "errno", - "io-lifetimes", + "errno 0.2.8", + "io-lifetimes 0.5.3", "itoa", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.42", "once_cell", "winapi", ] +[[package]] +name = "rustix" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes 1.0.10", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.1", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "ryu" version = "1.0.10" @@ -1669,18 +2333,81 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "seahash" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "serde" version = "1.0.137" @@ -1701,6 +2428,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.137" @@ -1723,19 +2460,69 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + [[package]] name = "sha2" version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "shellexpand" version = "2.1.0" @@ -1745,6 +2532,15 @@ dependencies = [ "dirs-next", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "simdutf8" version = "0.1.4" @@ -1769,12 +2565,95 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn 1.0.98", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn 1.0.98", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strsim" version = "0.8.0" @@ -1843,8 +2722,8 @@ dependencies = [ "bitflags", "cap-fs-ext", "cap-std", - "io-lifetimes", - "rustix", + "io-lifetimes 0.5.3", + "rustix 0.33.7", "winapi", "winx", ] @@ -1861,6 +2740,29 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix 0.37.19", + "windows-sys 0.45.0", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "termcolor" version = "1.1.3" @@ -1870,6 +2772,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + [[package]] name = "test-helpers" version = "0.0.0" @@ -1883,9 +2794,9 @@ dependencies = [ "wai-bindgen-gen-c", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", "wai-bindgen-gen-spidermonkey", - "wai-bindgen-gen-wasmer 0.2.3", + "wai-bindgen-gen-wasmer", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", @@ -1897,7 +2808,7 @@ name = "test-rust-wasm" version = "0.2.3" dependencies = [ "futures-util", - "wai-bindgen-rust", + "wai-bindgen-rust 0.2.3", ] [[package]] @@ -1919,16 +2830,107 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" name = "thiserror" version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.98", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ - "thiserror-impl", + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", ] [[package]] -name = "thiserror-impl" -version = "1.0.40" +name = "tokio-macros" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", @@ -1936,28 +2938,38 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.1.4" +name = "tokio-native-tls" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ - "once_cell", + "native-tls", + "tokio", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tokio-rustls" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" dependencies = [ - "tinyvec_macros", + "rustls", + "tokio", ] [[package]] -name = "tinyvec_macros" -version = "0.1.0" +name = "tokio-util" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] [[package]] name = "toml" @@ -1968,11 +2980,17 @@ dependencies = [ "serde", ] +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + [[package]] name = "tracing" -version = "0.1.35" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -1983,24 +3001,30 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.98", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + [[package]] name = "typenum" version = "1.15.0" @@ -2055,6 +3079,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.3.1" @@ -2064,14 +3094,27 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" + [[package]] name = "uuid" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "vec_map" version = "0.8.2" @@ -2084,6 +3127,40 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "virtual-fs" +version = "0.2.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "derivative", + "filetime", + "fs_extra", + "getrandom", + "indexmap", + "lazy_static", + "libc", + "pin-project-lite", + "slab", + "thiserror", + "tokio", + "tracing", + "webc", +] + +[[package]] +name = "virtual-net" +version = "0.1.0" +dependencies = [ + "async-trait", + "bytes", + "libc", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "wai-bindgen-cli" version = "0.2.3" @@ -2094,9 +3171,9 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", "wai-bindgen-gen-spidermonkey", - "wai-bindgen-gen-wasmer 0.2.3", + "wai-bindgen-gen-wasmer", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", @@ -2110,13 +3187,13 @@ dependencies = [ "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-js", "wai-bindgen-gen-markdown", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", "wai-bindgen-gen-spidermonkey", - "wai-bindgen-gen-wasmer 0.2.3", + "wai-bindgen-gen-wasmer", "wai-bindgen-gen-wasmer-py", "wai-bindgen-gen-wasmtime", "wai-bindgen-gen-wasmtime-py", - "wai-bindgen-rust", + "wai-bindgen-rust 0.2.3", "wasmprinter", ] @@ -2195,7 +3272,18 @@ dependencies = [ "test-helpers", "wai-bindgen-gen-core 0.2.3", "wai-bindgen-gen-rust 0.2.3", - "wai-bindgen-rust", + "wai-bindgen-rust 0.2.3", +] + +[[package]] +name = "wai-bindgen-gen-rust-wasm" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f35ce5e74086fac87f3a7bd50f643f00fe3559adb75c88521ecaa01c8a6199" +dependencies = [ + "heck 0.3.3", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2223,17 +3311,7 @@ dependencies = [ "wai-bindgen-gen-rust 0.2.3", "wai-bindgen-wasmer 0.4.0", "wasmer 3.3.0", -] - -[[package]] -name = "wai-bindgen-gen-wasmer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f61484185d8c520a86d5a7f7f8265f446617c2f9774b2e20a52de19b6e53432" -dependencies = [ - "heck 0.3.3", - "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-wasix", ] [[package]] @@ -2290,7 +3368,17 @@ version = "0.2.3" dependencies = [ "async-trait", "bitflags", - "wai-bindgen-rust-impl", + "wai-bindgen-rust-impl 0.2.3", +] + +[[package]] +name = "wai-bindgen-rust" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5601c6f448c063e83a5e931b8fefcdf7e01ada424ad42372c948d2e3d67741" +dependencies = [ + "bitflags", + "wai-bindgen-rust-impl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2300,7 +3388,19 @@ dependencies = [ "proc-macro2", "syn 1.0.98", "wai-bindgen-gen-core 0.2.3", - "wai-bindgen-gen-rust-wasm", + "wai-bindgen-gen-rust-wasm 0.2.3", +] + +[[package]] +name = "wai-bindgen-rust-impl" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeb5c1170246de8425a3e123e7ef260dc05ba2b522a1d369fe2315376efea4" +dependencies = [ + "proc-macro2", + "syn 1.0.98", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust-wasm 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2313,7 +3413,7 @@ dependencies = [ "once_cell", "thiserror", "tracing", - "wai-bindgen-wasmer-impl 0.2.3", + "wai-bindgen-wasmer-impl", "wasmer 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2326,7 +3426,7 @@ dependencies = [ "once_cell", "thiserror", "tracing", - "wai-bindgen-wasmer-impl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-wasmer-impl", "wasmer 3.3.0", ] @@ -2337,19 +3437,7 @@ dependencies = [ "proc-macro2", "syn 1.0.98", "wai-bindgen-gen-core 0.2.3", - "wai-bindgen-gen-wasmer 0.2.3", -] - -[[package]] -name = "wai-bindgen-wasmer-impl" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b3488ed88d4dd0e3bf85bad4e27dac6cb31aae5d122a5dda2424803c8dc863a" -dependencies = [ - "proc-macro2", - "syn 1.0.98", - "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wai-bindgen-gen-wasmer 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-wasmer", ] [[package]] @@ -2421,6 +3509,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "walkdir" version = "2.3.2" @@ -2432,6 +3526,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2452,10 +3556,10 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 0.5.3", "is-terminal", "lazy_static", - "rustix", + "rustix 0.33.7", "system-interface", "tracing", "wasi-common", @@ -2473,7 +3577,7 @@ dependencies = [ "cap-rand", "cap-std", "io-extras", - "rustix", + "rustix 0.33.7", "thiserror", "tracing", "wiggle", @@ -2528,6 +3632,18 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.83" @@ -2743,6 +3859,7 @@ dependencies = [ "indexmap", "more-asserts", "rkyv", + "serde", "target-lexicon", "thiserror", ] @@ -2815,6 +3932,79 @@ dependencies = [ "winapi", ] +[[package]] +name = "wasmer-wasix" +version = "0.4.0" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "bytes", + "cfg-if", + "cooked-waker", + "dashmap", + "derivative", + "futures", + "getrandom", + "heapless", + "hex", + "http", + "lazy_static", + "libc", + "linked_hash_set", + "once_cell", + "pin-project", + "rand", + "reqwest", + "semver 1.0.17", + "serde", + "serde_derive", + "serde_json", + "serde_yaml", + "sha2 0.10.6", + "shellexpand", + "tempfile", + "term_size", + "termios", + "thiserror", + "tokio", + "tracing", + "url", + "urlencoding", + "virtual-fs", + "virtual-net", + "wai-bindgen-wasmer 0.4.0", + "waker-fn", + "wasm-bindgen", + "wasmer 3.3.0", + "wasmer-types 3.3.0", + "wasmer-wasix-types", + "webc", + "weezl", + "winapi", +] + +[[package]] +name = "wasmer-wasix-types" +version = "0.4.0" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "cfg-if", + "num_enum", + "serde", + "time", + "wai-bindgen-gen-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-gen-rust-wasm 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-bindgen-rust 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wai-parser 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer 3.3.0", + "wasmer-derive 3.3.0", + "wasmer-types 3.3.0", +] + [[package]] name = "wasmparser" version = "0.80.2" @@ -2906,14 +4096,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce2aa752e864a33eef2a6629edc59554e75f0bc1719431dac5e49eed516af69" dependencies = [ "anyhow", - "base64", + "base64 0.13.0", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.33.7", "serde", - "sha2", + "sha2 0.9.9", "toml", "winapi", "zstd", @@ -2968,7 +4158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e078bd1a01b8bacd982280eca4dfc22093ae2b19607ae6a38a97278f45aa5fa" dependencies = [ "cc", - "rustix", + "rustix 0.33.7", "winapi", ] @@ -2989,7 +4179,7 @@ dependencies = [ "object", "region 2.2.0", "rustc-demangle", - "rustix", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", @@ -3007,7 +4197,7 @@ checksum = "e6d5dd480cc6dc0a401653e45b79796a3317f8228990d84bc2271bdaf0810071" dependencies = [ "lazy_static", "object", - "rustix", + "rustix 0.33.7", ] [[package]] @@ -3029,7 +4219,7 @@ dependencies = [ "more-asserts", "rand", "region 2.2.0", - "rustix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", "wasmtime-fiber", @@ -3101,6 +4291,67 @@ dependencies = [ "wast 42.0.0", ] +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webc" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06bee486f9207604f99bfa3c95afcd03272d95db5872c6c1b11470be4390d514" +dependencies = [ + "anyhow", + "base64 0.21.1", + "byteorder", + "bytes", + "indexmap", + "leb128", + "lexical-sort", + "memmap2", + "once_cell", + "path-clean", + "rand", + "serde", + "serde_cbor", + "serde_json", + "sha2 0.10.6", + "thiserror", + "url", + "walkdir", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + [[package]] name = "wiggle" version = "0.38.0" @@ -3187,6 +4438,21 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -3349,6 +4615,15 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "winx" version = "0.31.0" @@ -3356,7 +4631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d5973cb8cd94a77d03ad7e23bbe14889cb29805da1cec0e4aff75e21aebded" dependencies = [ "bitflags", - "io-lifetimes", + "io-lifetimes 0.5.3", "winapi", ] @@ -3381,6 +4656,15 @@ dependencies = [ "tap", ] +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" From b00b05bc9780e18486aeb634c4b64f83820501be Mon Sep 17 00:00:00 2001 From: kajacx Date: Wed, 24 May 2023 21:17:31 +0200 Subject: [PATCH 10/10] Remove old code --- crates/gen-wasmer/src/lib.rs | 178 +------------- crates/test/Cargo.toml | 27 -- crates/test/expanded.rs | 463 ----------------------------------- crates/test/src/lib.rs | 2 - tests/codegen/my-imports.wai | 22 -- 5 files changed, 4 insertions(+), 688 deletions(-) delete mode 100644 crates/test/Cargo.toml delete mode 100644 crates/test/expanded.rs delete mode 100644 crates/test/src/lib.rs delete mode 100644 tests/codegen/my-imports.wai diff --git a/crates/gen-wasmer/src/lib.rs b/crates/gen-wasmer/src/lib.rs index f9a82ce4..430ecc64 100644 --- a/crates/gen-wasmer/src/lib.rs +++ b/crates/gen-wasmer/src/lib.rs @@ -666,8 +666,10 @@ impl Generator for Wasmer { ); } - self.src.push_str("#[allow(unused_mut, unused_variables)]\n"); - self.src.push_str("let (data_mut, mut store) = store.data_and_store_mut();\n"); + self.src + .push_str("#[allow(unused_mut, unused_variables)]\n"); + self.src + .push_str("let (data_mut, mut store) = store.data_and_store_mut();\n"); if needs_borrow_checker { // TODO: This isn't actually sound and should be replaced with use @@ -680,8 +682,6 @@ impl Generator for Wasmer { ); } - // self.src.push_str("let data_mut = store.data_mut();\n"); - if !self.all_needed_handles.is_empty() { self.src .push_str("let tables = data_mut.tables.borrow_mut();\n"); @@ -1666,7 +1666,6 @@ impl Bindgen for FunctionBindgen<'_> { let name = &iface.resources[*ty].name; results.push(format!( "{{ - // let data_mut = store.data_mut(); let mut tables = data_mut.tables.borrow_mut(); tables.{}_table.insert({}) as i32 }}", @@ -2377,172 +2376,3 @@ fn sorted_iter(map: &HashMap) -> impl Iterator list.sort_by_key(|p| p.0); list.into_iter() } - - -#[cfg(test)] -pub mod simple_lists { - #[allow(unused_imports)] - use wai_bindgen_wasmer::{anyhow, wasmer}; - pub trait SimpleLists: Sized + Send + Sync + 'static{ - fn simple_list1(&mut self,l: &[Le],) -> (); - - fn simple_list2(&mut self,) -> Vec; - - fn simple_list4(&mut self,l: Vec<&[Le]>,) -> Vec>; - - } - pub struct LazyInitialized { - memory: wasmer::Memory, - func_canonical_abi_realloc: wasmer::TypedFunction<(i32, i32, i32, i32), i32>, - } - - #[must_use = "The returned initializer function must be called - with the instance and the store before starting the runtime"] - pub fn add_to_imports(store: &mut wasmer::Store, imports: &mut wasmer::Imports, data: T) - -> impl FnOnce(&wasmer::Instance, &dyn wasmer::AsStoreRef) -> Result<(), anyhow::Error> - where T: SimpleLists - { - #[derive(Clone)]struct EnvWrapper { - data: T, - lazy: std::rc::Rc>, - } - unsafe impl Send for EnvWrapper {} - unsafe impl Sync for EnvWrapper {} - let lazy = std::rc::Rc::new(OnceCell::new()); - let env = EnvWrapper { - data, - lazy: std::rc::Rc::clone(&lazy), - }; - let env = wasmer::FunctionEnv::new(&mut *store, env); - let mut exports = wasmer::Exports::new(); - let mut store = store.as_store_mut(); - exports.insert( - "simple-list1", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32| -> Result<(), wasmer::RuntimeError> { - let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - let _memory_view = _memory.view(&store); - let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { - _memory_view.data_unchecked_mut() - }); - let data_mut = store.data_mut(); - let ptr0 = arg0; - let len0 = arg1; - let param0 = _bc.slice(ptr0, len0)?; - let host = &mut data_mut.data; - let result = host.simple_list1(param0, ); - let () = result; - Ok(()) - } - )); - exports.insert( - "simple-list2", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move |mut store: wasmer::FunctionEnvMut>,arg0:i32| -> Result<(), wasmer::RuntimeError> { - let func_canonical_abi_realloc = store - .data() - .lazy - .get() - .unwrap() - .func_canonical_abi_realloc - .clone(); - let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - let data_mut = store.data_mut(); - let host = &mut data_mut.data; - let result = host.simple_list2(); - let vec0 = result; - let ptr0 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec0.len() as i32) * 4)?; - let _memory_view = _memory.view(&store); - let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; - caller_memory.store_many(ptr0, &vec0)?; - caller_memory.store(arg0 + 4, wai_bindgen_wasmer::rt::as_i32(vec0.len() as i32))?; - caller_memory.store(arg0 + 0, wai_bindgen_wasmer::rt::as_i32(ptr0))?; - Ok(()) - } - )); - exports.insert( - "simple-list4", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move |mut store: wasmer::FunctionEnvMut>,arg0:i32,arg1:i32,arg2:i32| -> Result<(), wasmer::RuntimeError> { - let func_canonical_abi_realloc = store - .data() - .lazy - .get() - .unwrap() - .func_canonical_abi_realloc - .clone(); - let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); - let _memory_view = _memory.view(&store); - let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { - _memory_view.data_unchecked_mut() - }); - let data_mut = store.data_mut(); - let len3 = arg1; - let base3 = arg0; - let mut result3 = Vec::with_capacity(len3 as usize); - for i in 0..len3 { - let base = base3 + i *8; - result3.push({ - let load0 = _bc.load::(base + 0)?; - let load1 = _bc.load::(base + 4)?; - let ptr2 = load0; - let len2 = load1; - _bc.slice(ptr2, len2)? - }); - } - let param0 = result3; - let host = &mut data_mut.data; - let result = host.simple_list4(param0, ); - let vec5 = result; - let len5 = vec5.len() as i32; - let result5 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, len5 * 8)?; - for (i, e) in vec5.into_iter().enumerate() { - let base = result5 + (i as i32) * 8; - { - let vec4 = e; - let ptr4 = func_canonical_abi_realloc.call(&mut store.as_store_mut(), 0, 0, 4, (vec4.len() as i32) * 4)?; - let _memory_view = _memory.view(&store); - let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; - caller_memory.store_many(ptr4, &vec4)?; - caller_memory.store(base + 4, wai_bindgen_wasmer::rt::as_i32(vec4.len() as i32))?; - caller_memory.store(base + 0, wai_bindgen_wasmer::rt::as_i32(ptr4))?; - }}let _memory_view = _memory.view(&store); - let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; - caller_memory.store(arg2 + 4, wai_bindgen_wasmer::rt::as_i32(len5))?; - caller_memory.store(arg2 + 0, wai_bindgen_wasmer::rt::as_i32(result5))?; - Ok(()) - } - )); - imports.register_namespace("simple-lists", exports); - move |_instance: &wasmer::Instance, _store: &dyn wasmer::AsStoreRef| { - let memory = _instance.exports.get_memory("memory")?.clone(); - let func_canonical_abi_realloc = _instance - .exports - .get_typed_function( - &_store.as_store_ref(), - "canonical_abi_realloc", - ) - .unwrap() - .clone(); - lazy.set(LazyInitialized { - memory, - func_canonical_abi_realloc, - }) - .map_err(|_e| anyhow::anyhow!("Couldn't set lazy initialized data"))?; - Ok(()) - } - } - use wai_bindgen_wasmer::once_cell::unsync::OnceCell; - #[allow(unused_imports)] - use wasmer::AsStoreMut as _; - #[allow(unused_imports)] - use wasmer::AsStoreRef as _; - use wai_bindgen_wasmer::rt::RawMem; - use wai_bindgen_wasmer::Le; - } diff --git a/crates/test/Cargo.toml b/crates/test/Cargo.toml deleted file mode 100644 index 858681f6..00000000 --- a/crates/test/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "wai-bindgen-gen-wasmer-test" -description = "for testing, please REMOVE BEFORE MAKING A PULL REQUEST" -authors.workspace = true -edition.workspace = true -homepage.workspace = true -license.workspace = true -readme.workspace = true -repository.workspace = true -rust-version.workspace = true -version.workspace = true - -[lib] -test = false -doctest = false - -[dependencies] -wai-bindgen-gen-core = { path = "../gen-core", version = "0.2.3" } -wai-bindgen-gen-rust = { path = "../gen-rust", version = "0.2.3" } -heck = "0.3" -structopt = { version = "0.3", default-features = false, optional = true } - -anyhow = "1.0" - -# Use wasmer from source for testing. REMOVE BEFORE MAKING A PULL REQUEST!!! -wai-bindgen-wasmer = { path = "../../../wasmer/lib/wai-bindgen-wasmer", features = ["tracing"] } -wasmer = { path = "../../../wasmer/lib/api" } diff --git a/crates/test/expanded.rs b/crates/test/expanded.rs deleted file mode 100644 index e148267e..00000000 --- a/crates/test/expanded.rs +++ /dev/null @@ -1,463 +0,0 @@ -#![feature(prelude_import)] -#[prelude_import] -use std::prelude::rust_2021::*; -#[macro_use] -extern crate std; -#[allow(clippy::all)] -pub mod imports { - #[allow(unused_imports)] - use wai_bindgen_wasmer::{anyhow, wasmer}; - pub trait Imports: Sized + Send + Sync + 'static { - fn many_arguments( - &mut self, - a1: u64, - a2: u64, - a3: u64, - a4: u64, - a5: u64, - a6: u64, - a7: u64, - a8: u64, - a9: u64, - a10: u64, - a11: u64, - a12: u64, - a13: u64, - a14: u64, - a15: u64, - a16: u64, - a17: u64, - a18: u64, - a19: u64, - a20: u64, - ) -> (); - } - pub struct LazyInitialized { - memory: wasmer::Memory, - } - #[must_use = "The returned initializer function must be called - with the instance and the store before starting the runtime"] - pub fn add_to_imports( - store: &mut wasmer::Store, - imports: &mut wasmer::Imports, - data: T, - ) -> impl FnOnce( - &wasmer::Instance, - &dyn wasmer::AsStoreRef, - ) -> Result<(), anyhow::Error> - where - T: Imports, - { - struct EnvWrapper { - data: T, - lazy: std::rc::Rc>, - } - #[automatically_derived] - impl ::core::clone::Clone for EnvWrapper { - #[inline] - fn clone(&self) -> EnvWrapper { - EnvWrapper { - data: ::core::clone::Clone::clone(&self.data), - lazy: ::core::clone::Clone::clone(&self.lazy), - } - } - } - unsafe impl Send for EnvWrapper {} - unsafe impl Sync for EnvWrapper {} - let lazy = std::rc::Rc::new(OnceCell::new()); - let env = EnvWrapper { - data, - lazy: std::rc::Rc::clone(&lazy), - }; - let env = wasmer::FunctionEnv::new(&mut *store, env); - let mut exports = wasmer::Exports::new(); - let mut store = store.as_store_mut(); - exports - .insert( - "many-arguments", - wasmer::Function::new_typed_with_env( - &mut store, - &env, - move | - mut store: wasmer::FunctionEnvMut>, - arg0: i32, - | -> Result<(), wasmer::RuntimeError> { - let span = { - use ::tracing::__macro_support::Callsite as _; - static CALLSITE: ::tracing::callsite::DefaultCallsite = { - static META: ::tracing::Metadata<'static> = { - ::tracing_core::metadata::Metadata::new( - "wai-bindgen abi", - "wai_bindgen_gen_wasmer_test::imports", - wai_bindgen_wasmer::tracing::Level::TRACE, - Some("crates/test/src/lib.rs"), - Some(2u32), - Some("wai_bindgen_gen_wasmer_test::imports"), - ::tracing_core::field::FieldSet::new( - &["module", "function"], - ::tracing_core::callsite::Identifier(&CALLSITE), - ), - ::tracing::metadata::Kind::SPAN, - ) - }; - ::tracing::callsite::DefaultCallsite::new(&META) - }; - let mut interest = ::tracing::subscriber::Interest::never(); - if wai_bindgen_wasmer::tracing::Level::TRACE - <= ::tracing::level_filters::STATIC_MAX_LEVEL - && wai_bindgen_wasmer::tracing::Level::TRACE - <= ::tracing::level_filters::LevelFilter::current() - && { - interest = CALLSITE.interest(); - !interest.is_never() - } - && ::tracing::__macro_support::__is_enabled( - CALLSITE.metadata(), - interest, - ) - { - let meta = CALLSITE.metadata(); - ::tracing::Span::new( - meta, - &{ - #[allow(unused_imports)] - use ::tracing::field::{debug, display, Value}; - let mut iter = meta.fields().iter(); - meta.fields() - .value_set( - &[ - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some(&"imports" as &Value), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some(&"many-arguments" as &Value), - ), - ], - ) - }, - ) - } else { - let span = ::tracing::__macro_support::__disabled_span( - CALLSITE.metadata(), - ); - {}; - span - } - }; - let _enter = span.enter(); - let _memory: wasmer::Memory = store - .data() - .lazy - .get() - .unwrap() - .memory - .clone(); - let _memory_view = _memory.view(&store); - let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { - _memory_view.data_unchecked_mut() - }); - let data_mut = store.data_mut(); - let load0 = _bc.load::(arg0 + 0)?; - let load1 = _bc.load::(arg0 + 8)?; - let load2 = _bc.load::(arg0 + 16)?; - let load3 = _bc.load::(arg0 + 24)?; - let load4 = _bc.load::(arg0 + 32)?; - let load5 = _bc.load::(arg0 + 40)?; - let load6 = _bc.load::(arg0 + 48)?; - let load7 = _bc.load::(arg0 + 56)?; - let load8 = _bc.load::(arg0 + 64)?; - let load9 = _bc.load::(arg0 + 72)?; - let load10 = _bc.load::(arg0 + 80)?; - let load11 = _bc.load::(arg0 + 88)?; - let load12 = _bc.load::(arg0 + 96)?; - let load13 = _bc.load::(arg0 + 104)?; - let load14 = _bc.load::(arg0 + 112)?; - let load15 = _bc.load::(arg0 + 120)?; - let load16 = _bc.load::(arg0 + 128)?; - let load17 = _bc.load::(arg0 + 136)?; - let load18 = _bc.load::(arg0 + 144)?; - let load19 = _bc.load::(arg0 + 152)?; - let param0 = load0 as u64; - let param1 = load1 as u64; - let param2 = load2 as u64; - let param3 = load3 as u64; - let param4 = load4 as u64; - let param5 = load5 as u64; - let param6 = load6 as u64; - let param7 = load7 as u64; - let param8 = load8 as u64; - let param9 = load9 as u64; - let param10 = load10 as u64; - let param11 = load11 as u64; - let param12 = load12 as u64; - let param13 = load13 as u64; - let param14 = load14 as u64; - let param15 = load15 as u64; - let param16 = load16 as u64; - let param17 = load17 as u64; - let param18 = load18 as u64; - let param19 = load19 as u64; - { - use ::tracing::__macro_support::Callsite as _; - static CALLSITE: ::tracing::callsite::DefaultCallsite = { - static META: ::tracing::Metadata<'static> = { - ::tracing_core::metadata::Metadata::new( - "event crates/test/src/lib.rs:2", - "wai_bindgen_gen_wasmer_test::imports", - wai_bindgen_wasmer::tracing::Level::TRACE, - Some("crates/test/src/lib.rs"), - Some(2u32), - Some("wai_bindgen_gen_wasmer_test::imports"), - ::tracing_core::field::FieldSet::new( - &[ - "a1", - "a2", - "a3", - "a4", - "a5", - "a6", - "a7", - "a8", - "a9", - "a10", - "a11", - "a12", - "a13", - "a14", - "a15", - "a16", - "a17", - "a18", - "a19", - "a20", - ], - ::tracing_core::callsite::Identifier(&CALLSITE), - ), - ::tracing::metadata::Kind::EVENT, - ) - }; - ::tracing::callsite::DefaultCallsite::new(&META) - }; - let enabled = wai_bindgen_wasmer::tracing::Level::TRACE - <= ::tracing::level_filters::STATIC_MAX_LEVEL - && wai_bindgen_wasmer::tracing::Level::TRACE - <= ::tracing::level_filters::LevelFilter::current() - && { - let interest = CALLSITE.interest(); - !interest.is_never() - && ::tracing::__macro_support::__is_enabled( - CALLSITE.metadata(), - interest, - ) - }; - if enabled { - (|value_set: ::tracing::field::ValueSet| { - let meta = CALLSITE.metadata(); - ::tracing::Event::dispatch(meta, &value_set); - })({ - #[allow(unused_imports)] - use ::tracing::field::{debug, display, Value}; - let mut iter = CALLSITE.metadata().fields().iter(); - CALLSITE - .metadata() - .fields() - .value_set( - &[ - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m0) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m1) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m2) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m3) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m4) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m5) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m6) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m7) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m8) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m9) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m10) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m11) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m12) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m13) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m14) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m15) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m16) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m17) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m18) - as &Value, - ), - ), - ( - &iter.next().expect("FieldSet corrupted (this is a bug)"), - Some( - &wai_bindgen_wasmer::tracing::field::debug(¶m19) - as &Value, - ), - ), - ], - ) - }); - } else { - } - }; - let host = &mut data_mut.data; - let result = host - .many_arguments( - param0, - param1, - param2, - param3, - param4, - param5, - param6, - param7, - param8, - param9, - param10, - param11, - param12, - param13, - param14, - param15, - param16, - param17, - param18, - param19, - ); - let () = result; - Ok(()) - }, - ), - ); - imports.register_namespace("imports", exports); - move |_instance: &wasmer::Instance, _store: &dyn wasmer::AsStoreRef| { - let memory = _instance.exports.get_memory("memory")?.clone(); - lazy.set(LazyInitialized { memory }) - .map_err(|_e| ::anyhow::__private::must_use({ - let error = ::anyhow::__private::format_err( - format_args!("Couldn\'t set lazy initialized data"), - ); - error - }))?; - Ok(()) - } - } - use wai_bindgen_wasmer::once_cell::unsync::OnceCell; - #[allow(unused_imports)] - use wasmer::AsStoreMut as _; - #[allow(unused_imports)] - use wasmer::AsStoreRef as _; - use wai_bindgen_wasmer::rt::RawMem; -} -const _: &str = "many-arguments: func(\n a1: u64,\n a2: u64,\n a3: u64,\n a4: u64,\n a5: u64,\n a6: u64,\n a7: u64,\n a8: u64,\n a9: u64,\n a10: u64,\n a11: u64,\n a12: u64,\n a13: u64,\n a14: u64,\n a15: u64,\n a16: u64,\n a17: u64,\n a18: u64,\n a19: u64,\n a20: u64,\n)\n"; diff --git a/crates/test/src/lib.rs b/crates/test/src/lib.rs deleted file mode 100644 index 43f59911..00000000 --- a/crates/test/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ - -wai_bindgen_wasmer::export!("../../tests/runtime/many_arguments/imports.wai"); \ No newline at end of file diff --git a/tests/codegen/my-imports.wai b/tests/codegen/my-imports.wai deleted file mode 100644 index 391bf261..00000000 --- a/tests/codegen/my-imports.wai +++ /dev/null @@ -1,22 +0,0 @@ -many-arguments: func( - a1: u64, - a2: u64, - a3: u64, - a4: u64, - a5: u64, - a6: u64, - a7: u64, - a8: u64, - a9: u64, - a10: u64, - a11: u64, - a12: u64, - a13: u64, - a14: u64, - a15: u64, - a16: u64, - a17: u64, - a18: u64, - a19: u64, - a20: u64, -)