From fe707509e8450acddea5d154a77883a22cd957b8 Mon Sep 17 00:00:00 2001 From: Jiaxiao Zhou Date: Thu, 27 Apr 2023 09:54:29 -0700 Subject: [PATCH] chore: bump wasmtime to 8 (#107) Signed-off-by: mossaka --- Cargo.lock | 122 ++++++++++++--------- crates/containerd-shim-wasmtime/Cargo.toml | 6 +- 2 files changed, 72 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fdf2b22cc..40aa37b91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -453,18 +453,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862eb053fc21f991db27c73bc51494fe77aadfa09ea257cb43b62a2656fd4cc1" +checksum = "2e9fb5af44f8cb4685d425a5101f562800618cfe7a454e23f87710ebfb22af50" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038a74bc85da2f6f9e237c51b7998b47229c0f9da69b4c6b0590cf6621c45d46" +checksum = "8b50041c01a29ab8c2dd93188a024d67c30a099067aa45bcb0f2bb0f6701b003" dependencies = [ "bumpalo", "cranelift-bforest", @@ -482,33 +482,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb720a7955cf7cc92c58f3896952589062e6f12d8eb35ef4337e708ed2e738" +checksum = "3cdc8a18f16dff6690dc1a0ff5e3319b84904e6e9af06056e4712c3dca4ee63b" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0954f9426cf0fa7ad57910ea5822a09c5da590222a767a6c38080a8534a0af8" +checksum = "420bc3bed85c6879e0383318c0a614c00f2a74df67c37b7ab4cfd0c19fe11794" [[package]] name = "cranelift-entity" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c7096c1a66cfa73899645f0a46a6f5c91641e678eeafb0fc47a19ab34069ca" +checksum = "0a6319b1918ca95faef80f17a44b5394bb63facd899f5369a54fbcc23e67971a" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697f2fdaceb228fea413ea91baa7c6b8533fc2e61ac5a08db7acc1b31e673a2a" +checksum = "a626e2d07bec4d029ba0393547433bc1cd6f1335581dd833f06e3feb3cbaf72a" dependencies = [ "cranelift-codegen", "log", @@ -518,15 +518,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41037f4863e0c6716dbe60e551d501f4197383cb43d75038c0170159fc8fb5b" +checksum = "2af8d1e5435264cac8208e34cc550abf6797ad6c7b4f6c874dc93a8249aa7d35" [[package]] name = "cranelift-native" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797c6e5643eb654bb7bf496f1f03518323a89b937b84020b786620f910364a52" +checksum = "789bc52610128a42bbbba8e9b309eb73f8622bf10f55eb632ef552162a723ca7" dependencies = [ "cranelift-codegen", "libc", @@ -535,9 +535,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.94.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b5fae12cefda3a2c43837e562dd525ab1d75b27989eece66de5b2c8fe120f9" +checksum = "d3dbb9a85d3e0371fc65085dfde86211305a562c70bae9ea0a57155f58750983" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2822,9 +2822,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c029a2dfc62195f26612e1f9de4c4207e4088ce48f84861229fa268021d1d0" +checksum = "8306bc71532b8a78f31e35d88e43506dfc5fc26bf30c7f0673cbf6beeb28bb6a" dependencies = [ "anyhow", "async-trait", @@ -2846,9 +2846,9 @@ dependencies = [ [[package]] name = "wasi-common" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be54f652e97bf4ffd98368386785ef80a70daf045ee307ec321be51b3ad7370c" +checksum = "58c4bd23d8aeec5da68339e121dccf21e2b2f7b9028c39413bfd2fe94eb7a535" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -2999,9 +2999,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ "indexmap", "url", @@ -3009,9 +3009,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d137f87df6e037b2bcb960c2db7ea174e04fb897051380c14b5e5475a870669e" +checksum = "a65e578b6d35f3e808b21b00c652b4c3ded90249f642d504a67700d7a02cac1c" dependencies = [ "anyhow", "bincode", @@ -3047,18 +3047,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad63d4175d6af44af2046186c87deae4e9a8150b92de2d4809c6f745d5ee9b38" +checksum = "cdaba4716347d5936234f17d1c75a3a92f21edaefc96dbdc64b36ef53504c1e1" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3055fb327f795b4639f47b9dadad9d3d9b185fd3001adf8db08f5fa06d07032" +checksum = "673200e1afd89735b9e641ec63218e9b7edf2860257db1968507c0538511d612" dependencies = [ "anyhow", "base64", @@ -3076,9 +3076,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274590ecbb1179d45a5c8d9f54b9d236e9414d9ca3b861cd8956cec085508eb0" +checksum = "ed4490e68a86a8515071c19bd54a679b5c239c43badd24c18c764a63117ba119" dependencies = [ "anyhow", "cranelift-codegen", @@ -3092,14 +3092,30 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser", + "wasmtime-cranelift-shared", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73493000ea57cc755b4ab48df9194740c00ea6dcd2714b660b7859a451c1b925" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-native", + "gimli", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b4a897e6ce1f2567ba98e7b1948c0e12cae1202fd88e7639f901b8ce9203f7" +checksum = "5c2a2c8dcf2c4bacaa5bd29fbbc744769804377747940c6d5fe12b15bdfafe2c" dependencies = [ "anyhow", "cranelift-entity", @@ -3129,9 +3145,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f035bfe27ce5129c9d081d6288480f2e6ae9d16d0eb035a5d9e3b5b6c36658" +checksum = "3b75238696641fb46dcf3cd6aaf09ac4c48040c5e2391d5c5a9883c35b09a627" dependencies = [ "addr2line", "anyhow", @@ -3154,9 +3170,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e35d335dd2461c631ba24d2326d993bd3a4bdb4b0217e5bda4f518ba0e29f3" +checksum = "f47cc7e383300218d338fcbe95f2d7343e125b6b0d284d0d9b7e6acc7dd112a1" dependencies = [ "object", "once_cell", @@ -3165,9 +3181,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8c01a070f55343f7afd309a9609c12378548b26c3f53c599bc711bb1ce42ee" +checksum = "b0c1b25e736692815a53f669e774e230b80ec063f21596f006f8310b9f2dd910" dependencies = [ "cfg-if 1.0.0", "libc", @@ -3176,9 +3192,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac02cc14c8247f6e4e48c7653a79c226babac8f2cacdd933d3f15ca2a6ab20b" +checksum = "9a305b2e4e62dfc67c8d25b2db1c2ac6ba44c7bcf0ccefb7fd9205338bed3f6a" dependencies = [ "anyhow", "cc", @@ -3192,7 +3208,7 @@ dependencies = [ "paste", "rand", "rustix 0.36.13", - "wasmtime-asm-macros 7.0.0", + "wasmtime-asm-macros 8.0.0", "wasmtime-environ", "wasmtime-jit-debug", "windows-sys 0.45.0", @@ -3200,9 +3216,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8dc0062ab053e1aa22d2355a2de4df482a0007fecae82ea02cc596c2329971d" +checksum = "efecff824b08f5c1da332a776ce01a928b200b27dbbb3ffd9374d7f2718671ea" dependencies = [ "cranelift-entity", "serde", @@ -3212,9 +3228,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc41b56ec1c032e4bb67cf0fe0b36443f7a8be341abce2e5ec9cc8ac6ef4bee0" +checksum = "8ee49d3a53fd66187ac35f49f1cb5a28b3a104e066117d7194a0df7faf02658e" dependencies = [ "anyhow", "libc", @@ -3267,9 +3283,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43991a6d0a435642831e40de3e412eb96950f1c9c72289e486db469ff7c4e53c" +checksum = "883e99f57044e457243de44477104db73e90d892130e11da4cf7d1d9df3333e6" dependencies = [ "anyhow", "async-trait", @@ -3282,9 +3298,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424062dad40b2020239ae2de27c962b5dfa6f36b9fe4ddfc3bcff3d5917d078f" +checksum = "0743743724253da8c775c1668bfdb0e14f47b0666b6b41f997fb21a33e8768df" dependencies = [ "anyhow", "heck 0.4.1", @@ -3297,9 +3313,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dc0c6a4cbe4f073e7e24c0452fc58c2775574f3b8c89703148d6308d2531b16" +checksum = "6a21994785b4bbc8cf3811e1422feb3c6b613b9da51c8bacf35cc29ca2f356a0" dependencies = [ "proc-macro2", "quote", diff --git a/crates/containerd-shim-wasmtime/Cargo.toml b/crates/containerd-shim-wasmtime/Cargo.toml index 1cf780aad..d47803b3d 100644 --- a/crates/containerd-shim-wasmtime/Cargo.toml +++ b/crates/containerd-shim-wasmtime/Cargo.toml @@ -14,7 +14,7 @@ ttrpc = { workspace = true } # 2. Because it pulls in a lot of dependencies that we don't need # 3. Because that dependency (wasmtime-fiber) links to native code # 4. The wasmedge shim also uses wasmtime-fiber... which means those transative dependencies need to be the same or compilation fails -wasmtime = { version = "7.0", default-features = false, features = [ +wasmtime = { version = "8.0", default-features = false, features = [ 'cache', 'wat', 'jitdump', @@ -24,8 +24,8 @@ wasmtime = { version = "7.0", default-features = false, features = [ 'vtune', ]} -wasmtime-wasi = "7.0" -wasi-common = "7.0" +wasmtime-wasi = "8.0" +wasi-common = "8.0" chrono = { workspace = true } anyhow = { workspace = true } cap-std = { workspace = true }