1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-05-25 17:06:09 +02:00

update wasmtime dep to 19.0.1, replace wasmtime-wasi with wasi-cmmon (#2752)

Signed-off-by: Yashodhan Joshi <yjdoc2@gmail.com>
This commit is contained in:
Yashodhan 2024-04-17 12:53:10 +05:30 committed by GitHub
parent a103d8bc9a
commit 342ad60927
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 141 additions and 196 deletions

325
Cargo.lock generated
View File

@ -219,7 +219,7 @@ dependencies = [
"bitflags 2.5.0",
"cexpr",
"clang-sys",
"itertools 0.12.1",
"itertools",
"lazy_static",
"lazycell",
"proc-macro2",
@ -308,9 +308,9 @@ dependencies = [
[[package]]
name = "cap-fs-ext"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866"
checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747"
dependencies = [
"cap-primitives",
"cap-std",
@ -318,23 +318,11 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "cap-net-ext"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9"
dependencies = [
"cap-primitives",
"cap-std",
"rustix",
"smallvec",
]
[[package]]
name = "cap-primitives"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb"
checksum = "90a0b44fc796b1a84535a63753d50ba3972c4db55c7255c186f79140e63d56d0"
dependencies = [
"ambient-authority",
"fs-set-times",
@ -349,9 +337,9 @@ dependencies = [
[[package]]
name = "cap-rand"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca"
checksum = "4327f08daac33a99bb03c54ae18c8f32c3ba31c728a33ddf683c6c6a5043de68"
dependencies = [
"ambient-authority",
"rand",
@ -359,9 +347,9 @@ dependencies = [
[[package]]
name = "cap-std"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330"
checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f"
dependencies = [
"cap-primitives",
"io-extras",
@ -371,9 +359,9 @@ dependencies = [
[[package]]
name = "cap-time-ext"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b"
checksum = "e1353421ba83c19da60726e35db0a89abef984b3be183ff6f58c5b8084fcd0c5"
dependencies = [
"ambient-authority",
"cap-primitives",
@ -595,9 +583,9 @@ dependencies = [
[[package]]
name = "cpp_demangle"
version = "0.3.5"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
dependencies = [
"cfg-if",
]
@ -622,11 +610,11 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16d5521e2abca66bbb1ddeecbb6f6965c79160352ae1579b39f8c86183895c24"
checksum = "5b3775cc6cc00c90d29eebea55feedb2b0168e23f5415bab7859c4004d7323d1"
dependencies = [
"cranelift-entity 0.105.3",
"cranelift-entity 0.106.1",
]
[[package]]
@ -652,17 +640,17 @@ dependencies = [
[[package]]
name = "cranelift-codegen"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef40a4338a47506e832ac3e53f7f1375bc59351f049a8379ff736dd02565bd95"
checksum = "637f3184ba5bfa48d425bad1d2e4faf5fcf619f5e0ca107edc6dc02f589d4d74"
dependencies = [
"bumpalo",
"cranelift-bforest 0.105.3",
"cranelift-codegen-meta 0.105.3",
"cranelift-codegen-shared 0.105.3",
"cranelift-bforest 0.106.1",
"cranelift-codegen-meta 0.106.1",
"cranelift-codegen-shared 0.106.1",
"cranelift-control",
"cranelift-entity 0.105.3",
"cranelift-isle 0.105.3",
"cranelift-entity 0.106.1",
"cranelift-isle 0.106.1",
"gimli 0.28.1",
"hashbrown 0.14.3",
"log",
@ -682,11 +670,11 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d24cd5d85985c070f73dfca07521d09086362d1590105ba44b0932bf33513b61"
checksum = "e4b35b8240462341d94d31aab807cad704683988708261aecae3d57db48b7212"
dependencies = [
"cranelift-codegen-shared 0.105.3",
"cranelift-codegen-shared 0.106.1",
]
[[package]]
@ -697,15 +685,15 @@ checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7"
[[package]]
name = "cranelift-codegen-shared"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0584c4363e3aa0a3c7cb98a778fbd5326a3709f117849a727da081d4051726c"
checksum = "8f3cd1555aa9df1d6d8375732de41b4cb0d787006948d55b6d004d521e9efeb0"
[[package]]
name = "cranelift-control"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f25ecede098c6553fdba362a8e4c9ecb8d40138363bff47f9712db75be7f0571"
checksum = "14b31a562a10e98ab148fa146801e20665c5f9eda4fce9b2c5a3836575887d74"
dependencies = [
"arbitrary",
]
@ -732,9 +720,9 @@ checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c"
[[package]]
name = "cranelift-entity"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea081a42f25dc4c5b248b87efdd87dcd3842a1050a37524ec5391e6172058cb"
checksum = "af1e0467700a3f4fccf5feddbaebdf8b0eb82535b06a9600c4bc5df40872e75d"
dependencies = [
"serde",
"serde_derive",
@ -754,11 +742,11 @@ dependencies = [
[[package]]
name = "cranelift-frontend"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9796e712f5af797e247784f7518e6b0a83a8907d73d51526982d86ecb3a58b68"
checksum = "6cb918ee2c23939262efd1b99d76a21212ac7bd35129582133e21a22a6ff0467"
dependencies = [
"cranelift-codegen 0.105.3",
"cranelift-codegen 0.106.1",
"log",
"smallvec",
"target-lexicon",
@ -772,34 +760,34 @@ checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb"
[[package]]
name = "cranelift-isle"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4a66ccad5782f15c80e9dd5af0df4acfe6e3eee98e8f7354a2e5c8ec3104bdd"
checksum = "966e4cfb23cf6d7f1d285d53a912baaffc5f06bcd9c9b0a2d8c66a184fae534b"
[[package]]
name = "cranelift-native"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "285e80df1d9b79ded9775b285df68b920a277b84f88a7228d2f5bc31fcdc58eb"
checksum = "bea803aadfc4aabdfae7c3870f1b1f6dd4332f4091859e9758ef5fca6bf8cc87"
dependencies = [
"cranelift-codegen 0.105.3",
"cranelift-codegen 0.106.1",
"libc",
"target-lexicon",
]
[[package]]
name = "cranelift-wasm"
version = "0.105.3"
version = "0.106.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4135b0ab01fd16aa8f8821196e9e2fe15953552ccaef8ba5153be0ced04ef757"
checksum = "11d18a3572cd897555bba3621e568029417d8f5cc26aeede2d7cb0bad6afd916"
dependencies = [
"cranelift-codegen 0.105.3",
"cranelift-entity 0.105.3",
"cranelift-frontend 0.105.3",
"itertools 0.10.5",
"cranelift-codegen 0.106.1",
"cranelift-entity 0.106.1",
"cranelift-frontend 0.106.1",
"itertools",
"log",
"smallvec",
"wasmparser 0.121.2",
"wasmparser 0.201.0",
"wasmtime-types",
]
@ -1828,15 +1816,6 @@ dependencies = [
"serde",
]
[[package]]
name = "itertools"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.12.1"
@ -3741,9 +3720,9 @@ dependencies = [
[[package]]
name = "system-interface"
version = "0.26.1"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58"
checksum = "b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6"
dependencies = [
"bitflags 2.5.0",
"cap-fs-ext",
@ -4011,15 +3990,6 @@ dependencies = [
"tracing",
]
[[package]]
name = "toml"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
[[package]]
name = "toml"
version = "0.7.8"
@ -4480,9 +4450,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi-common"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95e022c29ad56af4cc0a8a8f0e0191abf9e0a0c4a68d25dfe088c39c9a8e3d2c"
checksum = "6b53dfacdeacca15ee2a48a4aa0ec6a6d0da737676e465770c0585f79c04e638"
dependencies = [
"anyhow",
"bitflags 2.5.0",
@ -4595,9 +4565,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "wasm-encoder"
version = "0.41.2"
version = "0.201.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae"
checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
dependencies = [
"leb128",
]
@ -4914,9 +4884,9 @@ dependencies = [
[[package]]
name = "wasmparser"
version = "0.121.2"
version = "0.201.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
dependencies = [
"bitflags 2.5.0",
"indexmap 2.2.6",
@ -4925,19 +4895,19 @@ dependencies = [
[[package]]
name = "wasmprinter"
version = "0.2.80"
version = "0.201.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7"
checksum = "a67e66da702706ba08729a78e3c0079085f6bfcb1a62e4799e97bbf728c2c265"
dependencies = [
"anyhow",
"wasmparser 0.121.2",
"wasmparser 0.201.0",
]
[[package]]
name = "wasmtime"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8106d7d22d63d1bcb940e22dcc7b03e46f0fc8bfbaf2fd7b6cb8f448f9449774"
checksum = "516be5b58a8f75d39b01378516dcb0ff7b9bc39c7f1f10eec5b338d4916cf988"
dependencies = [
"addr2line",
"anyhow",
@ -4957,12 +4927,13 @@ dependencies = [
"paste",
"rayon",
"rustix",
"semver 1.0.22",
"serde",
"serde_derive",
"serde_json",
"target-lexicon",
"wasm-encoder 0.41.2",
"wasmparser 0.121.2",
"wasm-encoder 0.201.0",
"wasmparser 0.201.0",
"wasmtime-cache",
"wasmtime-component-macro",
"wasmtime-component-util",
@ -4972,6 +4943,7 @@ dependencies = [
"wasmtime-jit-debug",
"wasmtime-jit-icache-coherence",
"wasmtime-runtime",
"wasmtime-slab",
"wasmtime-winch",
"wat",
"windows-sys 0.52.0",
@ -4979,18 +4951,18 @@ dependencies = [
[[package]]
name = "wasmtime-asm-macros"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b0cf02cea951ace34ee3b0e64b7f446c3519d1c95ad75bc5330f405e275ee8f"
checksum = "e8d22d88a92d69385f18143c946884bf6aaa9ec206ce54c85a2d320c1362b009"
dependencies = [
"cfg-if",
]
[[package]]
name = "wasmtime-cache"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3249204a71d728d53fb3eea18afd0473f87e520445707a4d567ac4da0bb3eb5d"
checksum = "068728a840223b56c964507550da671372e7e5c2f3a7856012b57482e3e979a7"
dependencies = [
"anyhow",
"base64",
@ -5001,16 +4973,16 @@ dependencies = [
"serde",
"serde_derive",
"sha2",
"toml 0.5.11",
"toml 0.8.12",
"windows-sys 0.52.0",
"zstd",
]
[[package]]
name = "wasmtime-component-macro"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d3786c0531565ec6c9852c0e46299f06cb6e4b58d36e30f3c234cfa69bde376"
checksum = "631244bac89c57ebe7283209d86fe175ad5929328e75f61bf9141895cafbf52d"
dependencies = [
"anyhow",
"proc-macro2",
@ -5023,22 +4995,22 @@ dependencies = [
[[package]]
name = "wasmtime-component-util"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81eae2ec98027ee0b3950da83bc320120a23087ac4d39b3d59201cb5ebf52777"
checksum = "82ad496ba0558f7602da5e9d4c201f35f7aefcca70f973ec916f3f0d0787ef74"
[[package]]
name = "wasmtime-cranelift"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "595abdb067acdc812ab0f21d8d46d5aa4022392aa7c3e0632c20bff9ec49ffb4"
checksum = "961ab5ee4b17e627001b18069ee89ef906edbbd3f84955515f6aad5ab6d82299"
dependencies = [
"anyhow",
"cfg-if",
"cranelift-codegen 0.105.3",
"cranelift-codegen 0.106.1",
"cranelift-control",
"cranelift-entity 0.105.3",
"cranelift-frontend 0.105.3",
"cranelift-entity 0.106.1",
"cranelift-frontend 0.106.1",
"cranelift-native",
"cranelift-wasm",
"gimli 0.28.1",
@ -5046,7 +5018,7 @@ dependencies = [
"object",
"target-lexicon",
"thiserror",
"wasmparser 0.121.2",
"wasmparser 0.201.0",
"wasmtime-cranelift-shared",
"wasmtime-environ",
"wasmtime-versioned-export-macros",
@ -5054,12 +5026,12 @@ dependencies = [
[[package]]
name = "wasmtime-cranelift-shared"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8c24c1fdea167b992d82ebe76471fd1cbe7b0b406bc72f9250f86353000134e"
checksum = "bc4db94596be14cd1f85844ce85470bf68acf235143098b9d9bf72b49e47b917"
dependencies = [
"anyhow",
"cranelift-codegen 0.105.3",
"cranelift-codegen 0.106.1",
"cranelift-control",
"cranelift-native",
"gimli 0.28.1",
@ -5070,14 +5042,14 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3279d510005358141550d8a90a5fc989d7e81748e5759d582fe6bfdcbf074a04"
checksum = "420b13858ef27dfd116f1fdb0513e9593a307a632ade2ea58334b639a3d8d24e"
dependencies = [
"anyhow",
"bincode",
"cpp_demangle",
"cranelift-entity 0.105.3",
"cranelift-entity 0.106.1",
"gimli 0.28.1",
"indexmap 2.2.6",
"log",
@ -5087,8 +5059,8 @@ dependencies = [
"serde_derive",
"target-lexicon",
"thiserror",
"wasm-encoder 0.41.2",
"wasmparser 0.121.2",
"wasm-encoder 0.201.0",
"wasmparser 0.201.0",
"wasmprinter",
"wasmtime-component-util",
"wasmtime-types",
@ -5096,9 +5068,9 @@ dependencies = [
[[package]]
name = "wasmtime-fiber"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b1df665f2117741d1265f5663b0d93068b18120c2c4b18b9faed49d00d92c31"
checksum = "5d37ff0e11a023019e34fe839c74a1c00880b989f4446176b6cc6da3b58e3ef2"
dependencies = [
"anyhow",
"cc",
@ -5111,9 +5083,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit-debug"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63f307739370736e5b0cd2b45910ff96bcda6d5d68b2c4384bcedb0af4f3b321"
checksum = "7b849f19ad1d4a8133ff05b82c438144f17fb49b08e5f7995f8c1e25cf35f390"
dependencies = [
"object",
"once_cell",
@ -5123,9 +5095,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit-icache-coherence"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "866634605089b4632b32226b54aa3670d72e1849f9fc425c7e50b3749c2e6df3"
checksum = "59c48eb4223d6556ffbf3decb146d0da124f1fd043f41c98b705252cb6a5c186"
dependencies = [
"cfg-if",
"libc",
@ -5134,9 +5106,9 @@ dependencies = [
[[package]]
name = "wasmtime-runtime"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e11185c88cadf595d228f5ae4ff9b4badbf9ca98dcb37b0310c36e31fa74867f"
checksum = "7fefac2cb5f5a6f365234a3584bf40bd2e45e7f6cd90a689d9b2afbb9881978f"
dependencies = [
"anyhow",
"cc",
@ -5152,7 +5124,7 @@ dependencies = [
"psm",
"rustix",
"sptr",
"wasm-encoder 0.41.2",
"wasm-encoder 0.201.0",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-fiber",
@ -5163,74 +5135,47 @@ dependencies = [
]
[[package]]
name = "wasmtime-types"
version = "18.0.3"
name = "wasmtime-slab"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f32377cbd827bee06fcb2f6bf97b0477fdcc86888bbe6db7b9cab8e644082e0a"
checksum = "52d7b97b92df126fdbe994a53d2215828ec5ed5087535e6d4703b1fbd299f0e3"
[[package]]
name = "wasmtime-types"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "509c88abb830819b259c49e2d4e4f22b555db066ba08ded0b76b071a2aa53ddf"
dependencies = [
"cranelift-entity 0.105.3",
"cranelift-entity 0.106.1",
"serde",
"serde_derive",
"thiserror",
"wasmparser 0.121.2",
"wasmparser 0.201.0",
]
[[package]]
name = "wasmtime-versioned-export-macros"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ab8d7566d206c42f8cf1d4ac90c5e40d3582e8eabad9b3b67e9e73c61fc47a1"
checksum = "f1d81c092a61ca1667013e2eb08fed7c6c53e496dbbaa32d5685dc5152b0a772"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
]
[[package]]
name = "wasmtime-wasi"
version = "18.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca912bda309188bd25ab7652c6654b34aacdf43047c716ee1cb685a28079078"
dependencies = [
"anyhow",
"async-trait",
"bitflags 2.5.0",
"bytes",
"cap-fs-ext",
"cap-net-ext",
"cap-rand",
"cap-std",
"cap-time-ext",
"fs-set-times",
"futures",
"io-extras",
"io-lifetimes",
"log",
"once_cell",
"rustix",
"system-interface",
"thiserror",
"tokio",
"tracing",
"url",
"wasi-common",
"wasmtime",
"wiggle",
"windows-sys 0.52.0",
]
[[package]]
name = "wasmtime-winch"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba5a97bfccc241d1769cef75eb16f472a893982704d5f3c9c71c431c1484344a"
checksum = "a0958907880e37a2d3974f5b3574c23bf70aaf1fc6c1f716625bb50dac776f1a"
dependencies = [
"anyhow",
"cranelift-codegen 0.105.3",
"cranelift-codegen 0.106.1",
"gimli 0.28.1",
"object",
"target-lexicon",
"wasmparser 0.121.2",
"wasmparser 0.201.0",
"wasmtime-cranelift-shared",
"wasmtime-environ",
"winch-codegen",
@ -5238,9 +5183,9 @@ dependencies = [
[[package]]
name = "wasmtime-wit-bindgen"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "faf2c76781a27e07802669f6f0e11eb4441546407eb65be60c3d862200988b92"
checksum = "a593ddefd2f80617df6bea084b2e422d8969e924bc209642a794d57518f59587"
dependencies = [
"anyhow",
"heck 0.4.1",
@ -5250,9 +5195,9 @@ dependencies = [
[[package]]
name = "wasmtime-wmemcheck"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3847d969bd203b8cd239f89581e52432a0f00b8c5c9bc917be2fccd7542c4f2f"
checksum = "b77212b6874bbc86d220bb1d28632d0c11c6afe996c3e1ddcf746b1a6b4919b9"
[[package]]
name = "wast"
@ -5365,9 +5310,9 @@ dependencies = [
[[package]]
name = "wiggle"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a7ecd6e1ffba1278cfd24a001a13da11d86801e0ad9342f11a370ce0df50e14"
checksum = "f093d8afdb09efaf2ed1037468bd4614308a762d215b6cafd60a7712993a8ffa"
dependencies = [
"anyhow",
"async-trait",
@ -5380,9 +5325,9 @@ dependencies = [
[[package]]
name = "wiggle-generate"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c5490497a35d67040d4f2fd2491fbcad6dd225c5bd24681c2cd52a2f40a55ce"
checksum = "47c7bccd5172ce8d853242f723e42c84b8c131b24fb07a1570f9045d99258616"
dependencies = [
"anyhow",
"heck 0.4.1",
@ -5395,9 +5340,9 @@ dependencies = [
[[package]]
name = "wiggle-macro"
version = "18.0.3"
version = "19.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d83f31d1c1a0d87842f1a2bf40bd230e25ba790c450f0d0ddb84524fd6955958"
checksum = "a69d087dee85991096fc0c6eaf4dcf4e17cd16a0594c33b8ab9e2d345234ef75"
dependencies = [
"proc-macro2",
"quote",
@ -5438,17 +5383,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "winch-codegen"
version = "0.16.3"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0bd4d6cac8d69525d475d0ce1e0801eb6f314d42e764a52bd497ed3cb9c371"
checksum = "e72a6a7034793b874b85e428fd6d7b3ccccb98c326e33af3aa40cdf50d0c33da"
dependencies = [
"anyhow",
"cranelift-codegen 0.105.3",
"cranelift-codegen 0.106.1",
"gimli 0.28.1",
"regalloc2 0.9.3",
"smallvec",
"target-lexicon",
"wasmparser 0.121.2",
"wasmparser 0.201.0",
"wasmtime-environ",
]
@ -5682,9 +5627,9 @@ dependencies = [
[[package]]
name = "wit-parser"
version = "0.13.2"
version = "0.201.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08"
checksum = "196d3ecfc4b759a8573bf86a9b3f8996b304b3732e4c7de81655f875f6efdca6"
dependencies = [
"anyhow",
"id-arena",
@ -5695,6 +5640,7 @@ dependencies = [
"serde_derive",
"serde_json",
"unicode-xid",
"wasmparser 0.201.0",
]
[[package]]
@ -5764,11 +5710,11 @@ dependencies = [
"tracing-journald",
"tracing-subscriber",
"vergen",
"wasi-common",
"wasmedge-sdk",
"wasmer",
"wasmer-wasix",
"wasmtime",
"wasmtime-wasi",
]
[[package]]
@ -5793,20 +5739,19 @@ dependencies = [
[[package]]
name = "zstd"
version = "0.11.2+zstd.1.5.2"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
version = "5.0.2+zstd.1.5.2"
version = "7.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
dependencies = [
"libc",
"zstd-sys",
]

View File

@ -19,7 +19,7 @@ cgroupsv2_devices = ["libcgroups/cgroupsv2_devices", "libcontainer/cgroupsv2_dev
wasm-wasmer = ["wasmer", "wasmer-wasix"]
wasm-wasmedge = ["wasmedge-sdk/standalone", "wasmedge-sdk/static"]
wasm-wasmtime = ["wasmtime", "wasmtime-wasi"]
wasm-wasmtime = ["wasmtime", "wasi-common"]
[dependencies.clap]
version = "4.1.6"
@ -44,8 +44,8 @@ caps = "0.5.5"
wasmer = { version = "4.0.0", optional = true }
wasmer-wasix = { version = "0.9.0", optional = true }
wasmedge-sdk = { version = "0.13.2", optional = true }
wasmtime = { version = "18.0.3", optional = true }
wasmtime-wasi = { version = "18.0.3", optional = true }
wasmtime = { version = "19.0.1", optional = true }
wasi-common = { version = "19.0.1", optional = true }
tracing = { version = "0.1.40", features = ["attributes"] }
tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
tracing-journald = "0.3.0"

View File

@ -1,6 +1,6 @@
use libcontainer::oci_spec::runtime::Spec;
use wasmtime::*;
use wasmtime_wasi::WasiCtxBuilder;
use wasi_common::sync::{add_to_linker, WasiCtxBuilder};
use wasmtime::{Engine, Linker, Module, Store};
use libcontainer::workload::{Executor, ExecutorError, ExecutorValidationError, EMPTY};
@ -59,7 +59,7 @@ impl Executor for WasmtimeExecutor {
})?;
let mut linker = Linker::new(&engine);
wasmtime_wasi::add_to_linker(&mut linker, |s| s).map_err(|err| {
add_to_linker(&mut linker, |s| s).map_err(|err| {
tracing::error!(err = ?err, "cannot add wasi context to linker");
ExecutorError::Other("cannot add wasi context to linker".to_string())
})?;