From 37edc790cfb04e73e6d02687fc7a935eae179ddc Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Wed, 23 Aug 2023 17:08:22 +0200 Subject: [PATCH] Bump wasmtime to 12 Also removes the relevant `cargo deny` exclusions. --- Cargo.lock | 407 +++++++-------------------------------- crates/policy/Cargo.toml | 2 +- deny.toml | 3 - 3 files changed, 74 insertions(+), 338 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a66e08d..2212c339 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,15 +12,6 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - [[package]] name = "addr2line" version = "0.20.0" @@ -600,12 +591,12 @@ version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ - "addr2line 0.20.0", + "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.31.1", + "object", "rustc-demangle", ] @@ -1002,25 +993,25 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1380172556902242d32f78ed08c98aac4f5952aef22d3684aed5c66a5db0a6fc" +checksum = "af8e3fb66d520d18326327ffbcaa4805c64b0bed3d714cd8f711ca702b22ac46" dependencies = [ - "cranelift-entity 0.98.1", + "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037cca234e1ad0766fdfe43b527ec14e100414b4ccf4bb614977aa9754958f57" +checksum = "8e4313f83f085204ea2eee80c4e358d6accbd516397bb02a1d0768cda63111cb" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity 0.98.1", + "cranelift-entity", "cranelift-isle", "gimli", "hashbrown 0.13.2", @@ -1032,37 +1023,28 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375e6afa8b9a304999ea8cf58424414b8e55e004571265a4f0826eba8b74f18" +checksum = "63c18105d18b816e29b536c431a2a23c9b4de0ee5f21df04469d95f202f62f48" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca590e72ccb8da963def6e36460cce4412032b1f03c31d1a601838d305abdc39" +checksum = "0cd2a1d68642141d8c28de1f6e9761ad7e7182b8aeb2b79b2d21bab4b367ae85" [[package]] name = "cranelift-control" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2d38eea4373639f4b6236a40f69820fed16c5511093cd3783bf8491a93d9cf" +checksum = "8559ce38ee79ec6ad4d3a3ddb3f2bc8831c80bccb1d086ee6a1de3c9d4e40700" dependencies = [ "arbitrary", ] -[[package]] -name = "cranelift-entity" -version = "0.98.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3173c1434af23c00e4964722cf93ca8f0e6287289bf5d52110597c3ba2ea09" -dependencies = [ - "serde", -] - [[package]] name = "cranelift-entity" version = "0.99.0" @@ -1074,9 +1056,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec4a3a33825062eccf6eec73e852c8773220f6e4798925e19696562948beb1f" +checksum = "bd45c75c4196f0f2f125bddf5cfab927934ef67b49a0c72522c3994fdb04f7f6" dependencies = [ "cranelift-codegen", "log", @@ -1086,15 +1068,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5146b5cea4b21095a021d964b0174cf6ff5530f83e8d0a822683c7559e360b66" +checksum = "7cb0b7bdf32152b3c6e45076fd5bfcf3d89d61a17469c1113127be14ac610af6" [[package]] name = "cranelift-native" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cec3717ce554d3936b2101aa8eae1a2a410bd6da0f4df698a4b008fe9cf1e9" +checksum = "156b48e8e47b6e248c1468d36e1719aa8eda4ac20f4d7f970f170cc2570cbe48" dependencies = [ "cranelift-codegen", "libc", @@ -1103,18 +1085,18 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.98.1" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fd2f9f1bf29ce6639ae2f477a2fe20bad0bd09289df13efeb890e8e4b9f807" +checksum = "0231f9400cb80b18a6714f5b7112335c5d0bb33270e03f6730e38dd93077019a" dependencies = [ "cranelift-codegen", - "cranelift-entity 0.98.1", + "cranelift-entity", "cranelift-frontend", "itertools 0.10.5", "log", "smallvec", - "wasmparser 0.107.0", - "wasmtime-types 11.0.1", + "wasmparser", + "wasmtime-types", ] [[package]] @@ -1182,7 +1164,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -3054,7 +3036,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "wasmtime 11.0.1", + "wasmtime", ] [[package]] @@ -3243,15 +3225,6 @@ dependencies = [ "rustix 0.37.23", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -3419,18 +3392,6 @@ dependencies = [ "url", ] -[[package]] -name = "object" -version = "0.30.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" -dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", - "memchr", -] - [[package]] name = "object" version = "0.31.1" @@ -3480,7 +3441,7 @@ dependencies = [ "tokio", "tracing", "urlencoding", - "wasmtime 12.0.0", + "wasmtime", ] [[package]] @@ -4156,17 +4117,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pulldown-cmark" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - [[package]] name = "pulldown-cmark" version = "0.9.3" @@ -6206,16 +6156,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasmparser" -version = "0.107.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" -dependencies = [ - "indexmap 1.9.3", - "semver", -] - [[package]] name = "wasmparser" version = "0.110.0" @@ -6226,39 +6166,6 @@ dependencies = [ "semver", ] -[[package]] -name = "wasmtime" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1f817f2ca5070983c71f1205fbab5848c9073df7f4e1af9fdceb4cc4a1b8e5" -dependencies = [ - "anyhow", - "async-trait", - "bincode", - "bumpalo", - "cfg-if", - "fxprof-processed-profile", - "indexmap 1.9.3", - "libc", - "log", - "object 0.30.4", - "once_cell", - "paste", - "psm", - "serde", - "serde_json", - "target-lexicon", - "wasmparser 0.107.0", - "wasmtime-cache", - "wasmtime-component-macro 11.0.1", - "wasmtime-cranelift", - "wasmtime-environ 11.0.1", - "wasmtime-fiber 11.0.1", - "wasmtime-jit 11.0.1", - "wasmtime-runtime 11.0.1", - "windows-sys 0.48.0", -] - [[package]] name = "wasmtime" version = "12.0.0" @@ -6274,7 +6181,7 @@ dependencies = [ "indexmap 2.0.0", "libc", "log", - "object 0.31.1", + "object", "once_cell", "paste", "psm", @@ -6282,24 +6189,17 @@ dependencies = [ "serde_json", "target-lexicon", "wasm-encoder", - "wasmparser 0.110.0", - "wasmtime-component-macro 12.0.0", - "wasmtime-environ 12.0.0", - "wasmtime-fiber 12.0.0", - "wasmtime-jit 12.0.0", - "wasmtime-runtime 12.0.0", + "wasmparser", + "wasmtime-cache", + "wasmtime-component-macro", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit", + "wasmtime-runtime", "windows-sys 0.48.0", ] -[[package]] -name = "wasmtime-asm-macros" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f82fbfda4610e9225238c62574ecded8e9d6ad3a12f387ac45819ecad5c3f9b" -dependencies = [ - "cfg-if", -] - [[package]] name = "wasmtime-asm-macros" version = "12.0.0" @@ -6311,9 +6211,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "11.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f5b87f1ed383d6c219c04467ab6ae87990d6c2815d5a990138990a7fcbab95" +checksum = "4e8d45e68c6ba77c4dfd9f5b609b623890fa988a5c732610539018588ed40676" dependencies = [ "anyhow", "base64 0.21.2", @@ -6321,7 +6221,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.37.23", + "rustix 0.38.8", "serde", "sha2", "toml", @@ -6329,21 +6229,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "wasmtime-component-macro" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27b96c540c78e12b60025fcbc0ba8a55bff1b32885a5e8eae2df765a6bc97ac" -dependencies = [ - "anyhow", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasmtime-component-util 11.0.1", - "wasmtime-wit-bindgen 11.0.1", - "wit-parser 0.8.0", -] - [[package]] name = "wasmtime-component-macro" version = "12.0.0" @@ -6354,17 +6239,11 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.28", - "wasmtime-component-util 12.0.0", - "wasmtime-wit-bindgen 12.0.0", - "wit-parser 0.9.2", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", ] -[[package]] -name = "wasmtime-component-util" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0928fe66c22bf8887e2fb524b7647308b8ce836a333af8504e4f1d80b8ea849f" - [[package]] name = "wasmtime-component-util" version = "12.0.0" @@ -6373,60 +6252,42 @@ checksum = "0035b51b0b895d77d83af51b65283defd8bae10ce9521d8162d63c1f16090ab2" [[package]] name = "wasmtime-cranelift" -version = "11.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659f6e58662d1131f250339acd03aa49377f9351474282699985b79ca4d4a7c" +checksum = "2efd62f1f47103199c50f8b0c9df4125280ad4f2d6a0d2bec7b2b279f409fdf4" dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", - "cranelift-entity 0.98.1", + "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", "log", - "object 0.30.4", + "object", "target-lexicon", "thiserror", - "wasmparser 0.107.0", + "wasmparser", "wasmtime-cranelift-shared", - "wasmtime-environ 11.0.1", + "wasmtime-environ", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-cranelift-shared" -version = "11.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74171de083bf2ecb716c507900f825e2b858346c714fbf48f4763ea760f998a8" +checksum = "96c439bbe3b049a2c04fd4c6a3b937f8892d0f39e9ea180c6dd6ac94f349a034" dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", "cranelift-native", "gimli", - "object 0.30.4", + "object", "target-lexicon", - "wasmtime-environ 11.0.1", -] - -[[package]] -name = "wasmtime-environ" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b124cbac1a3e04a744c76b3f77919343ef16dc4c818a2406dd7b689b16a54639" -dependencies = [ - "anyhow", - "cranelift-entity 0.98.1", - "gimli", - "indexmap 1.9.3", - "log", - "object 0.30.4", - "serde", - "target-lexicon", - "thiserror", - "wasmparser 0.107.0", - "wasmtime-types 11.0.1", + "wasmtime-environ", ] [[package]] @@ -6436,29 +6297,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1371be0e60ebb9790baf41f3d51c8741b7abca210bedcab3aa09b170167456c7" dependencies = [ "anyhow", - "cranelift-entity 0.99.0", + "cranelift-entity", "gimli", "indexmap 2.0.0", "log", - "object 0.31.1", + "object", "serde", "target-lexicon", "thiserror", - "wasmparser 0.110.0", - "wasmtime-types 12.0.0", -] - -[[package]] -name = "wasmtime-fiber" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92ffb8869395c63100ffefbd71cf9489e7e9218e63a3798dcfe93fa8945f9cf" -dependencies = [ - "cc", - "cfg-if", - "rustix 0.37.23", - "wasmtime-asm-macros 11.0.1", - "windows-sys 0.48.0", + "wasmparser", + "wasmtime-types", ] [[package]] @@ -6470,68 +6318,35 @@ dependencies = [ "cc", "cfg-if", "rustix 0.38.8", - "wasmtime-asm-macros 12.0.0", + "wasmtime-asm-macros", "wasmtime-versioned-export-macros", "windows-sys 0.48.0", ] -[[package]] -name = "wasmtime-jit" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ff15f426c2378f32ffb6d9b4370e3504231492e93f6968e8b5102c3256bbc4" -dependencies = [ - "addr2line 0.19.0", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle", - "gimli", - "log", - "object 0.30.4", - "rustc-demangle", - "rustix 0.37.23", - "serde", - "target-lexicon", - "wasmtime-environ 11.0.1", - "wasmtime-jit-icache-coherence 11.0.1", - "wasmtime-runtime 11.0.1", - "windows-sys 0.48.0", -] - [[package]] name = "wasmtime-jit" version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6145785fdc6c6e36f1cc91aa04d03eedcad6d0d87ae5d0708355cd3dbc7882b" dependencies = [ - "addr2line 0.20.0", + "addr2line", "anyhow", "bincode", "cfg-if", "cpp_demangle", "gimli", "log", - "object 0.31.1", + "object", "rustc-demangle", "rustix 0.38.8", "serde", "target-lexicon", - "wasmtime-environ 12.0.0", - "wasmtime-jit-icache-coherence 12.0.0", - "wasmtime-runtime 12.0.0", + "wasmtime-environ", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime", "windows-sys 0.48.0", ] -[[package]] -name = "wasmtime-jit-debug" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c549e219102426aa1f90bd18e56a3195ed1e696c318abb3f501c1f4924b530ac" -dependencies = [ - "once_cell", -] - [[package]] name = "wasmtime-jit-debug" version = "12.0.0" @@ -6542,17 +6357,6 @@ dependencies = [ "wasmtime-versioned-export-macros", ] -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf02fedda287a409cff80ad40a7c6c0f0771e99b0cd5e2b79d9cb7ecdc1b2f4" -dependencies = [ - "cfg-if", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "wasmtime-jit-icache-coherence" version = "12.0.0" @@ -6564,32 +6368,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wasmtime-runtime" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc38c6229a5d3b8a2528eb33eb11d3e7ebf570259c7cd2f01e8668fe783ea443" -dependencies = [ - "anyhow", - "cc", - "cfg-if", - "indexmap 1.9.3", - "libc", - "log", - "mach", - "memfd", - "memoffset 0.8.0", - "paste", - "rand 0.8.5", - "rustix 0.37.23", - "sptr", - "wasmtime-asm-macros 11.0.1", - "wasmtime-environ 11.0.1", - "wasmtime-fiber 11.0.1", - "wasmtime-jit-debug 11.0.1", - "windows-sys 0.48.0", -] - [[package]] name = "wasmtime-runtime" version = "12.0.0" @@ -6604,42 +6382,30 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.9.0", + "memoffset", "paste", "rand 0.8.5", "rustix 0.38.8", "sptr", "wasm-encoder", - "wasmtime-asm-macros 12.0.0", - "wasmtime-environ 12.0.0", - "wasmtime-fiber 12.0.0", - "wasmtime-jit-debug 12.0.0", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "windows-sys 0.48.0", ] -[[package]] -name = "wasmtime-types" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "768f6c5e7afc3a02eff2753196741db8e5ac5faf26a1e2204d7341b30a637c6f" -dependencies = [ - "cranelift-entity 0.98.1", - "serde", - "thiserror", - "wasmparser 0.107.0", -] - [[package]] name = "wasmtime-types" version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73ca1bccb131a6d878523aa89e94b58607b96cbca86a9ba2292f6d769b6cbcec" dependencies = [ - "cranelift-entity 0.99.0", + "cranelift-entity", "serde", "thiserror", - "wasmparser 0.110.0", + "wasmparser", ] [[package]] @@ -6653,17 +6419,6 @@ dependencies = [ "syn 2.0.28", ] -[[package]] -name = "wasmtime-wit-bindgen" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a4a005a6a2d5faa7cd953d389da8ae979cb571fe40edec7769649d8c98d874" -dependencies = [ - "anyhow", - "heck", - "wit-parser 0.8.0", -] - [[package]] name = "wasmtime-wit-bindgen" version = "12.0.0" @@ -6673,7 +6428,7 @@ dependencies = [ "anyhow", "heck", "indexmap 2.0.0", - "wit-parser 0.9.2", + "wit-parser", ] [[package]] @@ -6919,22 +6674,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "wit-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 1.9.3", - "log", - "pulldown-cmark 0.8.0", - "semver", - "unicode-xid", - "url", -] - [[package]] name = "wit-parser" version = "0.9.2" @@ -6945,7 +6684,7 @@ dependencies = [ "id-arena", "indexmap 2.0.0", "log", - "pulldown-cmark 0.9.3", + "pulldown-cmark", "semver", "unicode-xid", "url", diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index a264faf4..d53c6796 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -13,7 +13,7 @@ serde_json.workspace = true thiserror.workspace = true tokio = { version = "1.32.0", features = ["io-util"] } tracing.workspace = true -wasmtime = { version = "11.0.1", default-features = false, features = ["async", "cranelift"] } +wasmtime = { version = "12.0.0", default-features = false, features = ["async", "cranelift"] } mas-data-model = { path = "../data-model" } oauth2-types = { path = "../oauth2-types" } diff --git a/deny.toml b/deny.toml index f2d59dec..45d84793 100644 --- a/deny.toml +++ b/deny.toml @@ -65,9 +65,6 @@ skip = [ { name = "regex-automata", version = "0.1.10" }, # ^ { name = "ordered-float", version = "2.10.0" }, # opentelemetry-jaeger -> thrift depends on the old version { name = "rustix", version = "0.37.23" }, # wasmtime depends on the old version - { name = "object", version = "0.30.4" }, # wasmtime depends on the old version - { name = "memoffset", version = "0.8.0" }, # wasmtime depends on the old version - { name = "addr2line", version = "0.19.0" }, # wasmtime depends on the old version { name = "itertools", version = "0.10.5" }, # wasmtime & others depends on the old version { name = "idna", version = "0.3.0" }, # lettre depends on an old version { name = "hashbrown" }, # Too many versions :(