diff --git a/Cargo.lock b/Cargo.lock index baede67..a3000af 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.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513" +checksum = "0eba0f73ab0da95f5d3bd5161da14edc586a88aeae1d09e4a0924f7a141a0093" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.81.2", ] [[package]] name = "cranelift-codegen" -version = "0.78.0" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c" +checksum = "e9cff8758662518d743460f32c3ca6f32d726070af612c19ba92d01ea727e6d9" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-entity", - "gimli 0.25.0", + "cranelift-entity 0.81.2", + "gimli 0.26.1", "log", "regalloc", "smallvec", @@ -286,19 +286,18 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.78.0" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf" +checksum = "bfc82fef9d470dd617c4d2537d8f4146d82526bb3bc3ef35b599a3978dad8c81" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", ] [[package]] name = "cranelift-codegen-shared" -version = "0.78.0" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be" +checksum = "a06f531b6173eb2fd92d9a9b2a0dbb2450079f913040bdc323ec43ec752b7e44" [[package]] name = "cranelift-entity" @@ -309,11 +308,20 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.81.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d84f8e8a408071d67f479a00c6d3da965b1f9b4b240b7e7e27edb1a34401b3cd" +dependencies = [ + "serde", +] + [[package]] name = "cranelift-frontend" -version = "0.78.0" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525" +checksum = "72cc22592c10f1fa6664a55e34ec52593125a94176856d3ec2f7af5664374da1" dependencies = [ "cranelift-codegen", "log", @@ -323,9 +331,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.78.0" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b" +checksum = "c3da723ebbee69f348feb49acc9f6f5b7ad668c04a145abbc7a75b669f9b0afd" dependencies = [ "cranelift-codegen", "libc", @@ -334,18 +342,18 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.78.0" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f46fec547a1f8a32c54ea61c28be4f4ad234ad95342b718a9a9adcaadb0c778" +checksum = "642c30e1600295e9c58fc349376187831dce1df6822ece7e8ab880010d6e4be2" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.81.2", "cranelift-frontend", "itertools", "log", "smallvec", - "wasmparser", - "wasmtime-types", + "wasmparser 0.82.0", + "wasmtime-types 0.34.2", ] [[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,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "io-lifetimes" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" + [[package]] name = "ipnet" version = "2.3.1" @@ -692,9 +710,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 +726,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.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" + [[package]] name = "log" version = "0.4.14" @@ -816,9 +840,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "opaque-debug" @@ -974,9 +998,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.32" +version = "0.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4" +checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" dependencies = [ "log", "rustc-hash", @@ -1021,7 +1045,7 @@ dependencies = [ "bitflags", "cc", "errno", - "io-lifetimes", + "io-lifetimes 0.3.3", "itoa", "libc", "linux-raw-sys 0.0.28", @@ -1037,7 +1061,7 @@ checksum = "af4da272ce5ef18de07bd84edb77769ce16da0a4ca8f84d4389efafaf0850f9f" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.3.3", "libc", "linux-raw-sys 0.0.29", "rustc_version", @@ -1064,6 +1088,20 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.33.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.5.3", + "libc", + "linux-raw-sys 0.0.42", + "winapi", +] + [[package]] name = "same-file" version = "1.0.6" @@ -1174,7 +1212,7 @@ dependencies = [ "bitflags", "cap-fs-ext", "cap-std", - "io-lifetimes", + "io-lifetimes 0.3.3", "rsix 0.23.9", "rustc_version", "winapi", @@ -1325,7 +1363,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 +1405,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 +1424,7 @@ dependencies = [ "bitflags", "cap-rand", "cap-std", - "io-lifetimes", + "io-lifetimes 0.3.3", "rsix 0.23.9", "thiserror", "tracing", @@ -1400,6 +1438,12 @@ version = "0.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" +[[package]] +name = "wasmparser" +version = "0.82.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0559cc0f1779240d6f894933498877ea94f693d84f3ee39c9a9932c6c312bd70" + [[package]] name = "wasmtime" version = "0.31.0" @@ -1407,7 +1451,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "311d06b0c49346d1fbf48a17052e844036b95a7753c1afb34e8c0af3f6b5bb13" dependencies = [ "anyhow", - "async-trait", "backtrace", "bincode", "cfg-if", @@ -1419,27 +1462,56 @@ dependencies = [ "object", "paste", "psm", - "rayon", "region", "rustc-demangle", "serde", "target-lexicon", - "wasmparser", + "wasmparser 0.81.0", + "wasmtime-environ 0.31.0", + "wasmtime-jit 0.31.0", + "wasmtime-runtime 0.31.0", + "winapi", +] + +[[package]] +name = "wasmtime" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc8463ad287e1d87d9a141a010cbe4b3f8227ade85cc8ac64f2bef3219b66f94" +dependencies = [ + "anyhow", + "async-trait", + "backtrace", + "bincode", + "cfg-if", + "indexmap", + "lazy_static", + "libc", + "log", + "object", + "once_cell", + "paste", + "psm", + "rayon", + "region", + "serde", + "target-lexicon", + "wasmparser 0.82.0", "wasmtime-cache", "wasmtime-cranelift", - "wasmtime-environ", + "wasmtime-environ 0.34.2", "wasmtime-fiber", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-jit 0.34.2", + "wasmtime-runtime 0.34.2", "wat", "winapi", ] [[package]] name = "wasmtime-cache" -version = "0.31.0" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147930a4995137dc096e5b17a573b446799be2bbaea433e821ce6a80abe2c5" +checksum = "b066cd527050ed06eba8f4eb8948d833f033401f09313a5e5231ebe3e316bb9d" dependencies = [ "anyhow", "base64", @@ -1447,7 +1519,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rsix 0.23.9", + "rustix", "serde", "sha2", "toml", @@ -1457,24 +1529,24 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.31.0" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3083a47e1ede38aac06a1d9831640d673f9aeda0b82a64e4ce002f3432e2e7" +checksum = "381b034926e26980a0aed3f26ec4ba2ff3be9763f386bfb18b7bf2a3fbc1a284" dependencies = [ "anyhow", "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.81.2", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.25.0", + "gimli 0.26.1", "log", "more-asserts", "object", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-environ", + "wasmparser 0.82.0", + "wasmtime-environ 0.34.2", ] [[package]] @@ -1485,7 +1557,7 @@ checksum = "1c2d194b655321053bc4111a1aa4ead552655c8a17d17264bc97766e70073510" dependencies = [ "anyhow", "cfg-if", - "cranelift-entity", + "cranelift-entity 0.78.0", "gimli 0.25.0", "indexmap", "log", @@ -1494,18 +1566,38 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-types", + "wasmparser 0.81.0", + "wasmtime-types 0.31.0", +] + +[[package]] +name = "wasmtime-environ" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877230e7f92f8b5509845e804bb27c7c993197339a7cf0de4a2af411ee6ea75b" +dependencies = [ + "anyhow", + "cranelift-entity 0.81.2", + "gimli 0.26.1", + "indexmap", + "log", + "more-asserts", + "object", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.82.0", + "wasmtime-types 0.34.2", ] [[package]] name = "wasmtime-fiber" -version = "0.31.0" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d8822813b51b91e199c44a086c3ca76567e95e7fd563589acb631029eba79e" +checksum = "dffb509e67c6c2ea49f38bd5db3712476fcc94c4776521012e5f69ae4bb27b4a" dependencies = [ "cc", - "rsix 0.23.9", + "rustix", "winapi", ] @@ -1524,13 +1616,37 @@ dependencies = [ "more-asserts", "object", "region", - "rsix 0.23.9", "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-environ", - "wasmtime-runtime", + "wasmparser 0.81.0", + "wasmtime-environ 0.31.0", + "wasmtime-runtime 0.31.0", + "winapi", +] + +[[package]] +name = "wasmtime-jit" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee2da33bb337fbdfb6e031d485bf2a39d51f37f48e79c6327228d3fc68ec531" +dependencies = [ + "addr2line 0.17.0", + "anyhow", + "bincode", + "cfg-if", + "cpp_demangle", + "gimli 0.26.1", + "log", + "object", + "region", + "rustc-demangle", + "rustix", + "serde", + "target-lexicon", + "thiserror", + "wasmtime-environ 0.34.2", + "wasmtime-runtime 0.34.2", "winapi", ] @@ -1543,7 +1659,7 @@ dependencies = [ "jni", "log", "wasi-common", - "wasmtime", + "wasmtime 0.34.2", "wasmtime-jni-exports", "wasmtime-wasi", ] @@ -1573,7 +1689,32 @@ dependencies = [ "region", "rsix 0.23.9", "thiserror", - "wasmtime-environ", + "wasmtime-environ 0.31.0", + "winapi", +] + +[[package]] +name = "wasmtime-runtime" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb5bd981c971c398dac645874748f261084dc907a98b3ee70fa41e005a2b365" +dependencies = [ + "anyhow", + "backtrace", + "cc", + "cfg-if", + "indexmap", + "lazy_static", + "libc", + "log", + "mach", + "memoffset", + "more-asserts", + "rand", + "region", + "rustix", + "thiserror", + "wasmtime-environ 0.34.2", "wasmtime-fiber", "winapi", ] @@ -1584,10 +1725,22 @@ 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 0.81.0", +] + +[[package]] +name = "wasmtime-types" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73696a97fb815c2944896ae9e4fc49182fd7ec0b58088f9ad9768459a521e347" +dependencies = [ + "cranelift-entity 0.81.2", "serde", "thiserror", - "wasmparser", + "wasmparser 0.82.0", ] [[package]] @@ -1599,7 +1752,7 @@ dependencies = [ "anyhow", "wasi-cap-std-sync", "wasi-common", - "wasmtime", + "wasmtime 0.31.0", "wiggle", ] @@ -1641,7 +1794,7 @@ dependencies = [ "bitflags", "thiserror", "tracing", - "wasmtime", + "wasmtime 0.31.0", "wiggle-macro", ] @@ -1711,7 +1864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afba0891d41a50943c32fcea61e124b9dd5755275054b0a3e1e1eba26e671137" dependencies = [ "bitflags", - "io-lifetimes", + "io-lifetimes 0.3.3", "winapi", ] @@ -1796,18 +1949,18 @@ checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" [[package]] name = "zstd" -version = "0.9.0+zstd.1.5.0" +version = "0.10.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" +checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.1+zstd.1.5.0" +version = "4.1.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" +checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" dependencies = [ "libc", "zstd-sys", @@ -1815,9 +1968,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/wasmtime-jni/Cargo.toml b/wasmtime-jni/Cargo.toml index cf4e8a6..20f2f67 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.34", features=["jitdump", "wat", "cache"] } wasmtime-jni-exports = { path = "../wasmtime-jni-exports" } wasmtime-wasi = "0.31.0" \ No newline at end of file