From 5fec441dd7f74a35e9a83c4c47b8cededbb76b1b Mon Sep 17 00:00:00 2001 From: Felix Hanau Date: Mon, 26 Oct 2026 13:27:04 -0400 Subject: [PATCH 1/3] [build] Update rules_rust --- MODULE.bazel.lock | 4 +- build/deps/gen/build_deps.MODULE.bazel | 2 +- deps/rust/Cargo.lock | 128 +++-- deps/rust/Cargo.toml | 6 +- deps/rust/cargo-bazel-lock.json | 498 +++++++++--------- ...gate-coverage-info-through-link_deps.patch | 2 +- src/rust/cxx/kj-hyper/tls.rs | 8 +- 7 files changed, 319 insertions(+), 329 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index e5c627d6ddf..4ad15696407 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -353,8 +353,8 @@ "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/source.json": "37c10335f2361c337c5c1f34ed36d2da70534c23088062b33a8bdaab68aa9dea", "https://bcr.bazel.build/modules/rules_rust/0.69.0/MODULE.bazel": "4326fec48f2fef0d514de46346f7f77e200c82936dd08b91c9ef039fbdad5c10", - "https://bcr.bazel.build/modules/rules_rust/0.74.0/MODULE.bazel": "6e6fa04d7c8202f9cd63205ec9f96da39382a4ac971ee1d7a900fe8e1f68be17", - "https://bcr.bazel.build/modules/rules_rust/0.74.0/source.json": "04eac31b4536eb23dd8e8e8ca7e079d3c1c4ac99934d38aa54bbae36917c7507", + "https://bcr.bazel.build/modules/rules_rust/0.75.0/MODULE.bazel": "77452ad75faf65400abc8d0956033d5732c68d39478c9ac064288d3f484f6e34", + "https://bcr.bazel.build/modules/rules_rust/0.75.0/source.json": "6205a2156646606f99828f217931f4cd5c68f3ada35916dab6601020358bfc63", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b", "https://bcr.bazel.build/modules/rules_shell/0.4.1/MODULE.bazel": "00e501db01bbf4e3e1dd1595959092c2fadf2087b2852d3f553b5370f5633592", diff --git a/build/deps/gen/build_deps.MODULE.bazel b/build/deps/gen/build_deps.MODULE.bazel index 2f1036d111a..0f99914a399 100644 --- a/build/deps/gen/build_deps.MODULE.bazel +++ b/build/deps/gen/build_deps.MODULE.bazel @@ -104,7 +104,7 @@ bazel_dep(name = "rules_oci", version = "2.3.0") bazel_dep(name = "rules_python", version = "2.4.5") # rules_rust -bazel_dep(name = "rules_rust", version = "0.74.0") +bazel_dep(name = "rules_rust", version = "0.75.0") single_version_override( module_name = "rules_rust", patch_strip = 1, diff --git a/deps/rust/Cargo.lock b/deps/rust/Cargo.lock index 8ce972233a3..dcd888c7f82 100644 --- a/deps/rust/Cargo.lock +++ b/deps/rust/Cargo.lock @@ -66,9 +66,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "ast_node" -version = "6.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b127110e8724bd19447ac72f31a66a9c06ac6b2b1372d81b6f5f0a2bddc6d1bb" +checksum = "edf54a7a1bf98e127c22e9e2b9d19619092c74283fdc14e4d67da69780f90db6" dependencies = [ "quote", "swc_macros_common", @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "capnp" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f7ce2b1b49d58b2b754f9146ef07e3244f9b67e7563bc1292fbd5f01b142f0" +checksum = "98216f4102645406ce4dbb0d2b3511cae502537885bae5662812ccc1fe6b04e7" dependencies = [ "embedded-io", ] @@ -388,9 +388,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.6" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] name = "core-foundation" @@ -510,9 +510,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.10" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +checksum = "6a996a108feb8b427a6e12fcf6af4aa83409b79d72c15337d7741368131ee004" dependencies = [ "const-oid", "der_derive", @@ -522,9 +522,9 @@ dependencies = [ [[package]] name = "der_derive" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" +checksum = "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903" dependencies = [ "proc-macro2", "quote", @@ -586,9 +586,9 @@ dependencies = [ [[package]] name = "diplomat-runtime" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b2f28ba90d2ffa95a531ea479769d4a6b2f5f187cd76ab5fd3bdcd64b3603e" +checksum = "d9d981121ba76150987fda68185b37853c0b928a55dfdc28897348cd068440be" [[package]] name = "diplomat_core" @@ -1158,9 +1158,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" +checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0" dependencies = [ "displaydoc", "litemap", @@ -1218,9 +1218,9 @@ checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" [[package]] name = "icu_provider" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" +checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514" dependencies = [ "displaydoc", "icu_locale_core", @@ -1325,9 +1325,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "ixdtf" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3667095d64c3ecffc96463a21157b04bf3e252f6e8d5750b20c02e33c194e3" +checksum = "4754a1731458af0443709c9667302793d3f63cc90ec4ba4c8259f2b9515478e5" [[package]] name = "jni" @@ -1466,8 +1466,8 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lol_html" -version = "3.0.2" -source = "git+https://github.com/cloudflare/lol-html#c2cfb7b086ccaca10308365a3ed7205cba98608b" +version = "3.0.3" +source = "git+https://github.com/cloudflare/lol-html#e54f277bc2570b0a42aa3cb39254baeaff7d60ff" dependencies = [ "bitflags", "cfg-if", @@ -1485,7 +1485,7 @@ dependencies = [ [[package]] name = "lol_html_c_api" version = "1.4.0" -source = "git+https://github.com/cloudflare/lol-html#c2cfb7b086ccaca10308365a3ed7205cba98608b" +source = "git+https://github.com/cloudflare/lol-html#e54f277bc2570b0a42aa3cb39254baeaff7d60ff" dependencies = [ "encoding_rs", "libc", @@ -1572,9 +1572,9 @@ dependencies = [ [[package]] name = "notify-types" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" +checksum = "0a437a9308232ce794b1e7fdf540d38ea37efc3c73492640c13b4c8568b8f108" dependencies = [ "bitflags", ] @@ -2367,9 +2367,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.2" +version = "1.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" +checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" [[package]] name = "socket2" @@ -2383,9 +2383,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +checksum = "7ef958a98b9d5da290cfc78946e9f3e61e1e62a18db0d92cac0b83cc161491a9" dependencies = [ "base64ct", "der", @@ -2454,9 +2454,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872e3beee92f0d63a7948ac03266c72a91cabf4c54d660ce992d448135ab5aec" +checksum = "142d2a06cafce623859ca799f5d1935bb8a886f18b66a2585ddeadff210121d0" dependencies = [ "anyhow", "ast_node", @@ -2506,9 +2506,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "28.0.0" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b25e2e91491e0e82f932c7a5a07f5c90bd227dbde0c34aeb231d5b3a5e5107" +checksum = "2839d2cf4e611b944438c304ec59396221b3db4580acd172fcd70522bb450ee9" dependencies = [ "bitflags", "is-macro", @@ -2525,9 +2525,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "31.0.0" +version = "32.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f512e8afa1eb427f87913a0d918f5c509a6d8b26027275025e2856a14883c" +checksum = "967aff044e24cd2c725cdc3067835824fcde9a918ef3222512db8b08bb479966" dependencies = [ "ascii", "compact_str 0.7.1", @@ -2560,9 +2560,9 @@ dependencies = [ [[package]] name = "swc_ecma_hooks" -version = "0.12.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ab2d337400963b24f764b3630eaa31cd28bd0c7f408ca9f41cf3a8fcadb917" +checksum = "f3abc7b19ffc01d358fe6dfce904cc0a9c30c4db6deed11011b67c320f71682c" dependencies = [ "swc_atoms", "swc_common", @@ -2572,12 +2572,11 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "44.0.0" +version = "46.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c83ff3be8652d2caf9f074853f8c33a4a05b17079c1586f195eec17d3ec553" +checksum = "a032f869f6690d4eddd6e67757c8d849f2c8219d8c5f3bb05a7ec8b456867642" dependencies = [ "bitflags", - "compact_str 0.7.1", "either", "num-bigint", "phf 0.11.3", @@ -2592,9 +2591,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "48.0.0" +version = "50.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b847c1419056e271c11a2fe1d36f988c9f121d0239ec401cbb3e622480ee3e8" +checksum = "23900618b7d3080d867559bdea5c4b696160ab7cdc97b4781b2353d2b5b9c485" dependencies = [ "better_scoped_tls", "indexmap", @@ -2614,9 +2613,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "54.0.0" +version = "56.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fa764bc0ea6a9ca6683fe5c32faf50accc8a6b86b96d4b124429473307ef30" +checksum = "2b8afd049010c50a4da9a46622a80ad89961a399f91d987ff30e5d36bad6beb4" dependencies = [ "base64 0.22.1", "bytes-str", @@ -2639,9 +2638,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "54.0.0" +version = "56.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5e4792f858bd3751db6407e7e230927897e716078c885f8a18c0ab28939cf" +checksum = "af1a8eb6123ae1d50351098cc218799f7cc028d147a7c8b7f700e2d7237c0aaf" dependencies = [ "bytes-str", "rustc-hash", @@ -2657,9 +2656,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "34.0.0" +version = "35.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0adbc5dd5676057ce6b0f63618838ba8691240972e3374189463f64214dd5e" +checksum = "6a742b49806aa9fee33b68c354ee7cc112be59aabad6534a64e2aaac3d28508a" dependencies = [ "dragonbox_ecma", "indexmap", @@ -2676,9 +2675,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "28.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a8e8f80fdada267a6b556199be3f11ef491184e12270877c76cf2dca522ac0" +checksum = "a830a070fea84a3a8a8c556463f0551e3bfc6cf2f8bdeecd62fa753e22a72289" dependencies = [ "new_debug_unreachable", "num-bigint", @@ -2732,12 +2731,11 @@ dependencies = [ [[package]] name = "swc_ts_fast_strip" -version = "57.0.0" +version = "59.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd56ddccae2ebc63e93392b2bca5d41f7c6f3072bad1bb56409b80409d19a57" +checksum = "fb19ef5bf46cb01138c4460ae0a20c210fc3eb8da6919a766a19751b1d6847c6" dependencies = [ "anyhow", - "bytes-str", "serde", "swc_atoms", "swc_common", @@ -2875,9 +2873,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" +checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a" dependencies = [ "displaydoc", "serde_core", @@ -2982,9 +2980,9 @@ checksum = "0825d2e09dcae814a4273c1e1435979d414ede25b2ee235b1545da6682483765" [[package]] name = "unicode-ident" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" [[package]] name = "unicode-normalization" @@ -2997,9 +2995,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "unicode_names2" @@ -3277,9 +3275,9 @@ dependencies = [ [[package]] name = "x509-cert" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" +checksum = "105ef4642d9cb137ef83d623d0e4bf08b8adf69e9918ca904a174adb6d3d038b" dependencies = [ "const-oid", "der", @@ -3288,9 +3286,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -3370,9 +3368,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" +checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40" dependencies = [ "serde", "yoke", @@ -3382,9 +3380,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" +checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", diff --git a/deps/rust/Cargo.toml b/deps/rust/Cargo.toml index 8def4e053f3..1b5dc978871 100644 --- a/deps/rust/Cargo.toml +++ b/deps/rust/Cargo.toml @@ -106,7 +106,7 @@ tower-service = "0.3" # kj-rs-io: net (sockets), io-util (`try_read_buf` into uninitialized buffers is gated on it), # signal, sync (Notify), time; rt/rt-multi-thread are kj-rs-tokio's. tokio = { version = "1", default-features = false, features = ["io-util", "net", "rt", "rt-multi-thread", "signal", "sync", "time"] } -x509-cert = { version = "0.2", default-features = false } +x509-cert = { version = "0.3", default-features = false } tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } # socket2 provides sockaddr handling for the tokio-backed kj-rs-io networking layer. socket2 = "0.6" @@ -122,5 +122,5 @@ windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Network # changes by re-stamping the watched files, so it needs nothing backend-specific. notify = "8" tracing = { version = "0", default-features = false, features = ["std"] } -swc_common = "25" -swc_ts_fast_strip = "57" +swc_common = "26" +swc_ts_fast_strip = "59" diff --git a/deps/rust/cargo-bazel-lock.json b/deps/rust/cargo-bazel-lock.json index a70d882adef..8c2cca04a80 100644 --- a/deps/rust/cargo-bazel-lock.json +++ b/deps/rust/cargo-bazel-lock.json @@ -2,7 +2,7 @@ "binary_crates": [ "capnpc 0.27.0" ], - "checksum": "4f7c905fb454b3d367e5ae35edc0a5d3b38300d86a842ca721465a1cb99a6cc0", + "checksum": "5e06b8d047481c7bd095ba1ca04dd028c1085a6cafa2d2e95a9f0800e7a5dbcd", "conditions": { "aarch64-apple-darwin": [ "aarch64-apple-darwin" @@ -489,7 +489,7 @@ ], "version": "1.1.0" }, - "ast_node 6.1.0": { + "ast_node 7.0.0": { "common_attrs": { "deps": [ { @@ -516,8 +516,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "b127110e8724bd19447ac72f31a66a9c06ac6b2b1372d81b6f5f0a2bddc6d1bb", - "url": "https://static.crates.io/crates/ast_node/6.1.0/download" + "sha256": "edf54a7a1bf98e127c22e9e2b9d19619092c74283fdc14e4d67da69780f90db6", + "url": "https://static.crates.io/crates/ast_node/7.0.0/download" } }, "targets": [ @@ -528,7 +528,7 @@ } } ], - "version": "6.1.0" + "version": "7.0.0" }, "async-trait 0.1.92": { "common_attrs": { @@ -1161,7 +1161,7 @@ ], "version": "0.2.4" }, - "capnp 0.27.2": { + "capnp 0.27.3": { "common_attrs": { "crate_features": [ "alloc", @@ -1180,8 +1180,8 @@ "package_url": "https://github.com/capnproto/capnproto-rust", "repository": { "Http": { - "sha256": "93f7ce2b1b49d58b2b754f9146ef07e3244f9b67e7563bc1292fbd5f01b142f0", - "url": "https://static.crates.io/crates/capnp/0.27.2/download" + "sha256": "98216f4102645406ce4dbb0d2b3511cae502537885bae5662812ccc1fe6b04e7", + "url": "https://static.crates.io/crates/capnp/0.27.3/download" } }, "targets": [ @@ -1192,13 +1192,13 @@ } } ], - "version": "0.27.2" + "version": "0.27.3" }, "capnp-futures 0.27.0": { "common_attrs": { "deps": [ { - "id": "capnp 0.27.2", + "id": "capnp 0.27.3", "target": "capnp" }, { @@ -1240,7 +1240,7 @@ "common_attrs": { "deps": [ { - "id": "capnp 0.27.2", + "id": "capnp 0.27.3", "target": "capnp" }, { @@ -1282,7 +1282,7 @@ "common_attrs": { "deps": [ { - "id": "capnp 0.27.2", + "id": "capnp 0.27.3", "target": "capnp" } ], @@ -1712,7 +1712,7 @@ "target": "termcolor" }, { - "id": "unicode-width 0.2.2", + "id": "unicode-width 0.2.3", "target": "unicode_width" } ], @@ -1886,12 +1886,12 @@ ], "version": "0.9.1" }, - "const-oid 0.9.6": { + "const-oid 0.10.2": { "common_attrs": { "crate_features": [ "db" ], - "edition": "2021" + "edition": "2024" }, "library_target_name": "const_oid", "license": "Apache-2.0 OR MIT", @@ -1901,11 +1901,11 @@ "MIT" ], "name": "const-oid", - "package_url": "https://github.com/RustCrypto/formats/tree/master/const-oid", + "package_url": "https://github.com/RustCrypto/formats", "repository": { "Http": { - "sha256": "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8", - "url": "https://static.crates.io/crates/const-oid/0.9.6/download" + "sha256": "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c", + "url": "https://static.crates.io/crates/const-oid/0.10.2/download" } }, "targets": [ @@ -1916,7 +1916,7 @@ } } ], - "version": "0.9.6" + "version": "0.10.2" }, "core-foundation 0.10.1": { "common_attrs": { @@ -2317,7 +2317,7 @@ "target": "phf" }, { - "id": "smallvec 1.16.2", + "id": "smallvec 1.16.4", "target": "smallvec" } ], @@ -2465,7 +2465,7 @@ ], "version": "0.8.0" }, - "der 0.7.10": { + "der 0.8.3": { "common_attrs": { "crate_features": [ "alloc", @@ -2475,7 +2475,7 @@ ], "deps": [ { - "id": "const-oid 0.9.6", + "id": "const-oid 0.10.2", "target": "const_oid" }, { @@ -2483,10 +2483,10 @@ "target": "flagset" } ], - "edition": "2021", + "edition": "2024", "proc_macro_deps": [ { - "id": "der_derive 0.7.3", + "id": "der_derive 0.8.0", "target": "der_derive" } ] @@ -2499,11 +2499,11 @@ "MIT" ], "name": "der", - "package_url": "https://github.com/RustCrypto/formats/tree/master/der", + "package_url": "https://github.com/RustCrypto/formats", "repository": { "Http": { - "sha256": "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb", - "url": "https://static.crates.io/crates/der/0.7.10/download" + "sha256": "6a996a108feb8b427a6e12fcf6af4aa83409b79d72c15337d7741368131ee004", + "url": "https://static.crates.io/crates/der/0.8.3/download" } }, "targets": [ @@ -2514,9 +2514,9 @@ } } ], - "version": "0.7.10" + "version": "0.8.3" }, - "der_derive 0.7.3": { + "der_derive 0.8.0": { "common_attrs": { "deps": [ { @@ -2532,7 +2532,7 @@ "target": "syn" } ], - "edition": "2021" + "edition": "2024" }, "library_target_name": "der_derive", "license": "Apache-2.0 OR MIT", @@ -2542,11 +2542,11 @@ "MIT" ], "name": "der_derive", - "package_url": "https://github.com/RustCrypto/formats/tree/master/der/derive", + "package_url": "https://github.com/RustCrypto/formats", "repository": { "Http": { - "sha256": "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18", - "url": "https://static.crates.io/crates/der_derive/0.7.3/download" + "sha256": "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903", + "url": "https://static.crates.io/crates/der_derive/0.8.0/download" } }, "targets": [ @@ -2557,7 +2557,7 @@ } } ], - "version": "0.7.3" + "version": "0.8.0" }, "derive_more 2.1.1": { "common_attrs": { @@ -2783,7 +2783,7 @@ ], "version": "0.16.1" }, - "diplomat-runtime 0.15.2": { + "diplomat-runtime 0.16.1": { "common_attrs": { "edition": "2021" }, @@ -2798,8 +2798,8 @@ "package_url": "https://github.com/rust-diplomat/diplomat", "repository": { "Http": { - "sha256": "25b2f28ba90d2ffa95a531ea479769d4a6b2f5f187cd76ab5fd3bdcd64b3603e", - "url": "https://static.crates.io/crates/diplomat-runtime/0.15.2/download" + "sha256": "d9d981121ba76150987fda68185b37853c0b928a55dfdc28897348cd068440be", + "url": "https://static.crates.io/crates/diplomat-runtime/0.16.1/download" } }, "targets": [ @@ -2810,7 +2810,7 @@ } } ], - "version": "0.15.2" + "version": "0.16.1" }, "diplomat_core 0.16.1": { "common_attrs": { @@ -2828,7 +2828,7 @@ "target": "serde" }, { - "id": "smallvec 1.16.2", + "id": "smallvec 1.16.4", "target": "smallvec" }, { @@ -2887,7 +2887,7 @@ "target": "bytes" }, { - "id": "capnp 0.27.2", + "id": "capnp 0.27.3", "target": "capnp" }, { @@ -3067,11 +3067,11 @@ "target": "static_assertions" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ts_fast_strip 57.0.0", + "id": "swc_ts_fast_strip 59.0.2", "target": "swc_ts_fast_strip" }, { @@ -3115,7 +3115,7 @@ "target": "windows_sys" }, { - "id": "x509-cert 0.2.5", + "id": "x509-cert 0.3.0", "target": "x509_cert" } ], @@ -4337,7 +4337,7 @@ ], "deps": [ { - "id": "unicode-width 0.2.2", + "id": "unicode-width 0.2.3", "target": "unicode_width" } ], @@ -5161,7 +5161,7 @@ "target": "pin_project_lite" }, { - "id": "smallvec 1.16.2", + "id": "smallvec 1.16.4", "target": "smallvec" }, { @@ -5315,19 +5315,19 @@ "target": "icu_locale" }, { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { - "id": "icu_provider 2.3.1", + "id": "icu_provider 2.4.0", "target": "icu_provider" }, { - "id": "tinystr 0.8.4", + "id": "tinystr 0.8.5", "target": "tinystr" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5413,7 +5413,7 @@ "target": "utf8_iter" }, { - "id": "yoke 0.8.3", + "id": "yoke 0.8.4", "target": "yoke" }, { @@ -5421,7 +5421,7 @@ "target": "zerofrom" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5468,7 +5468,7 @@ "target": "icu_collections" }, { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { @@ -5476,7 +5476,7 @@ "target": "icu_locale_data" }, { - "id": "icu_provider 2.3.1", + "id": "icu_provider 2.4.0", "target": "icu_provider" }, { @@ -5484,11 +5484,11 @@ "target": "potential_utf" }, { - "id": "tinystr 0.8.4", + "id": "tinystr 0.8.5", "target": "tinystr" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5518,7 +5518,7 @@ ], "version": "2.2.0" }, - "icu_locale_core 2.3.0": { + "icu_locale_core 2.4.0": { "common_attrs": { "crate_features": [ "alloc", @@ -5530,7 +5530,7 @@ "target": "litemap" }, { - "id": "tinystr 0.8.4", + "id": "tinystr 0.8.5", "target": "tinystr" }, { @@ -5538,7 +5538,7 @@ "target": "writeable" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5560,8 +5560,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb", - "url": "https://static.crates.io/crates/icu_locale_core/2.3.0/download" + "sha256": "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0", + "url": "https://static.crates.io/crates/icu_locale_core/2.4.0/download" } }, "targets": [ @@ -5572,7 +5572,7 @@ } } ], - "version": "2.3.0" + "version": "2.4.0" }, "icu_locale_data 2.2.0": { "build_script_attrs": {}, @@ -5627,15 +5627,15 @@ "target": "icu_normalizer_data" }, { - "id": "icu_provider 2.3.1", + "id": "icu_provider 2.4.0", "target": "icu_provider" }, { - "id": "smallvec 1.16.2", + "id": "smallvec 1.16.4", "target": "smallvec" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5714,7 +5714,7 @@ "target": "icu_collections" }, { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { @@ -5722,7 +5722,7 @@ "target": "icu_properties_data" }, { - "id": "icu_provider 2.3.1", + "id": "icu_provider 2.4.0", "target": "icu_provider" }, { @@ -5730,7 +5730,7 @@ "target": "zerotrie" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5798,7 +5798,7 @@ ], "version": "2.2.0" }, - "icu_provider 2.3.1": { + "icu_provider 2.4.0": { "common_attrs": { "crate_features": [ "alloc", @@ -5806,7 +5806,7 @@ ], "deps": [ { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { @@ -5818,7 +5818,7 @@ "target": "writeable" }, { - "id": "yoke 0.8.3", + "id": "yoke 0.8.4", "target": "yoke" }, { @@ -5830,7 +5830,7 @@ "target": "zerotrie" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -5852,8 +5852,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73", - "url": "https://static.crates.io/crates/icu_provider/2.3.1/download" + "sha256": "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514", + "url": "https://static.crates.io/crates/icu_provider/2.4.0/download" } }, "targets": [ @@ -5864,7 +5864,7 @@ } } ], - "version": "2.3.1" + "version": "2.4.0" }, "idna 1.1.0": { "common_attrs": { @@ -5879,7 +5879,7 @@ "target": "idna_adapter" }, { - "id": "smallvec 1.16.2", + "id": "smallvec 1.16.4", "target": "smallvec" }, { @@ -6262,7 +6262,7 @@ ], "version": "1.0.18" }, - "ixdtf 0.6.6": { + "ixdtf 0.6.7": { "common_attrs": { "crate_features": [ "default", @@ -6280,8 +6280,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "4d3667095d64c3ecffc96463a21157b04bf3e252f6e8d5750b20c02e33c194e3", - "url": "https://static.crates.io/crates/ixdtf/0.6.6/download" + "sha256": "4754a1731458af0443709c9667302793d3f63cc90ec4ba4c8259f2b9515478e5", + "url": "https://static.crates.io/crates/ixdtf/0.6.7/download" } }, "targets": [ @@ -6292,7 +6292,7 @@ } } ], - "version": "0.6.6" + "version": "0.6.7" }, "jni 0.22.4": { "build_script_attrs": { @@ -6920,7 +6920,7 @@ ], "version": "0.4.34" }, - "lol_html 3.0.2": { + "lol_html 3.0.3": { "common_attrs": { "deps": [ { @@ -6981,7 +6981,7 @@ "repository": { "Git": { "commitish": { - "Rev": "c2cfb7b086ccaca10308365a3ed7205cba98608b" + "Rev": "e54f277bc2570b0a42aa3cb39254baeaff7d60ff" }, "remote": "https://github.com/cloudflare/lol-html" } @@ -6994,7 +6994,7 @@ } } ], - "version": "3.0.2" + "version": "3.0.3" }, "lol_html_c_api 1.4.0": { "build_script_attrs": { @@ -7015,7 +7015,7 @@ "target": "libc" }, { - "id": "lol_html 3.0.2", + "id": "lol_html 3.0.3", "target": "lol_html" }, { @@ -7036,7 +7036,7 @@ "repository": { "Git": { "commitish": { - "Rev": "c2cfb7b086ccaca10308365a3ed7205cba98608b" + "Rev": "e54f277bc2570b0a42aa3cb39254baeaff7d60ff" }, "remote": "https://github.com/cloudflare/lol-html", "strip_prefix": "c-api" @@ -7389,7 +7389,7 @@ "target": "log" }, { - "id": "notify-types 2.1.0", + "id": "notify-types 2.2.0", "target": "notify_types" }, { @@ -7478,7 +7478,7 @@ ], "version": "8.2.1" }, - "notify-types 2.1.0": { + "notify-types 2.2.0": { "common_attrs": { "deps": [ { @@ -7486,7 +7486,7 @@ "target": "bitflags" } ], - "edition": "2021" + "edition": "2024" }, "library_target_name": "notify_types", "license": "MIT OR Apache-2.0", @@ -7499,8 +7499,8 @@ "package_url": "https://github.com/notify-rs/notify.git", "repository": { "Http": { - "sha256": "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a", - "url": "https://static.crates.io/crates/notify-types/2.1.0/download" + "sha256": "0a437a9308232ce794b1e7fdf540d38ea37efc3c73492640c13b4c8568b8f108", + "url": "https://static.crates.io/crates/notify-types/2.2.0/download" } }, "targets": [ @@ -7511,7 +7511,7 @@ } } ], - "version": "2.1.0" + "version": "2.2.0" }, "num-bigint 0.4.8": { "common_attrs": { @@ -8479,7 +8479,7 @@ "target": "writeable" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -8586,7 +8586,7 @@ ], "deps": [ { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" } ], @@ -9476,7 +9476,7 @@ "target": "static_assertions" }, { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" }, { @@ -9532,7 +9532,7 @@ "target": "ruff_text_size" }, { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" } ], @@ -10525,7 +10525,7 @@ "target": "servo_arc" }, { - "id": "smallvec 1.16.2", + "id": "smallvec 1.16.4", "target": "smallvec" } ], @@ -11270,7 +11270,7 @@ ], "version": "0.4.12" }, - "smallvec 1.16.2": { + "smallvec 1.16.4": { "common_attrs": { "crate_features": [ "const_generics", @@ -11289,8 +11289,8 @@ "package_url": "https://github.com/servo/rust-smallvec", "repository": { "Http": { - "sha256": "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e", - "url": "https://static.crates.io/crates/smallvec/1.16.2/download" + "sha256": "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8", + "url": "https://static.crates.io/crates/smallvec/1.16.4/download" } }, "targets": [ @@ -11301,7 +11301,7 @@ } } ], - "version": "1.16.2" + "version": "1.16.4" }, "socket2 0.6.5": { "common_attrs": { @@ -11352,18 +11352,18 @@ ], "version": "0.6.5" }, - "spki 0.7.3": { + "spki 0.8.1": { "common_attrs": { "crate_features": [ "alloc" ], "deps": [ { - "id": "der 0.7.10", + "id": "der 0.8.3", "target": "der" } ], - "edition": "2021" + "edition": "2024" }, "library_target_name": "spki", "license": "Apache-2.0 OR MIT", @@ -11373,11 +11373,11 @@ "MIT" ], "name": "spki", - "package_url": "https://github.com/RustCrypto/formats/tree/master/spki", + "package_url": "https://github.com/RustCrypto/formats", "repository": { "Http": { - "sha256": "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d", - "url": "https://static.crates.io/crates/spki/0.7.3/download" + "sha256": "7ef958a98b9d5da290cfc78946e9f3e61e1e62a18db0d92cac0b83cc161491a9", + "url": "https://static.crates.io/crates/spki/0.8.1/download" } }, "targets": [ @@ -11388,7 +11388,7 @@ } } ], - "version": "0.7.3" + "version": "0.8.1" }, "stable_deref_trait 1.2.1": { "common_attrs": { @@ -11460,7 +11460,7 @@ ], "deps": [ { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" } ], @@ -11648,7 +11648,7 @@ ], "version": "10.0.0" }, - "swc_common 25.0.0": { + "swc_common 26.0.0": { "common_attrs": { "crate_features": [ "default", @@ -11708,7 +11708,7 @@ "target": "tracing" }, { - "id": "unicode-width 0.2.2", + "id": "unicode-width 0.2.3", "target": "unicode_width" }, { @@ -11719,7 +11719,7 @@ "edition": "2021", "proc_macro_deps": [ { - "id": "ast_node 6.1.0", + "id": "ast_node 7.0.0", "target": "ast_node" }, { @@ -11741,8 +11741,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "872e3beee92f0d63a7948ac03266c72a91cabf4c54d660ce992d448135ab5aec", - "url": "https://static.crates.io/crates/swc_common/25.0.0/download" + "sha256": "142d2a06cafce623859ca799f5d1935bb8a886f18b66a2585ddeadff210121d0", + "url": "https://static.crates.io/crates/swc_common/26.0.0/download" } }, "targets": [ @@ -11753,7 +11753,7 @@ } } ], - "version": "25.0.0" + "version": "26.0.0" }, "swc_config 6.0.1": { "common_attrs": { @@ -11855,7 +11855,7 @@ ], "version": "1.0.1" }, - "swc_ecma_ast 28.0.0": { + "swc_ecma_ast 29.0.2": { "common_attrs": { "crate_features": [ "default" @@ -11886,7 +11886,7 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { @@ -11919,8 +11919,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "08b25e2e91491e0e82f932c7a5a07f5c90bd227dbde0c34aeb231d5b3a5e5107", - "url": "https://static.crates.io/crates/swc_ecma_ast/28.0.0/download" + "sha256": "2839d2cf4e611b944438c304ec59396221b3db4580acd172fcd70522bb450ee9", + "url": "https://static.crates.io/crates/swc_ecma_ast/29.0.2/download" } }, "targets": [ @@ -11931,9 +11931,9 @@ } } ], - "version": "28.0.0" + "version": "29.0.2" }, - "swc_ecma_codegen 31.0.0": { + "swc_ecma_codegen 32.0.5": { "common_attrs": { "deps": [ { @@ -11981,15 +11981,15 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_utils 34.0.0", + "id": "swc_ecma_utils 35.1.0", "target": "swc_ecma_utils" }, { @@ -12014,8 +12014,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "ad0f512e8afa1eb427f87913a0d918f5c509a6d8b26027275025e2856a14883c", - "url": "https://static.crates.io/crates/swc_ecma_codegen/31.0.0/download" + "sha256": "967aff044e24cd2c725cdc3067835824fcde9a918ef3222512db8b08bb479966", + "url": "https://static.crates.io/crates/swc_ecma_codegen/32.0.5/download" } }, "targets": [ @@ -12026,7 +12026,7 @@ } } ], - "version": "31.0.0" + "version": "32.0.5" }, "swc_ecma_codegen_macros 2.0.2": { "common_attrs": { @@ -12069,7 +12069,7 @@ ], "version": "2.0.2" }, - "swc_ecma_hooks 0.12.0": { + "swc_ecma_hooks 1.0.0": { "common_attrs": { "deps": [ { @@ -12077,15 +12077,15 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_visit 28.0.0", + "id": "swc_ecma_visit 29.0.0", "target": "swc_ecma_visit" } ], @@ -12100,8 +12100,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "59ab2d337400963b24f764b3630eaa31cd28bd0c7f408ca9f41cf3a8fcadb917", - "url": "https://static.crates.io/crates/swc_ecma_hooks/0.12.0/download" + "sha256": "f3abc7b19ffc01d358fe6dfce904cc0a9c30c4db6deed11011b67c320f71682c", + "url": "https://static.crates.io/crates/swc_ecma_hooks/1.0.0/download" } }, "targets": [ @@ -12112,9 +12112,9 @@ } } ], - "version": "0.12.0" + "version": "1.0.0" }, - "swc_ecma_parser 44.0.0": { + "swc_ecma_parser 46.1.2": { "common_attrs": { "crate_features": [ "typescript", @@ -12125,10 +12125,6 @@ "id": "bitflags 2.13.2", "target": "bitflags" }, - { - "id": "compact_str 0.7.1", - "target": "compact_str" - }, { "id": "either 1.19.0", "target": "either" @@ -12154,11 +12150,11 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { @@ -12183,8 +12179,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "53c83ff3be8652d2caf9f074853f8c33a4a05b17079c1586f195eec17d3ec553", - "url": "https://static.crates.io/crates/swc_ecma_parser/44.0.0/download" + "sha256": "a032f869f6690d4eddd6e67757c8d849f2c8219d8c5f3bb05a7ec8b456867642", + "url": "https://static.crates.io/crates/swc_ecma_parser/46.1.2/download" } }, "targets": [ @@ -12195,9 +12191,9 @@ } } ], - "version": "44.0.0" + "version": "46.1.2" }, - "swc_ecma_transforms_base 48.0.0": { + "swc_ecma_transforms_base 50.0.3": { "common_attrs": { "deps": [ { @@ -12233,23 +12229,23 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_parser 44.0.0", + "id": "swc_ecma_parser 46.1.2", "target": "swc_ecma_parser" }, { - "id": "swc_ecma_utils 34.0.0", + "id": "swc_ecma_utils 35.1.0", "target": "swc_ecma_utils" }, { - "id": "swc_ecma_visit 28.0.0", + "id": "swc_ecma_visit 29.0.0", "target": "swc_ecma_visit" }, { @@ -12268,8 +12264,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "2b847c1419056e271c11a2fe1d36f988c9f121d0239ec401cbb3e622480ee3e8", - "url": "https://static.crates.io/crates/swc_ecma_transforms_base/48.0.0/download" + "sha256": "23900618b7d3080d867559bdea5c4b696160ab7cdc97b4781b2353d2b5b9c485", + "url": "https://static.crates.io/crates/swc_ecma_transforms_base/50.0.3/download" } }, "targets": [ @@ -12280,9 +12276,9 @@ } } ], - "version": "48.0.0" + "version": "50.0.3" }, - "swc_ecma_transforms_react 54.0.0": { + "swc_ecma_transforms_react 56.0.1": { "common_attrs": { "crate_features": [ "default", @@ -12323,7 +12319,7 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { @@ -12331,27 +12327,27 @@ "target": "swc_config" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_hooks 0.12.0", + "id": "swc_ecma_hooks 1.0.0", "target": "swc_ecma_hooks" }, { - "id": "swc_ecma_parser 44.0.0", + "id": "swc_ecma_parser 46.1.2", "target": "swc_ecma_parser" }, { - "id": "swc_ecma_transforms_base 48.0.0", + "id": "swc_ecma_transforms_base 50.0.3", "target": "swc_ecma_transforms_base" }, { - "id": "swc_ecma_utils 34.0.0", + "id": "swc_ecma_utils 35.1.0", "target": "swc_ecma_utils" }, { - "id": "swc_ecma_visit 28.0.0", + "id": "swc_ecma_visit 29.0.0", "target": "swc_ecma_visit" } ], @@ -12372,8 +12368,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "46fa764bc0ea6a9ca6683fe5c32faf50accc8a6b86b96d4b124429473307ef30", - "url": "https://static.crates.io/crates/swc_ecma_transforms_react/54.0.0/download" + "sha256": "2b8afd049010c50a4da9a46622a80ad89961a399f91d987ff30e5d36bad6beb4", + "url": "https://static.crates.io/crates/swc_ecma_transforms_react/56.0.1/download" } }, "targets": [ @@ -12384,9 +12380,9 @@ } } ], - "version": "54.0.0" + "version": "56.0.1" }, - "swc_ecma_transforms_typescript 54.0.0": { + "swc_ecma_transforms_typescript 56.0.1": { "common_attrs": { "deps": [ { @@ -12406,27 +12402,27 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_transforms_base 48.0.0", + "id": "swc_ecma_transforms_base 50.0.3", "target": "swc_ecma_transforms_base" }, { - "id": "swc_ecma_transforms_react 54.0.0", + "id": "swc_ecma_transforms_react 56.0.1", "target": "swc_ecma_transforms_react" }, { - "id": "swc_ecma_utils 34.0.0", + "id": "swc_ecma_utils 35.1.0", "target": "swc_ecma_utils" }, { - "id": "swc_ecma_visit 28.0.0", + "id": "swc_ecma_visit 29.0.0", "target": "swc_ecma_visit" } ], @@ -12441,8 +12437,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "c4f5e4792f858bd3751db6407e7e230927897e716078c885f8a18c0ab28939cf", - "url": "https://static.crates.io/crates/swc_ecma_transforms_typescript/54.0.0/download" + "sha256": "af1a8eb6123ae1d50351098cc218799f7cc028d147a7c8b7f700e2d7237c0aaf", + "url": "https://static.crates.io/crates/swc_ecma_transforms_typescript/56.0.1/download" } }, "targets": [ @@ -12453,9 +12449,9 @@ } } ], - "version": "54.0.0" + "version": "56.0.1" }, - "swc_ecma_utils 34.0.0": { + "swc_ecma_utils 35.1.0": { "common_attrs": { "deps": [ { @@ -12487,15 +12483,15 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_visit 28.0.0", + "id": "swc_ecma_visit 29.0.0", "target": "swc_ecma_visit" }, { @@ -12514,8 +12510,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "ff0adbc5dd5676057ce6b0f63618838ba8691240972e3374189463f64214dd5e", - "url": "https://static.crates.io/crates/swc_ecma_utils/34.0.0/download" + "sha256": "6a742b49806aa9fee33b68c354ee7cc112be59aabad6534a64e2aaac3d28508a", + "url": "https://static.crates.io/crates/swc_ecma_utils/35.1.0/download" } }, "targets": [ @@ -12526,9 +12522,9 @@ } } ], - "version": "34.0.0" + "version": "35.1.0" }, - "swc_ecma_visit 28.0.0": { + "swc_ecma_visit 29.0.0": { "common_attrs": { "crate_features": [ "default" @@ -12547,11 +12543,11 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { @@ -12574,8 +12570,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "a3a8e8f80fdada267a6b556199be3f11ef491184e12270877c76cf2dca522ac0", - "url": "https://static.crates.io/crates/swc_ecma_visit/28.0.0/download" + "sha256": "a830a070fea84a3a8a8c556463f0551e3bfc6cf2f8bdeecd62fa753e22a72289", + "url": "https://static.crates.io/crates/swc_ecma_visit/29.0.0/download" } }, "targets": [ @@ -12586,7 +12582,7 @@ } } ], - "version": "28.0.0" + "version": "29.0.0" }, "swc_eq_ignore_macros 1.0.1": { "common_attrs": { @@ -12743,7 +12739,7 @@ ], "version": "10.0.2" }, - "swc_ts_fast_strip 57.0.0": { + "swc_ts_fast_strip 59.0.2": { "common_attrs": { "crate_features": [ "default" @@ -12753,10 +12749,6 @@ "id": "anyhow 1.0.104", "target": "anyhow" }, - { - "id": "bytes-str 0.2.9", - "target": "bytes_str" - }, { "id": "serde 1.0.229", "target": "serde" @@ -12766,35 +12758,35 @@ "target": "swc_atoms" }, { - "id": "swc_common 25.0.0", + "id": "swc_common 26.0.0", "target": "swc_common" }, { - "id": "swc_ecma_ast 28.0.0", + "id": "swc_ecma_ast 29.0.2", "target": "swc_ecma_ast" }, { - "id": "swc_ecma_codegen 31.0.0", + "id": "swc_ecma_codegen 32.0.5", "target": "swc_ecma_codegen" }, { - "id": "swc_ecma_parser 44.0.0", + "id": "swc_ecma_parser 46.1.2", "target": "swc_ecma_parser" }, { - "id": "swc_ecma_transforms_base 48.0.0", + "id": "swc_ecma_transforms_base 50.0.3", "target": "swc_ecma_transforms_base" }, { - "id": "swc_ecma_transforms_react 54.0.0", + "id": "swc_ecma_transforms_react 56.0.1", "target": "swc_ecma_transforms_react" }, { - "id": "swc_ecma_transforms_typescript 54.0.0", + "id": "swc_ecma_transforms_typescript 56.0.1", "target": "swc_ecma_transforms_typescript" }, { - "id": "swc_ecma_visit 28.0.0", + "id": "swc_ecma_visit 29.0.0", "target": "swc_ecma_visit" } ], @@ -12809,8 +12801,8 @@ "package_url": "https://github.com/swc-project/swc.git", "repository": { "Http": { - "sha256": "9dd56ddccae2ebc63e93392b2bca5d41f7c6f3072bad1bb56409b80409d19a57", - "url": "https://static.crates.io/crates/swc_ts_fast_strip/57.0.0/download" + "sha256": "fb19ef5bf46cb01138c4460ae0a20c210fc3eb8da6919a766a19751b1d6847c6", + "url": "https://static.crates.io/crates/swc_ts_fast_strip/59.0.2/download" } }, "targets": [ @@ -12821,7 +12813,7 @@ } } ], - "version": "57.0.0" + "version": "59.0.2" }, "swc_visit 2.0.2": { "common_attrs": { @@ -12881,7 +12873,7 @@ "target": "quote" }, { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" } ], @@ -12937,7 +12929,7 @@ "target": "quote" }, { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" } ], @@ -13050,7 +13042,7 @@ ], "deps": [ { - "id": "diplomat-runtime 0.15.2", + "id": "diplomat-runtime 0.16.1", "target": "diplomat_runtime" }, { @@ -13058,7 +13050,7 @@ "target": "icu_calendar" }, { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { @@ -13137,11 +13129,11 @@ "target": "icu_calendar" }, { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { - "id": "ixdtf 0.6.6", + "id": "ixdtf 0.6.7", "target": "ixdtf" }, { @@ -13153,7 +13145,7 @@ "target": "timezone_provider" }, { - "id": "tinystr 0.8.4", + "id": "tinystr 0.8.5", "target": "tinystr" }, { @@ -13327,7 +13319,7 @@ ], "deps": [ { - "id": "tinystr 0.8.4", + "id": "tinystr 0.8.5", "target": "tinystr" }, { @@ -13335,7 +13327,7 @@ "target": "zerotrie" }, { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" }, { @@ -13370,7 +13362,7 @@ ], "version": "0.2.6" }, - "tinystr 0.8.4": { + "tinystr 0.8.5": { "common_attrs": { "crate_features": [ "alloc", @@ -13379,7 +13371,7 @@ ], "deps": [ { - "id": "zerovec 0.11.8", + "id": "zerovec 0.11.9", "target": "zerovec" } ], @@ -13401,8 +13393,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643", - "url": "https://static.crates.io/crates/tinystr/0.8.4/download" + "sha256": "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a", + "url": "https://static.crates.io/crates/tinystr/0.8.5/download" } }, "targets": [ @@ -13413,7 +13405,7 @@ } } ], - "version": "0.8.4" + "version": "0.8.5" }, "tinyvec 1.13.3": { "common_attrs": { @@ -13903,7 +13895,7 @@ ], "version": "1.5.0" }, - "unicode-ident 1.0.26": { + "unicode-ident 1.0.27": { "common_attrs": { "edition": "2021" }, @@ -13919,8 +13911,8 @@ "package_url": "https://github.com/dtolnay/unicode-ident", "repository": { "Http": { - "sha256": "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954", - "url": "https://static.crates.io/crates/unicode-ident/1.0.26/download" + "sha256": "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563", + "url": "https://static.crates.io/crates/unicode-ident/1.0.27/download" } }, "targets": [ @@ -13931,7 +13923,7 @@ } } ], - "version": "1.0.26" + "version": "1.0.27" }, "unicode-normalization 0.1.26": { "common_attrs": { @@ -13973,7 +13965,7 @@ ], "version": "0.1.26" }, - "unicode-width 0.2.2": { + "unicode-width 0.2.3": { "common_attrs": { "crate_features": [ "cjk", @@ -13992,8 +13984,8 @@ "package_url": "https://github.com/unicode-rs/unicode-width", "repository": { "Http": { - "sha256": "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254", - "url": "https://static.crates.io/crates/unicode-width/0.2.2/download" + "sha256": "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557", + "url": "https://static.crates.io/crates/unicode-width/0.2.3/download" } }, "targets": [ @@ -14004,7 +13996,7 @@ } } ], - "version": "0.2.2" + "version": "0.2.3" }, "unicode_names2 1.3.0": { "build_script_attrs": { @@ -14623,7 +14615,7 @@ "common_attrs": { "deps": [ { - "id": "unicode-ident 1.0.26", + "id": "unicode-ident 1.0.27", "target": "unicode_ident" } ], @@ -15367,23 +15359,23 @@ ], "version": "0.5.1" }, - "x509-cert 0.2.5": { + "x509-cert 0.3.0": { "common_attrs": { "deps": [ { - "id": "const-oid 0.9.6", + "id": "const-oid 0.10.2", "target": "const_oid" }, { - "id": "der 0.7.10", + "id": "der 0.8.3", "target": "der" }, { - "id": "spki 0.7.3", + "id": "spki 0.8.1", "target": "spki" } ], - "edition": "2021" + "edition": "2024" }, "library_target_name": "x509_cert", "license": "Apache-2.0 OR MIT", @@ -15393,11 +15385,11 @@ "MIT" ], "name": "x509-cert", - "package_url": "https://github.com/RustCrypto/formats/tree/master/x509-cert", + "package_url": "https://github.com/RustCrypto/formats", "repository": { "Http": { - "sha256": "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94", - "url": "https://static.crates.io/crates/x509-cert/0.2.5/download" + "sha256": "105ef4642d9cb137ef83d623d0e4bf08b8adf69e9918ca904a174adb6d3d038b", + "url": "https://static.crates.io/crates/x509-cert/0.3.0/download" } }, "targets": [ @@ -15408,9 +15400,9 @@ } } ], - "version": "0.2.5" + "version": "0.3.0" }, - "yoke 0.8.3": { + "yoke 0.8.4": { "common_attrs": { "crate_features": [ "alloc", @@ -15445,8 +15437,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5", - "url": "https://static.crates.io/crates/yoke/0.8.3/download" + "sha256": "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3", + "url": "https://static.crates.io/crates/yoke/0.8.4/download" } }, "targets": [ @@ -15457,7 +15449,7 @@ } } ], - "version": "0.8.3" + "version": "0.8.4" }, "yoke-derive 0.8.4": { "common_attrs": { @@ -15730,7 +15722,7 @@ ], "deps": [ { - "id": "yoke 0.8.3", + "id": "yoke 0.8.4", "target": "yoke" }, { @@ -15770,7 +15762,7 @@ ], "version": "0.2.5" }, - "zerovec 0.11.8": { + "zerovec 0.11.9": { "common_attrs": { "crate_features": [ "alloc", @@ -15779,7 +15771,7 @@ ], "deps": [ { - "id": "yoke 0.8.3", + "id": "yoke 0.8.4", "target": "yoke" }, { @@ -15790,7 +15782,7 @@ "edition": "2021", "proc_macro_deps": [ { - "id": "zerovec-derive 0.11.6", + "id": "zerovec-derive 0.11.7", "target": "zerovec_derive" } ] @@ -15805,8 +15797,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8", - "url": "https://static.crates.io/crates/zerovec/0.11.8/download" + "sha256": "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40", + "url": "https://static.crates.io/crates/zerovec/0.11.9/download" } }, "targets": [ @@ -15817,9 +15809,9 @@ } } ], - "version": "0.11.8" + "version": "0.11.9" }, - "zerovec-derive 0.11.6": { + "zerovec-derive 0.11.7": { "common_attrs": { "deps": [ { @@ -15847,8 +15839,8 @@ "package_url": "https://github.com/unicode-org/icu4x", "repository": { "Http": { - "sha256": "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da", - "url": "https://static.crates.io/crates/zerovec-derive/0.11.6/download" + "sha256": "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a", + "url": "https://static.crates.io/crates/zerovec-derive/0.11.7/download" } }, "targets": [ @@ -15859,7 +15851,7 @@ } } ], - "version": "0.11.6" + "version": "0.11.7" }, "zlib-rs 0.6.8": { "common_attrs": { @@ -15940,7 +15932,7 @@ "target": "calendrical_calculations" }, { - "id": "icu_locale_core 2.3.0", + "id": "icu_locale_core 2.4.0", "target": "icu_locale_core" }, { @@ -15989,7 +15981,7 @@ "async-trait 0.1.92", "base64 0.23.1", "bytes 1.12.1", - "capnp 0.27.2", + "capnp 0.27.3", "capnp-rpc 0.27.2", "capnpc 0.27.0", "cc 1.10.0", @@ -16035,8 +16027,8 @@ "sha1 0.11.0", "socket2 0.6.5", "static_assertions 1.1.0", - "swc_common 25.0.0", - "swc_ts_fast_strip 57.0.0", + "swc_common 26.0.0", + "swc_ts_fast_strip 59.0.2", "syn 2.0.119", "temporal_capi 0.2.6", "temporal_rs 0.2.6", @@ -16047,7 +16039,7 @@ "tracing 0.1.44", "url 2.5.8", "windows-sys 0.61.2", - "x509-cert 0.2.5" + "x509-cert 0.3.0" ], "direct_dev_deps": [], "workspace_members": { diff --git a/patches/rules_rust/0001-Propagate-coverage-info-through-link_deps.patch b/patches/rules_rust/0001-Propagate-coverage-info-through-link_deps.patch index d039ebc652f..2113c44eded 100644 --- a/patches/rules_rust/0001-Propagate-coverage-info-through-link_deps.patch +++ b/patches/rules_rust/0001-Propagate-coverage-info-through-link_deps.patch @@ -13,7 +13,7 @@ without this the C++ half of a Rust binary is dropped from the report. diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl -@@ -2170,7 +2170,7 @@ def rustc_compile_action( +@@ -2254,7 +2254,7 @@ def rustc_compile_action( executable = crate_info.output if crate_info.type == "bin" or crate_info.is_test else None instrumented_files_kwargs = { diff --git a/src/rust/cxx/kj-hyper/tls.rs b/src/rust/cxx/kj-hyper/tls.rs index 945a4b5e203..8fdf0520ce3 100644 --- a/src/rust/cxx/kj-hyper/tls.rs +++ b/src/rust/cxx/kj-hyper/tls.rs @@ -369,15 +369,15 @@ fn directly_trusted(end_entity: &CertificateDer<'_>, now: UnixTime) -> Result<() let cert = x509_cert::Certificate::from_der(end_entity) .map_err(|_| rustls::Error::InvalidCertificate(CertificateError::BadEncoding))?; - let tbs = &cert.tbs_certificate; + let tbs = &cert.tbs_certificate(); let now = now.as_secs(); - if now < tbs.validity.not_before.to_unix_duration().as_secs() { + if now < tbs.validity().not_before.to_unix_duration().as_secs() { return Err(CertificateError::NotValidYet.into()); } - if now > tbs.validity.not_after.to_unix_duration().as_secs() { + if now > tbs.validity().not_after.to_unix_duration().as_secs() { return Err(CertificateError::Expired.into()); } - for extension in tbs.extensions.iter().flatten() { + for extension in tbs.extensions().into_iter().flatten() { let value = extension.extn_value.as_bytes(); let permitted = if extension.extn_id == rfc5280::ID_CE_EXT_KEY_USAGE { let usages = ExtendedKeyUsage::from_der(value) From a8dd9cee9df3ca6f61094e70447eaa69f626db1e Mon Sep 17 00:00:00 2001 From: Felix Hanau Date: Fri, 23 Oct 2026 20:23:04 -0400 Subject: [PATCH 2/3] [build] Don't keep unrelated rust binaries around for rustfmt This reduces retained disk usage by 150MB, which adds up if there are several checkouts of workerd --- MODULE.bazel.lock | 2 +- build/deps/formatters/rustfmt_repository.bzl | 28 +++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 4ad15696407..a90ef97c9e1 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1519,7 +1519,7 @@ }, "//build/deps/formatters:rustfmt_repository.bzl%rustfmt_standalone": { "general": { - "bzlTransitiveDigest": "UiKmUe3AzgXQ/tIz4cyKcsMbnQIgDDzAN3oRUHmnLSo=", + "bzlTransitiveDigest": "GoT3tx3aG2WQMhOv7ZtuRmb5BPzC2XrI0DCFwI/v2/c=", "usagesDigest": "x0djQIecdgW5WllZzOX3szq70ykdYpRdtOddeGMqmcw=", "recordedInputs": [], "generatedRepoSpecs": { diff --git a/build/deps/formatters/rustfmt_repository.bzl b/build/deps/formatters/rustfmt_repository.bzl index 19316e72171..6ae5cab1b1f 100644 --- a/build/deps/formatters/rustfmt_repository.bzl +++ b/build/deps/formatters/rustfmt_repository.bzl @@ -15,18 +15,6 @@ def _rustfmt_standalone_repository_impl(repository_ctx): iso_date = repository_ctx.attr.iso_date proxy = PROXY_URL - # Download the rustfmt component (contains bin/rustfmt and bin/cargo-fmt). - rustfmt_url = proxy + _URL_TEMPLATE.format( - iso_date = iso_date, - component = "rustfmt", - triple = triple, - ) - repository_ctx.download_and_extract( - url = rustfmt_url, - sha256 = repository_ctx.attr.rustfmt_sha256, - stripPrefix = "rustfmt-nightly-{}/rustfmt-preview".format(triple), - ) - # Download the rustc component (contains shared libraries that rustfmt # dynamically links against, e.g. librustc_driver-*.so / .dylib). rustc_url = proxy + _URL_TEMPLATE.format( @@ -40,6 +28,22 @@ def _rustfmt_standalone_repository_impl(repository_ctx): stripPrefix = "rustc-nightly-{}/rustc".format(triple), ) + # Delete binaries to reduce disk space usage, we only need librustc_driver + repository_ctx.delete("bin") + repository_ctx.delete("lib/rustlib") + + # Download the rustfmt component (contains bin/rustfmt and bin/cargo-fmt). + rustfmt_url = proxy + _URL_TEMPLATE.format( + iso_date = iso_date, + component = "rustfmt", + triple = triple, + ) + repository_ctx.download_and_extract( + url = rustfmt_url, + sha256 = repository_ctx.attr.rustfmt_sha256, + stripPrefix = "rustfmt-nightly-{}/rustfmt-preview".format(triple), + ) + # Create a wrapper script that sets the library path so the dynamically-linked # rustfmt binary can find its libraries. We embed absolute paths because the # wrapper may be copied to bazel-bin by native_binary. From efc50c1bba37581f03973b3f12a17ff64c826c1b Mon Sep 17 00:00:00 2001 From: Felix Hanau Date: Wed, 28 Oct 2026 15:29:02 -0400 Subject: [PATCH 3/3] [build] Add cargo toolchain alongside sanitizer rust toolchain rules_rust wants us to install a cargo toolchain, specifying cargo in the rust_toolchain() is deprecated. This is also needed to fix errors about a version mismatch between rustc and cargo. --- .bazelrc | 8 ++++++-- build/rust/sanitizer_toolchain.bzl | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index feb53f567b1..c2ab868f1fd 100644 --- a/.bazelrc +++ b/.bazelrc @@ -273,8 +273,10 @@ build:asan --test_env=KJ_CLEAN_SHUTDOWN=1 # Enable ASan, LSan support in V8 build:asan --copt="-DV8_USE_ADDRESS_SANITIZER" build:asan --per_file_copt='external/.*v8@-DADDRESS_SANITIZER,-DLEAK_SANITIZER' -# One toolchain per host; resolution picks the one matching the (host-parented) asan platform. +# One toolchain per host, plus its cargo toolchain; resolution picks the one matching the +# (host-parented) asan platform. build:asan --extra_toolchains=//build/rust:asan_toolchain_linux_x86_64,//build/rust:asan_toolchain_linux_aarch64,//build/rust:asan_toolchain_macos_aarch64 +build:asan --extra_toolchains=//build/rust:asan_toolchain_linux_x86_64_cargo,//build/rust:asan_toolchain_linux_aarch64_cargo,//build/rust:asan_toolchain_macos_aarch64_cargo build:asan --@rules_rust//:extra_rustc_flag=-Zsanitizer=address # thread sanitizer (https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual) @@ -305,8 +307,10 @@ build:tsan-common --copt="-DV8_IS_TSAN" build:tsan-common --per_file_copt='external/.*v8@-DTHREAD_SANITIZER' # Perfetto also requires this define to enable its shared-memory scraping annotations. build:tsan-common --per_file_copt='external/.*perfetto@-DTHREAD_SANITIZER' -# One toolchain per host; resolution picks the one matching the (host-parented) tsan platform. +# One toolchain per host, plus its cargo toolchain; resolution picks the one matching the +# (host-parented) tsan platform. build:tsan-common --extra_toolchains=//build/rust:tsan_toolchain_linux_x86_64,//build/rust:tsan_toolchain_macos_aarch64 +build:tsan-common --extra_toolchains=//build/rust:tsan_toolchain_linux_x86_64_cargo,//build/rust:tsan_toolchain_macos_aarch64_cargo build:tsan-common --@rules_rust//:extra_rustc_flag=-Zsanitizer=thread # Linux x86_64. diff --git a/build/rust/sanitizer_toolchain.bzl b/build/rust/sanitizer_toolchain.bzl index d6e34ce4c8c..6a152fecfb1 100644 --- a/build/rust/sanitizer_toolchain.bzl +++ b/build/rust/sanitizer_toolchain.bzl @@ -4,6 +4,7 @@ """Per-host sanitizer-instrumented Rust toolchains (see //build/rust:BUILD.bazel).""" +load("@rules_rust//cargo:cargo_toolchain.bzl", "cargo_toolchain") load("@rules_rust//rust:toolchain.bzl", "rust_toolchain") load("//build/deps:gen/build_deps.bzl", "RUST_NIGHTLY_DATE", "RUST_NIGHTLY_VERSION") load(":build_std.bzl", "compiler_runtime_files", "instrumented_rust_std") @@ -109,7 +110,6 @@ def sanitizer_rust_toolchain(name, sanitizer, host): name = name + "_impl", allocator_library = "@rules_rust//ffi/rs:empty", binary_ext = "", - cargo = h.rust_tools + "//:cargo", cargo_clippy = h.rust_tools + "//:cargo_clippy_bin", channel = "nightly", clippy_driver = h.rust_tools + "//:clippy_driver_bin", @@ -147,3 +147,22 @@ def sanitizer_rust_toolchain(name, sanitizer, host): toolchain = ":" + name + "_impl", toolchain_type = "@rules_rust//rust:toolchain", ) + + cargo_toolchain( + name = name + "_cargo_impl", + cargo = h.rust_tools + "//:cargo", + channel = "nightly", + iso_date = RUST_NIGHTLY_DATE, + tags = ["manual"], + version = RUST_NIGHTLY_VERSION, + ) + + native.toolchain( + name = name + "_cargo", + exec_compatible_with = host_constraints, + tags = ["manual"], + target_compatible_with = host_constraints + [constraint], + target_settings = ["@rules_rust//rust/toolchain/channel:nightly"], + toolchain = ":" + name + "_cargo_impl", + toolchain_type = "@rules_rust//cargo:toolchain_type", + )