diff --git a/Cargo.lock b/Cargo.lock index baede67..f45ccad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -134,7 +134,7 @@ checksum = "1bf5c3b436b94a1adac74032ff35d8aa5bae6ec2a7900e76432c9ae8dac4d673" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes", + "io-lifetimes 0.3.3", "rustc_version", "winapi", ] @@ -148,7 +148,7 @@ dependencies = [ "ambient-authority", "errno", "fs-set-times", - "io-lifetimes", + "io-lifetimes 0.3.3", "ipnet", "maybe-owned", "once_cell", @@ -177,7 +177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "037334fe2f30ec71bcc51af1e8cbb8a9f9ac6a6b8cbd657d58dfef2ad5b9f19a" dependencies = [ "cap-primitives", - "io-lifetimes", + "io-lifetimes 0.3.3", "ipnet", "rsix 0.23.9", "rustc_version", @@ -260,24 +260,24 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513" +checksum = "62fc68cdb867b7d27b5f33cd65eb11376dfb41a2d09568a1a2c2bc1dc204f4ef" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.80.1", ] [[package]] name = "cranelift-codegen" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c" +checksum = "31253a44ab62588f8235a996cc9b0636d98a299190069ced9628b8547329b47a" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-entity", - "gimli 0.25.0", + "cranelift-entity 0.80.1", + "gimli 0.26.1", "log", "regalloc", "smallvec", @@ -286,19 +286,18 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf" +checksum = "7a20ab4627d30b702fb1b8a399882726d216b8164d3b3fa6189e3bf901506afe" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", ] [[package]] name = "cranelift-codegen-shared" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be" +checksum = "6687d9668dacfed4468361f7578d86bded8ca4db978f734d9b631494bebbb5b8" [[package]] name = "cranelift-entity" @@ -309,11 +308,20 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.80.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77c5d72db97ba2cb36f69037a709edbae0d29cb25503775891e7151c5c874bf" +dependencies = [ + "serde", +] + [[package]] name = "cranelift-frontend" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525" +checksum = "426dca83f63c7c64ea459eb569aadc5e0c66536c0042ed5d693f91830e8750d0" dependencies = [ "cranelift-codegen", "log", @@ -323,9 +331,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b" +checksum = "8007864b5d0c49b026c861a15761785a2871124e401630c03ef1426e6d0d559e" dependencies = [ "cranelift-codegen", "libc", @@ -334,18 +342,18 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.78.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f46fec547a1f8a32c54ea61c28be4f4ad234ad95342b718a9a9adcaadb0c778" +checksum = "94cf12c071415ba261d897387ae5350c4d83c238376c8c5a96514ecfa2ea66a3" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.80.1", "cranelift-frontend", "itertools", "log", "smallvec", "wasmparser", - "wasmtime-types", + "wasmtime-types 0.33.1", ] [[package]] @@ -519,7 +527,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9a6902d89feff48dc1cb9529bf2972cb98100310987b7a0ff9ac4c51adb0aff" dependencies = [ - "io-lifetimes", + "io-lifetimes 0.3.3", "rsix 0.25.1", "winapi", ] @@ -552,7 +560,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" dependencies = [ "fallible-iterator", - "indexmap", "stable_deref_trait", ] @@ -561,6 +568,11 @@ name = "gimli" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] [[package]] name = "glob" @@ -628,6 +640,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "io-lifetimes" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" +dependencies = [ + "winapi", +] + [[package]] name = "ipnet" version = "2.3.1" @@ -692,9 +713,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.108" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "linux-raw-sys" @@ -708,6 +729,12 @@ version = "0.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373555fbb6dbd7a7a9e6527215899c7715f89f1ffa7921eb4ee983642afb8c65" +[[package]] +name = "linux-raw-sys" +version = "0.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" + [[package]] name = "log" version = "0.4.14" @@ -974,9 +1001,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.32" +version = "0.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4" +checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" dependencies = [ "log", "rustc-hash", @@ -1021,7 +1048,7 @@ dependencies = [ "bitflags", "cc", "errno", - "io-lifetimes", + "io-lifetimes 0.3.3", "itoa", "libc", "linux-raw-sys 0.0.28", @@ -1037,7 +1064,7 @@ checksum = "af4da272ce5ef18de07bd84edb77769ce16da0a4ca8f84d4389efafaf0850f9f" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.3.3", "libc", "linux-raw-sys 0.0.29", "rustc_version", @@ -1064,6 +1091,20 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.4.4", + "libc", + "linux-raw-sys 0.0.36", + "winapi", +] + [[package]] name = "same-file" version = "1.0.6" @@ -1174,7 +1215,7 @@ dependencies = [ "bitflags", "cap-fs-ext", "cap-std", - "io-lifetimes", + "io-lifetimes 0.3.3", "rsix 0.23.9", "rustc_version", "winapi", @@ -1325,7 +1366,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11e8cceed59fe60bd092be347343917cbc14b9239536980f09fe34e22c8efbc7" dependencies = [ - "io-lifetimes", + "io-lifetimes 0.3.3", "rustc_version", "winapi", ] @@ -1367,7 +1408,7 @@ dependencies = [ "cap-std", "cap-time-ext", "fs-set-times", - "io-lifetimes", + "io-lifetimes 0.3.3", "lazy_static", "rsix 0.23.9", "system-interface", @@ -1386,7 +1427,7 @@ dependencies = [ "bitflags", "cap-rand", "cap-std", - "io-lifetimes", + "io-lifetimes 0.3.3", "rsix 0.23.9", "thiserror", "tracing", @@ -1405,6 +1446,35 @@ 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", + "paste", + "psm", + "region", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmparser", + "wasmtime-environ 0.31.0", + "wasmtime-jit 0.31.0", + "wasmtime-runtime 0.31.0", + "winapi", +] + +[[package]] +name = "wasmtime" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9c724da92e39a85d2231d4c2a942c8be295211441dbca581c6c3f3f45a9f00" dependencies = [ "anyhow", "async-trait", @@ -1427,19 +1497,19 @@ dependencies = [ "wasmparser", "wasmtime-cache", "wasmtime-cranelift", - "wasmtime-environ", + "wasmtime-environ 0.33.1", "wasmtime-fiber", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-jit 0.33.1", + "wasmtime-runtime 0.33.1", "wat", "winapi", ] [[package]] name = "wasmtime-cache" -version = "0.31.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147930a4995137dc096e5b17a573b446799be2bbaea433e821ce6a80abe2c5" +checksum = "da4439d99100298344567c0eb6916ad5864e99e54760b8177c427e529077fb30" dependencies = [ "anyhow", "base64", @@ -1447,7 +1517,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rsix 0.23.9", + "rustix", "serde", "sha2", "toml", @@ -1457,24 +1527,24 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.31.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3083a47e1ede38aac06a1d9831640d673f9aeda0b82a64e4ce002f3432e2e7" +checksum = "1762765dd69245f00e5d9783b695039e449a7be0f9c5383e4c78465dd6131aeb" dependencies = [ "anyhow", "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.80.1", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.25.0", + "gimli 0.26.1", "log", "more-asserts", "object", "target-lexicon", "thiserror", "wasmparser", - "wasmtime-environ", + "wasmtime-environ 0.33.1", ] [[package]] @@ -1485,7 +1555,7 @@ checksum = "1c2d194b655321053bc4111a1aa4ead552655c8a17d17264bc97766e70073510" dependencies = [ "anyhow", "cfg-if", - "cranelift-entity", + "cranelift-entity 0.78.0", "gimli 0.25.0", "indexmap", "log", @@ -1495,17 +1565,37 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser", - "wasmtime-types", + "wasmtime-types 0.31.0", +] + +[[package]] +name = "wasmtime-environ" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4468301d95ec71710bb6261382efe27d1296447711645e3dbabaea6e4de3504" +dependencies = [ + "anyhow", + "cranelift-entity 0.80.1", + "gimli 0.26.1", + "indexmap", + "log", + "more-asserts", + "object", + "serde", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-types 0.33.1", ] [[package]] name = "wasmtime-fiber" -version = "0.31.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d8822813b51b91e199c44a086c3ca76567e95e7fd563589acb631029eba79e" +checksum = "3a1a60c2e08a38f0aee12d2cc71f0bb2fc03ce6adaccb608c51cb64c15aaa415" dependencies = [ "cc", - "rsix 0.23.9", + "rustix", "winapi", ] @@ -1524,13 +1614,34 @@ dependencies = [ "more-asserts", "object", "region", - "rsix 0.23.9", "serde", "target-lexicon", "thiserror", "wasmparser", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime-environ 0.31.0", + "wasmtime-runtime 0.31.0", + "winapi", +] + +[[package]] +name = "wasmtime-jit" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab0ae6e581ff014b470ec35847ea3c0b4c3ace89a55df5a04c802a11f4574e7d" +dependencies = [ + "addr2line 0.17.0", + "anyhow", + "bincode", + "cfg-if", + "gimli 0.26.1", + "object", + "region", + "rustix", + "serde", + "target-lexicon", + "thiserror", + "wasmtime-environ 0.33.1", + "wasmtime-runtime 0.33.1", "winapi", ] @@ -1543,7 +1654,7 @@ dependencies = [ "jni", "log", "wasi-common", - "wasmtime", + "wasmtime 0.33.1", "wasmtime-jni-exports", "wasmtime-wasi", ] @@ -1573,7 +1684,32 @@ dependencies = [ "region", "rsix 0.23.9", "thiserror", - "wasmtime-environ", + "wasmtime-environ 0.31.0", + "winapi", +] + +[[package]] +name = "wasmtime-runtime" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9c28877ae37a367cda7b52b8887589816152e95dde9b7c80cc686f52761961" +dependencies = [ + "anyhow", + "backtrace", + "cc", + "cfg-if", + "indexmap", + "lazy_static", + "libc", + "log", + "mach", + "memoffset", + "more-asserts", + "rand", + "region", + "rustix", + "thiserror", + "wasmtime-environ 0.33.1", "wasmtime-fiber", "winapi", ] @@ -1584,7 +1720,19 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff94409cc3557bfbbcce6b14520ccd6bd3727e965c0fe68d63ef2c185bf379c6" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.78.0", + "serde", + "thiserror", + "wasmparser", +] + +[[package]] +name = "wasmtime-types" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "395726e8f5dd8c57cb0db445627b842343f7e29ed7489467fdf7953ed9d3cd4f" +dependencies = [ + "cranelift-entity 0.80.1", "serde", "thiserror", "wasmparser", @@ -1599,7 +1747,7 @@ dependencies = [ "anyhow", "wasi-cap-std-sync", "wasi-common", - "wasmtime", + "wasmtime 0.31.0", "wiggle", ] @@ -1641,7 +1789,7 @@ dependencies = [ "bitflags", "thiserror", "tracing", - "wasmtime", + "wasmtime 0.31.0", "wiggle-macro", ] @@ -1711,7 +1859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afba0891d41a50943c32fcea61e124b9dd5755275054b0a3e1e1eba26e671137" dependencies = [ "bitflags", - "io-lifetimes", + "io-lifetimes 0.3.3", "winapi", ] diff --git a/wasmtime-jni/Cargo.toml b/wasmtime-jni/Cargo.toml index cf4e8a6..ad76bdd 100644 --- a/wasmtime-jni/Cargo.toml +++ b/wasmtime-jni/Cargo.toml @@ -17,6 +17,6 @@ flexi_logger = "0.17.1" jni = "0.19.0" log = "0.4.11" wasi-common = "0.31.0" -wasmtime = { version = "0.31", features=["jitdump", "wat", "cache"] } +wasmtime = { version = "0.33", features=["jitdump", "wat", "cache"] } wasmtime-jni-exports = { path = "../wasmtime-jni-exports" } wasmtime-wasi = "0.31.0" \ No newline at end of file