diff --git a/Cargo.lock b/Cargo.lock index 50165a8..d527729 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,7 +86,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.26.2", "rustc-demangle", ] @@ -213,23 +213,23 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15013642ddda44eebcf61365b2052a23fd8b7314f90ba44aa059ec02643c5139" +checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.78.0", ] [[package]] name = "cranelift-codegen" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298f2a7ed5fdcb062d8e78b7496b0f4b95265d20245f2d0ca88f846dd192a3a3" +checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-entity", + "cranelift-entity 0.78.0", "gimli", "log", "regalloc", @@ -239,19 +239,19 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf504261ac62dfaf4ffb3f41d88fd885e81aba947c1241275043885bc5f0bac" +checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", + "cranelift-entity 0.78.0", ] [[package]] name = "cranelift-codegen-shared" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd2a72db4301dbe7e5a4499035eedc1e82720009fb60603e20504d8691fa9cd" +checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be" [[package]] name = "cranelift-entity" @@ -262,11 +262,20 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.78.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a45d8d6318bf8fc518154d9298eab2a8154ec068a8885ff113f6db8d69bb3a" +dependencies = [ + "serde", +] + [[package]] name = "cranelift-frontend" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351c9d13b4ecd1a536215ec2fd1c3ee9ee8bc31af172abf1e45ed0adb7a931df" +checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525" dependencies = [ "cranelift-codegen", "log", @@ -276,9 +285,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df8b556663d7611b137b24db7f6c8d9a8a27d7f29c7ea7835795152c94c1b75" +checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b" dependencies = [ "cranelift-codegen", "libc", @@ -287,18 +296,18 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.77.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a69816d90db694fa79aa39b89dda7208a4ac74b6f2b8f3c4da26ee1c8bdfc5e" +checksum = "1f46fec547a1f8a32c54ea61c28be4f4ad234ad95342b718a9a9adcaadb0c778" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.78.0", "cranelift-frontend", "itertools", "log", "smallvec", - "wasmparser", - "wasmtime-types", + "wasmparser 0.81.0", + "wasmtime-types 0.31.0", ] [[package]] @@ -346,8 +355,8 @@ dependencies = [ "log", "structopt", "wasi-common", - "wasmparser", - "wasmtime", + "wasmparser 0.80.1", + "wasmtime 0.31.0", "wasmtime-wasi", "wat", ] @@ -604,6 +613,17 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "crc32fast", + "indexmap", + "memchr", +] + [[package]] name = "once_cell" version = "1.8.0" @@ -740,9 +760,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.31" +version = "0.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5" +checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4" dependencies = [ "log", "rustc-hash", @@ -1109,6 +1129,12 @@ version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be92b6dcaa5af4b2a176b29be3bf1402fab9e69d313141185099c7d1684f2dca" +[[package]] +name = "wasmparser" +version = "0.81.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" + [[package]] name = "wasmtime" version = "0.30.0" @@ -1124,40 +1150,70 @@ dependencies = [ "lazy_static", "libc", "log", - "object", + "object 0.26.2", "paste", "psm", "region", "rustc-demangle", "serde", "target-lexicon", - "wasmparser", + "wasmparser 0.80.1", + "wasmtime-environ 0.30.0", + "wasmtime-jit 0.30.0", + "wasmtime-runtime 0.30.0", + "winapi", +] + +[[package]] +name = "wasmtime" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "311d06b0c49346d1fbf48a17052e844036b95a7753c1afb34e8c0af3f6b5bb13" +dependencies = [ + "anyhow", + "backtrace", + "bincode", + "cfg-if", + "cpp_demangle", + "indexmap", + "lazy_static", + "libc", + "log", + "object 0.27.1", + "paste", + "psm", + "region", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmparser 0.81.0", "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-environ 0.31.0", + "wasmtime-jit 0.31.0", + "wasmtime-runtime 0.31.0", "winapi", ] [[package]] name = "wasmtime-cranelift" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99706bacdf5143f7f967d417f0437cce83a724cf4518cb1a3ff40e519d793021" +checksum = "ab3083a47e1ede38aac06a1d9831640d673f9aeda0b82a64e4ce002f3432e2e7" dependencies = [ "anyhow", "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.78.0", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", + "log", "more-asserts", - "object", + "object 0.27.1", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-environ", + "wasmparser 0.81.0", + "wasmtime-environ 0.31.0", ] [[package]] @@ -1168,17 +1224,38 @@ checksum = "ac42cb562a2f98163857605f02581d719a410c5abe93606128c59a10e84de85b" dependencies = [ "anyhow", "cfg-if", - "cranelift-entity", + "cranelift-entity 0.77.0", + "gimli", + "indexmap", + "log", + "more-asserts", + "object 0.26.2", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.80.1", + "wasmtime-types 0.30.0", +] + +[[package]] +name = "wasmtime-environ" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c2d194b655321053bc4111a1aa4ead552655c8a17d17264bc97766e70073510" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-entity 0.78.0", "gimli", "indexmap", "log", "more-asserts", - "object", + "object 0.27.1", "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-types", + "wasmparser 0.81.0", + "wasmtime-types 0.31.0", ] [[package]] @@ -1194,14 +1271,38 @@ dependencies = [ "gimli", "log", "more-asserts", - "object", + "object 0.26.2", "region", "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-environ", - "wasmtime-runtime", + "wasmparser 0.80.1", + "wasmtime-environ 0.30.0", + "wasmtime-runtime 0.30.0", + "winapi", +] + +[[package]] +name = "wasmtime-jit" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864ac8dfe4ce310ac59f16fdbd560c257389cb009ee5d030ac6e30523b023d11" +dependencies = [ + "addr2line", + "anyhow", + "bincode", + "cfg-if", + "gimli", + "log", + "more-asserts", + "object 0.27.1", + "region", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.81.0", + "wasmtime-environ 0.31.0", + "wasmtime-runtime 0.31.0", "winapi", ] @@ -1225,7 +1326,32 @@ dependencies = [ "rand", "region", "thiserror", - "wasmtime-environ", + "wasmtime-environ 0.30.0", + "winapi", +] + +[[package]] +name = "wasmtime-runtime" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab97da813a26b98c9abfd3b0c2d99e42f6b78b749c0646344e2e262d212d8c8b" +dependencies = [ + "anyhow", + "backtrace", + "cc", + "cfg-if", + "indexmap", + "lazy_static", + "libc", + "log", + "mach", + "memoffset", + "more-asserts", + "rand", + "region", + "rsix 0.23.5", + "thiserror", + "wasmtime-environ 0.31.0", "winapi", ] @@ -1235,10 +1361,22 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9b01caf8a204ef634ebac99700e77ba716d3ebbb68a1abbc2ceb6b16dbec9e4" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.77.0", + "serde", + "thiserror", + "wasmparser 0.80.1", +] + +[[package]] +name = "wasmtime-types" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff94409cc3557bfbbcce6b14520ccd6bd3727e965c0fe68d63ef2c185bf379c6" +dependencies = [ + "cranelift-entity 0.78.0", "serde", "thiserror", - "wasmparser", + "wasmparser 0.81.0", ] [[package]] @@ -1250,7 +1388,7 @@ dependencies = [ "anyhow", "wasi-cap-std-sync", "wasi-common", - "wasmtime", + "wasmtime 0.30.0", "wiggle", ] @@ -1292,7 +1430,7 @@ dependencies = [ "bitflags", "thiserror", "tracing", - "wasmtime", + "wasmtime 0.30.0", "wiggle-macro", ] diff --git a/Cargo.toml b/Cargo.toml index 0821807..1074bae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ is-it-maintained-issue-resolution = { repository = "enarx/enarx-wasmldr" } is-it-maintained-open-issues = { repository = "enarx/enarx-wasmldr" } [dependencies] -wasmtime = { version = "0.30", default-features = false, features = ["cranelift"] } +wasmtime = { version = "0.31", default-features = false, features = ["cranelift"] } wasmtime-wasi = { version = "0.30", default-features = false, features = ["sync"] } wasi-common = { version = "0.30", default-features = false } wasmparser = "0.80"