diff --git a/src/wasm_runtime/Cargo.lock b/src/wasm_runtime/Cargo.lock index 31d94e9..f2258f5 100644 --- a/src/wasm_runtime/Cargo.lock +++ b/src/wasm_runtime/Cargo.lock @@ -103,21 +103,38 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.9" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8abf5d501fd757c2d2ee78d0cc40f606e92e3a63544420316565556ed28485e2" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-util-schemas" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +checksum = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830" dependencies = [ + "semver", "serde", + "serde-untagged", + "serde-value", + "thiserror", + "toml", + "unicode-xid", + "url", ] [[package]] name = "cargo_metadata" -version = "0.19.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +checksum = "0c3f56c207c76c07652489840ff98687dcf213de178ac0974660d6fefeaf5ec6" dependencies = [ "camino", "cargo-platform", + "cargo-util-schemas", "semver", "serde", "serde_json", @@ -156,36 +173,36 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3870e823d79cafc9c868fbea77e83fc12ec9c0e87f17ad392c71a55ec01f12a9" +checksum = "0920ef6863433fa28ece7e53925be4cd39a913adba2dc3738f4edd182f76d168" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9fe971fab18724cbfc9a0579dd9cb6e370891991ccc8f85f3390d81392a3c0" +checksum = "8990a217e2529a378af1daf4f8afa889f928f07ebbde6ae2f058ae60e40e2c20" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac391df81890fc9f820461e76fb344bcebcbf72614ef99bdd03d9fb1a8cdcc5e" +checksum = "62225596b687f69a42c038485a28369badc186cb7c74bd9436eeec9f539011b1" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712de3ed567438f3ca42d12547dbf30d92aef37d63ae45eabe32dd53c4ee5d00" +checksum = "c23914fc4062558650a6f0d8c1846c97b541215a291fdeabc85f68bdc9bbcca3" dependencies = [ "serde", "serde_derive", @@ -193,9 +210,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e6fc48d06ef89c1ad3675fe093f2642d260eea8ceb96a9ee9ae94e51698277" +checksum = "41a238b2f7e7ec077eb170145fa15fd8b3d0f36cc83d8e354e29ca550f339ca7" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -220,9 +237,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45a98cfcd528bd06c6ef2fd1846cda3695d41bd4b2823ce965a82f4abec362f" +checksum = "9315ddcc2512513a9d66455ec89bb70ae5498cb472f5ed990230536f4cd5c011" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -233,24 +250,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b12b2fef743dffdb51a5cdb95f5f92ab263ed518a7ec73aa272a4a86ea17bf" +checksum = "dc6acea40ef860f28cb36eaad479e26556c1e538b0a66fc44598cf1b1689393d" [[package]] name = "cranelift-control" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc203df5ac23968c8ded672b6c4b6dbc0639521e50b8d27ac67c2e221f3c98b" +checksum = "6b2af895da90761cfda4a4445960554fcec971e637882eda5a87337d993fe1b9" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d01c5dca220ed9c664a4c0cf2085aa0bebaddc306be365bdd2691d4a55dd2ae" +checksum = "6e8c542c856feb50d504e4fc0526b3db3a514f882a9f68f956164531517828ab" dependencies = [ "cranelift-bitset", "serde", @@ -259,9 +276,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd02bd4641b10658668bf195ef92af0ecffa49a8a563de8e98f0c2d843a229d" +checksum = "9996dd9c20929c03360fe0c4edf3594c0cbb94525bdbfa04b6bb639ec14573c7" dependencies = [ "cranelift-codegen", "log", @@ -271,15 +288,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51da2281ea3db0b1f6029b4321acf541ef856baafdf16e990d64953c9737bc3f" +checksum = "928b8dccad51b9e0ffe54accbd617da900239439b13d48f0f122ab61105ca6ad" [[package]] name = "cranelift-native" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff037ce35e9d513dcf64e9f613ec4816cb7b0b1b0b4e23788745f2200d278fec" +checksum = "7f75ef0a6a2efed3a2a14812318e28dc82c214eab5399c13d70878e2f88947b5" dependencies = [ "cranelift-codegen", "libc", @@ -288,9 +305,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.123.1" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13dc01a8588b7f7733de0c31b766d85cac04aec078897cde706cebd891f8212" +checksum = "673bd6d1c83cb41d60afb140a1474ef6caf1a3e02f3820fc522aefbc93ac67d6" [[package]] name = "crc32fast" @@ -345,6 +362,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "erased-serde" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.13" @@ -970,6 +997,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + [[package]] name = "object" version = "0.36.7" @@ -997,6 +1033,15 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -1066,9 +1111,9 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c53c41637e4052ec0010b923a3ffc99a124f2b6f19062147eae6458904d3e46" +checksum = "e4e2d31146038fd9e62bfa331db057aca325d5ca10451a9fe341356cead7da53" dependencies = [ "cranelift-bitset", "log", @@ -1078,9 +1123,9 @@ dependencies = [ [[package]] name = "pulley-macros" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed513b785fd6b142c6708c29990d92475971df8370b018c2c236dfd1c47b77d" +checksum = "efb9fdafaca625f9ea8cfa793364ea1bdd32d306cff18f166b00ddaa61ecbb27" dependencies = [ "proc-macro2", "quote", @@ -1359,6 +1404,27 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34836a629bcbc6f1afdf0907a744870039b1e14c0561cb26094fa683b158eff3" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.219" @@ -1382,6 +1448,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1583,6 +1658,47 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "toml_write", + "winnow", +] + +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + [[package]] name = "tower" version = "0.5.2" @@ -1653,6 +1769,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "unicode-ident" version = "1.0.18" @@ -1835,9 +1957,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72eb410993c268be048b7745a49649e3390348b0fe9ee050253a74a79192574f" +checksum = "5b3e1fab634681494213138ea3a18e958e5ea99da13a4a01a4b870d51a41680b" dependencies = [ "anyhow", "bitflags", @@ -1875,9 +1997,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d3047dfcd4c0eeb2dbd9d639dd4eef65cbe53f17211c549543f208466246ed" +checksum = "6750e519977953a018fe994aada7e02510aea4babb03310aa5f5b4145b6e6577" dependencies = [ "anyhow", "cranelift-bitset", @@ -1900,18 +2022,18 @@ dependencies = [ [[package]] name = "wasmtime-internal-asm-macros" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c3ac22f7209c35a913b4423a9f83fc12b74239af3cb5ac6c39a5df34e1970b" +checksum = "bdbf38adac6e81d5c0326e8fd25f80450e3038f2fc103afd3c5cc8b83d5dd78b" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-internal-component-macro" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0badcd2acaa2901910a2ec0815abd24b80ffeecb5683029082e26220be2b44c5" +checksum = "26a578a474e3b7ddce063cd169ced292b5185013341457522891b10e989aa42a" dependencies = [ "anyhow", "proc-macro2", @@ -1924,15 +2046,15 @@ dependencies = [ [[package]] name = "wasmtime-internal-component-util" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399a9f4d25c0dcf4829751cbb63de438f3b715abc49277c15c86460539f4a7e7" +checksum = "edc23d46ec1b1cd42b6f73205eb80498ed94b47098ec53456c0b18299405b158" [[package]] name = "wasmtime-internal-cranelift" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41370ede67231853b2f96a7f03b8e3db61802ad3ee0d7497b366f815e616f4fc" +checksum = "d85b8ba128525bff91b89ac8a97755136a4fb0fb59df5ffb7539dd646455d441" dependencies = [ "anyhow", "cfg-if", @@ -1957,24 +2079,24 @@ dependencies = [ [[package]] name = "wasmtime-internal-math" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d8b81a4083aa76d3cd3ebf24f0564b6d17d4faffd47c42dd218798aa5894d4" +checksum = "31d5dad8a609c6cc47a5f265f13b52e347e893450a69641af082b8a276043fa7" dependencies = [ "libm", ] [[package]] name = "wasmtime-internal-slab" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e701cdea321a3c288990dcc1ed7b4c89d120e10bf50052e942243251e710c42" +checksum = "6d152a7b875d62e395bfe0ae7d12e7b47cd332eb380353cce3eb831f9843731d" [[package]] name = "wasmtime-internal-unwinder" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60ddcc1b024ae8e16f043b0dbea676048f3b710efbaa63f2647bc287315b8704" +checksum = "2aaacc0fea00293f7af7e6c25cef74b7d213ebbe7560c86305eec15fc318fab8" dependencies = [ "anyhow", "cfg-if", @@ -1984,9 +2106,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bd56c30d60d617935d1a68272223341b67c27fb3776fee025e481f3ac53cd0" +checksum = "c61c7f75326434944cc5f3b75409a063fa37e537f6247f00f0f733679f0be406" dependencies = [ "proc-macro2", "quote", @@ -1995,9 +2117,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-winch" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a56b31bc1c5b6a62cb400e996947944a3a0545dc8e11790964074269876137" +checksum = "6cfbaa87e1ac4972bb096c9cb1800fedc113e36332cc4bc2c96a2ef1d7c5e750" dependencies = [ "anyhow", "cranelift-codegen", @@ -2012,9 +2134,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-wit-bindgen" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9816c753aaa5591c45f3ccfb9f2ecf9ea9bbffabc1ad628818803bd12e34ba" +checksum = "169042d58002f16da149ab7d608b71164411abd1fc5140f48f4c200b44bb5565" dependencies = [ "anyhow", "bitflags", @@ -2063,9 +2185,9 @@ dependencies = [ [[package]] name = "winch-codegen" -version = "36.0.1" +version = "36.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ac81262abfb835f3f46f64715863fa2737c2928fab58db74ec98710e3e261a" +checksum = "6e615fe205d7d4c9aa62217862f2e0969d00b9b0843af0b1b8181adaea3cfef3" dependencies = [ "anyhow", "cranelift-assembler-x64", @@ -2243,6 +2365,15 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +[[package]] +name = "winnow" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen-rt" version = "0.39.0" diff --git a/src/wasm_runtime/Cargo.toml b/src/wasm_runtime/Cargo.toml index 2929511..77f47a8 100644 --- a/src/wasm_runtime/Cargo.toml +++ b/src/wasm_runtime/Cargo.toml @@ -21,7 +21,7 @@ spin = "0.9.8" [build-dependencies] cc = "1.2" cfg-if = { version = "1" } -cargo_metadata = "0.19" +cargo_metadata = "0.22" reqwest = {version = "0.12", default-features = false, features = ["blocking","rustls-tls"] } [workspace] # indicate that this crate is not part of any workspace diff --git a/src/wasm_runtime/build.rs b/src/wasm_runtime/build.rs index 2244ce8..d5d8d70 100644 --- a/src/wasm_runtime/build.rs +++ b/src/wasm_runtime/build.rs @@ -36,7 +36,7 @@ fn main() { let metadata = MetadataCommand::new().exec().unwrap(); let wasmtime_package: Option<&Package> = - metadata.packages.iter().find(|p| p.name == "wasmtime"); + metadata.packages.iter().find(|p| *p.name == "wasmtime"); let version_number = match wasmtime_package { Some(pkg) => pkg.version.clone(), None => panic!("wasmtime dependency not found"),