diff --git a/Cargo.lock b/Cargo.lock index 3f40cd1..9207107 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,21 +325,38 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +checksum = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4" dependencies = [ "serde", ] +[[package]] +name = "cargo-util-schemas" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca" +dependencies = [ + "semver", + "serde", + "serde-untagged", + "serde-value", + "thiserror 1.0.69", + "toml", + "unicode-xid", + "url", +] + [[package]] name = "cargo_metadata" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502" dependencies = [ "camino", "cargo-platform", + "cargo-util-schemas", "semver", "serde", "serde_json", @@ -842,6 +859,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[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.10" @@ -1291,6 +1318,7 @@ dependencies = [ name = "hyperlight-wasm-aot" version = "0.1.0" dependencies = [ + "cargo-util-schemas", "cargo_metadata", "clap", "wasmtime", @@ -1735,7 +1763,7 @@ dependencies = [ "hashbrown", "indexmap", "metrics", - "ordered-float", + "ordered-float 4.6.0", "quanta", "radix_trie", "rand", @@ -1901,6 +1929,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[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 = "ordered-float" version = "4.6.0" @@ -2513,6 +2550,27 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "299d9c19d7d466db4ab10addd5703e4c615dec2a5a16dbbafe191045e87ee66e" +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 2.10.1", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.217" @@ -2931,6 +2989,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 = "typenum" version = "1.17.0" diff --git a/src/hyperlight_wasm_aot/Cargo.toml b/src/hyperlight_wasm_aot/Cargo.toml index 88987ba..55ce39e 100644 --- a/src/hyperlight_wasm_aot/Cargo.toml +++ b/src/hyperlight_wasm_aot/Cargo.toml @@ -6,4 +6,5 @@ edition = "2021" [dependencies] wasmtime = { version = "30.0.2", default-features = false, features = ["cranelift", "runtime", "component-model" ] } clap = "4.5" -cargo_metadata = "0.19" +cargo_metadata = "0.20" +cargo-util-schemas = "=0.2.0" diff --git a/src/hyperlight_wasm_aot/src/main.rs b/src/hyperlight_wasm_aot/src/main.rs index dbdcf7f..c4e7b67 100644 --- a/src/hyperlight_wasm_aot/src/main.rs +++ b/src/hyperlight_wasm_aot/src/main.rs @@ -17,6 +17,7 @@ limitations under the License. use std::path::Path; use cargo_metadata::{MetadataCommand, Package}; +use cargo_util_schemas::manifest::PackageName; use clap::{Arg, Command}; use wasmtime::{Config, Engine, Module, Precompiled}; fn main() { @@ -85,8 +86,9 @@ fn main() { Some("check-wasmtime-version") => { // get the wasmtime version used by hyperlight-wasm-aot let metadata = MetadataCommand::new().exec().unwrap(); + let package_name = PackageName::new("wasmtime".to_string()).unwrap(); let wasmtime_package: Option<&Package> = - metadata.packages.iter().find(|p| p.name == "wasmtime"); + metadata.packages.iter().find(|p| p.name == package_name); let version_number = match wasmtime_package { Some(pkg) => pkg.version.clone(), None => panic!("wasmtime dependency not found"),