From 8810d27aad7a63fdf1d2ceb96f0c4e36ce02803c Mon Sep 17 00:00:00 2001 From: zackees Date: Fri, 24 Jul 2026 14:58:14 -0700 Subject: [PATCH 1/4] fix: align embedded zccache with soldr --- Cargo.lock | 585 +++++++++++++++++++++++++- crates/fbuild-build-engine/Cargo.toml | 2 +- crates/fbuild-build/Cargo.toml | 10 +- 3 files changed, 568 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c72fa1bfc..d6cccad39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -380,8 +380,20 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ - "bytecheck_derive", - "ptr_meta", + "bytecheck_derive 0.6.12", + "ptr_meta 0.1.4", + "simdutf8", +] + +[[package]] +name = "bytecheck" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0caa33a2c0edca0419d15ac723dff03f1956f7978329b1e3b5fdaaaed9d3ca8b" +dependencies = [ + "bytecheck_derive 0.8.2", + "ptr_meta 0.3.1", + "rancor", "simdutf8", ] @@ -396,6 +408,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bytecheck_derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "bytemuck" version = "1.25.0" @@ -1139,7 +1162,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache", + "zccache 1.12.17", "zip", ] @@ -1173,7 +1196,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache", + "zccache 1.12.14", "zip", ] @@ -1206,7 +1229,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache", + "zccache 1.12.17", "zip", ] @@ -1240,7 +1263,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache", + "zccache 1.12.14", "zip", ] @@ -1274,7 +1297,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache", + "zccache 1.12.14", "zip", ] @@ -1559,7 +1582,7 @@ dependencies = [ "futures", "pyo3", "pyo3-async-runtimes", - "pyo3-build-config", + "pyo3-build-config 0.29.0", "reqwest", "running-process", "serde", @@ -1965,6 +1988,12 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" + [[package]] name = "hashlink" version = "0.9.1" @@ -2733,6 +2762,26 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" +[[package]] +name = "munge" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e17401f259eba956ca16491461b6e8f72913a0a114e39736ce404410f915a0c" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "nix" version = "0.26.4" @@ -3210,7 +3259,16 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "ptr_meta_derive", + "ptr_meta_derive 0.1.4", +] + +[[package]] +name = "ptr_meta" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9a0cf95a1196af61d4f1cbdab967179516d9a4a4312af1f31948f8f6224a79" +dependencies = [ + "ptr_meta_derive 0.3.1", ] [[package]] @@ -3224,6 +3282,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ptr_meta_derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "pyo3" version = "0.29.0" @@ -3233,7 +3302,7 @@ dependencies = [ "libc", "once_cell", "portable-atomic", - "pyo3-build-config", + "pyo3-build-config 0.29.0", "pyo3-ffi", "pyo3-macros", ] @@ -3252,13 +3321,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "pyo3-build-config" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" +dependencies = [ + "once_cell", + "target-lexicon 0.12.16", +] + [[package]] name = "pyo3-build-config" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078" dependencies = [ - "target-lexicon", + "target-lexicon 0.13.5", ] [[package]] @@ -3268,7 +3347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b" dependencies = [ "libc", - "pyo3-build-config", + "pyo3-build-config 0.29.0", ] [[package]] @@ -3377,6 +3456,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rancor" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daff8b7b3ccf5f7ba270b3e7a0a4d4c701c5797e38dec27c7e2c3dbb830fed1c" +dependencies = [ + "ptr_meta 0.3.1", +] + [[package]] name = "rand" version = "0.8.5" @@ -3471,6 +3559,15 @@ dependencies = [ "libc", ] +[[package]] +name = "redb" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e925444704b5f17d32bf42f5b6e2df050bceebc3dcd6e71cc73dafe8092e839" +dependencies = [ + "libc", +] + [[package]] name = "redox_syscall" version = "0.5.18" @@ -3506,6 +3603,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13de68c877a77f35885442ac72c8beb7c2f0b09380c43b734b9d63d1db69ee54" +[[package]] +name = "reflink-copy" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9dd7ab4af0363d5ccfd2838d782a28196cf32a5cc2e4fe3c5dc83f2be588b8b" +dependencies = [ + "cfg-if", + "libc", + "rustix", + "windows 0.62.2", +] + [[package]] name = "regex" version = "1.12.3" @@ -3541,7 +3650,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ - "bytecheck", + "bytecheck 0.6.12", +] + +[[package]] +name = "rend" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "663ba70707f96e871406fe10d68128412e619b06d1d47cb91c3a4c6501176240" +dependencies = [ + "bytecheck 0.8.2", ] [[package]] @@ -3608,17 +3726,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1" dependencies = [ "bitvec", - "bytecheck", + "bytecheck 0.6.12", "bytes", "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", + "ptr_meta 0.1.4", + "rend 0.4.2", + "rkyv_derive 0.7.46", "seahash", "tinyvec", "uuid", ] +[[package]] +name = "rkyv" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815cc8a37159a463064825246cadb07961e25cd9885908606f6d08a98d8f8874" +dependencies = [ + "bytecheck 0.8.2", + "bytes", + "hashbrown 0.17.1", + "indexmap", + "munge", + "ptr_meta 0.3.1", + "rancor", + "rend 0.5.4", + "rkyv_derive 0.8.17", + "tinyvec", + "uuid", +] + [[package]] name = "rkyv_derive" version = "0.7.46" @@ -3630,6 +3767,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "rkyv_derive" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ed1a78a1b19d184b0daa629dd9a024573173ec7d485b287cb369fb3607cc1c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "running-process" version = "4.6.1" @@ -4227,6 +4375,12 @@ dependencies = [ "xattr", ] +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + [[package]] name = "target-lexicon" version = "0.13.5" @@ -5137,6 +5291,27 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections", + "windows-core 0.62.2", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core 0.62.2", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -5152,12 +5327,36 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-link", + "windows-result 0.4.1", + "windows-strings", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link", + "windows-threading", +] + [[package]] name = "windows-implement" version = "0.57.0" @@ -5169,6 +5368,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "windows-interface" version = "0.57.0" @@ -5180,12 +5390,33 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -5195,6 +5426,24 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -5264,6 +5513,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -5554,10 +5812,10 @@ dependencies = [ "prost-build", "protoc-bin-vendored", "rayon", - "redb", + "redb 2.6.3", "regex", "reqwest", - "rkyv", + "rkyv 0.7.46", "running-process", "ruzstd 0.7.3", "sadness-generator", @@ -5579,6 +5837,289 @@ dependencies = [ "zip", ] +[[package]] +name = "zccache" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "arc-swap", + "bincode", + "blake3", + "bytes", + "clang", + "crash-handler", + "dashmap", + "filetime", + "flate2", + "fs2", + "globset", + "interprocess", + "jwalk", + "libc", + "memmap2", + "notify", + "prost", + "rayon", + "redb 4.1.0", + "reflink-copy", + "regex", + "rkyv 0.8.17", + "running-process", + "serde", + "serde_json", + "sysinfo 0.30.13", + "tar", + "tempfile", + "thiserror 2.0.18", + "tokio", + "tokio-util", + "tracing", + "uuid", + "windows-sys 0.59.0", + "zccache-artifact", + "zccache-audit", + "zccache-compile-trace", + "zccache-compiler", + "zccache-core", + "zccache-daemon-core", + "zccache-depgraph", + "zccache-fingerprint", + "zccache-fscache", + "zccache-hash", + "zccache-ipc", + "zccache-protocol", + "zccache-watcher", +] + +[[package]] +name = "zccache-artifact" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "bincode", + "blake3", + "dashmap", + "prost", + "rayon", + "redb 4.1.0", + "reflink-copy", + "serde", + "serde_json", + "tempfile", + "thiserror 2.0.18", + "tokio", + "tracing", + "zccache-core", + "zccache-hash", +] + +[[package]] +name = "zccache-audit" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "serde", + "serde_json", + "zccache-core", +] + +[[package]] +name = "zccache-compile-trace" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "zccache-audit", +] + +[[package]] +name = "zccache-compiler" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "clang", + "thiserror 2.0.18", + "zccache-core", + "zccache-hash", +] + +[[package]] +name = "zccache-core" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "crash-handler", + "libc", + "serde", + "serde_json", + "thiserror 2.0.18", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "zccache-daemon-core" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "arc-swap", + "bincode", + "blake3", + "bytes", + "clang", + "crash-handler", + "dashmap", + "filetime", + "fs2", + "globset", + "jwalk", + "libc", + "memmap2", + "notify", + "prost", + "rayon", + "redb 4.1.0", + "reflink-copy", + "regex", + "rkyv 0.8.17", + "running-process", + "serde", + "serde_json", + "sysinfo 0.30.13", + "tempfile", + "thiserror 2.0.18", + "tokio", + "tokio-util", + "tracing", + "uuid", + "windows-sys 0.59.0", + "zccache-artifact", + "zccache-audit", + "zccache-compile-trace", + "zccache-compiler", + "zccache-core", + "zccache-depgraph", + "zccache-fingerprint", + "zccache-fscache", + "zccache-hash", + "zccache-ipc", + "zccache-protocol", + "zccache-watcher", +] + +[[package]] +name = "zccache-depgraph" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "bincode", + "blake3", + "dashmap", + "rayon", + "rkyv 0.8.17", + "serde", + "serde_json", + "thiserror 2.0.18", + "tracing", + "uuid", + "zccache-core", + "zccache-hash", +] + +[[package]] +name = "zccache-fingerprint" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "fs2", + "globset", + "jwalk", + "pyo3-build-config 0.23.5", + "rayon", + "serde", + "serde_json", + "thiserror 2.0.18", + "tracing", + "zccache-core", + "zccache-hash", +] + +[[package]] +name = "zccache-fscache" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "bincode", + "dashmap", + "rayon", + "serde", + "tokio", + "tracing", + "zccache-core", + "zccache-hash", +] + +[[package]] +name = "zccache-hash" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "blake3", + "memmap2", + "serde", +] + +[[package]] +name = "zccache-ipc" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "bytes", + "dashmap", + "interprocess", + "prost", + "running-process", + "serde", + "serde_json", + "thiserror 2.0.18", + "tokio", + "tracing", + "zccache-core", + "zccache-protocol", +] + +[[package]] +name = "zccache-protocol" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "bincode", + "bytes", + "prost", + "prost-build", + "protoc-bin-vendored", + "running-process", + "serde", + "thiserror 2.0.18", + "zccache-core", + "zccache-depgraph", +] + +[[package]] +name = "zccache-watcher" +version = "1.12.17" +source = "git+https://github.com/zackees/zccache?rev=a16f10e2c3813f0582e0e51eb3b9932c727435f1#a16f10e2c3813f0582e0e51eb3b9932c727435f1" +dependencies = [ + "globset", + "jwalk", + "notify", + "pyo3-build-config 0.23.5", + "rayon", + "tokio", + "tracing", + "zccache-core", + "zccache-fscache", +] + [[package]] name = "zerocopy" version = "0.8.48" diff --git a/crates/fbuild-build-engine/Cargo.toml b/crates/fbuild-build-engine/Cargo.toml index 84790424a..f58e8066b 100644 --- a/crates/fbuild-build-engine/Cargo.toml +++ b/crates/fbuild-build-engine/Cargo.toml @@ -34,7 +34,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" } +zccache = { git = "https://github.com/zackees/zccache", rev = "a16f10e2c3813f0582e0e51eb3b9932c727435f1" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build/Cargo.toml b/crates/fbuild-build/Cargo.toml index 358cc4917..bb95a48a2 100644 --- a/crates/fbuild-build/Cargo.toml +++ b/crates/fbuild-build/Cargo.toml @@ -48,12 +48,10 @@ tree-sitter-cpp = { workspace = true } # child processes) was deleted in the same PR; there is no # `--no-default-features` escape hatch. # -# Pinned at zccache 1.12.14 (`4b13676`, the same revision soldr's -# `_vender/zccache` submodule uses). Bumps 1.12.11 -> 1.12.14 to pick -# up the embedded-path fixes: #950 (journal compile outcomes on the -# embedded path), #955/#957/#958 (daemon-deadlock/full-codegen fix + -# `run_cpu_blocking`), and #948 (mimalloc as sole allocator). -zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" } +# Pinned at zccache 1.12.17 (`a16f10e`), matching soldr's +# `_vender/zccache` submodule so both embedded services speak the same +# shared-broker protocol. +zccache = { git = "https://github.com/zackees/zccache", rev = "a16f10e2c3813f0582e0e51eb3b9932c727435f1" } [dev-dependencies] filetime = { workspace = true } From 56ae550984a5a83c752c16cb759cb44b5aaf6a7f Mon Sep 17 00:00:00 2001 From: zackees Date: Fri, 24 Jul 2026 15:00:39 -0700 Subject: [PATCH 2/4] ci: document intentional direct process spawns --- crates/fbuild-core/src/process_identity.rs | 1 + crates/fbuild-paths/src/daemon_ownership.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/crates/fbuild-core/src/process_identity.rs b/crates/fbuild-core/src/process_identity.rs index 02539707a..6cc37c1e9 100644 --- a/crates/fbuild-core/src/process_identity.rs +++ b/crates/fbuild-core/src/process_identity.rs @@ -74,6 +74,7 @@ pub fn pid_executable_path(pid: u32) -> Option { #[cfg(all(unix, not(target_os = "linux")))] pub fn pid_executable_path(pid: u32) -> Option { + // allow-direct-spawn: portable BSD/macOS `ps` fallback; this module resolves process identity. let output = std::process::Command::new("/bin/ps") .args(["-p", &pid.to_string(), "-o", "comm="]) .output() diff --git a/crates/fbuild-paths/src/daemon_ownership.rs b/crates/fbuild-paths/src/daemon_ownership.rs index c56ac7024..14a1aed5b 100644 --- a/crates/fbuild-paths/src/daemon_ownership.rs +++ b/crates/fbuild-paths/src/daemon_ownership.rs @@ -307,6 +307,7 @@ mod tests { let path = temp.path().join("root-owner.lock"); let run_probe = |expected: &str| { + // allow-direct-spawn: test helper re-executes this test binary to model another process. let output = std::process::Command::new(std::env::current_exe().unwrap()) .args([ "--ignored", From 04d5723147aa725b1b3910986000ad2e9f4ae67a Mon Sep 17 00:00:00 2001 From: zackees Date: Fri, 24 Jul 2026 15:06:17 -0700 Subject: [PATCH 3/4] style: apply workspace rustfmt --- crates/fbuild-cli/src/cli/clean.rs | 19 +++++++++++++++---- crates/fbuild-serial/src/ports.rs | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/crates/fbuild-cli/src/cli/clean.rs b/crates/fbuild-cli/src/cli/clean.rs index 56b6de477..48e1b9dbb 100644 --- a/crates/fbuild-cli/src/cli/clean.rs +++ b/crates/fbuild-cli/src/cli/clean.rs @@ -2,7 +2,9 @@ use crate::daemon_client::{self, BuildRequest, DaemonClient}; use crate::output; -use fbuild_core::process_identity::{pid_exe_stem_matches, pid_is_alive, terminate_pid, wait_for_pid_exit}; +use fbuild_core::process_identity::{ + pid_exe_stem_matches, pid_is_alive, terminate_pid, wait_for_pid_exit, +}; use fbuild_paths::daemon_ownership::{self, DAEMON_EXE_STEM, RootOwnershipGuard, SpawnLockGuard}; use std::future::Future; use std::io; @@ -323,7 +325,10 @@ fn should_signal_legacy_pid(is_alive: bool, exe_stem_matches: bool) -> bool { } async fn terminate_legacy_pid_if_verified(pid: u32) { - let verified = should_signal_legacy_pid(pid_is_alive(pid), pid_exe_stem_matches(pid, DAEMON_EXE_STEM)); + let verified = should_signal_legacy_pid( + pid_is_alive(pid), + pid_exe_stem_matches(pid, DAEMON_EXE_STEM), + ); if !verified { return; } @@ -547,7 +552,10 @@ mod tests { parse_status_json_daemon_pid(r#"{"daemon_pid": 4321}"#), Some(4321) ); - assert_eq!(parse_status_json_daemon_pid(r#"{"daemon_pid": null}"#), None); + assert_eq!( + parse_status_json_daemon_pid(r#"{"daemon_pid": null}"#), + None + ); assert_eq!(parse_status_json_daemon_pid(r#"{}"#), None); assert_eq!(parse_status_json_daemon_pid("not json"), None); } @@ -570,7 +578,10 @@ mod tests { fn recycled_or_unrelated_pid_is_never_signalled() { let own_pid = std::process::id(); assert!(pid_is_alive(own_pid)); - assert!(!pid_exe_stem_matches(own_pid, "definitely-not-fbuild-daemon")); + assert!(!pid_exe_stem_matches( + own_pid, + "definitely-not-fbuild-daemon" + )); assert!(!should_signal_legacy_pid( pid_is_alive(own_pid), pid_exe_stem_matches(own_pid, "definitely-not-fbuild-daemon") diff --git a/crates/fbuild-serial/src/ports.rs b/crates/fbuild-serial/src/ports.rs index 62db717c5..d9248be1c 100644 --- a/crates/fbuild-serial/src/ports.rs +++ b/crates/fbuild-serial/src/ports.rs @@ -274,8 +274,8 @@ mod imp { use serialport::{SerialPortInfo, SerialPortType, UsbPortInfo}; use windows_sys::Win32::Devices::DeviceAndDriverInstallation::{ CM_Get_DevNode_Status, CM_Get_Device_IDW, CM_Get_Parent, CR_NO_SUCH_DEVINST, CR_SUCCESS, - DICS_FLAG_GLOBAL, DIGCF_ALLCLASSES, DIGCF_PRESENT, DIREG_DEV, HDEVINFO, - MAX_DEVICE_ID_LEN, SP_DEVINFO_DATA, SPDRP_CLASS, SPDRP_FRIENDLYNAME, SPDRP_HARDWAREID, + DICS_FLAG_GLOBAL, DIGCF_ALLCLASSES, DIGCF_PRESENT, DIREG_DEV, HDEVINFO, MAX_DEVICE_ID_LEN, + SP_DEVINFO_DATA, SPDRP_CLASS, SPDRP_FRIENDLYNAME, SPDRP_HARDWAREID, SPDRP_LOCATION_INFORMATION, SPDRP_MFG, SetupDiClassGuidsFromNameW, SetupDiDestroyDeviceInfoList, SetupDiEnumDeviceInfo, SetupDiGetClassDevsW, SetupDiGetDeviceInstanceIdW, SetupDiGetDeviceRegistryPropertyW, SetupDiOpenDevRegKey, From 13ab52d80547b9cdcc27a8e98147873dc3ba663f Mon Sep 17 00:00:00 2001 From: zackees Date: Fri, 24 Jul 2026 15:43:25 -0700 Subject: [PATCH 4/4] fix: align all embedded zccache revisions --- Cargo.lock | 908 +++-------------------------- crates/fbuild-build-arm/Cargo.toml | 2 +- crates/fbuild-build-esp/Cargo.toml | 2 +- crates/fbuild-build-mcu/Cargo.toml | 2 +- 4 files changed, 85 insertions(+), 829 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6cccad39..4c3858b9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,17 +8,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.17", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.12" @@ -140,7 +129,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -162,8 +151,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core 0.4.5", - "base64 0.22.1", + "axum-core", + "base64", "bytes", "futures-util", "http", @@ -172,7 +161,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit 0.7.3", + "matchit", "memchr", "mime", "percent-encoding", @@ -192,31 +181,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" -dependencies = [ - "axum-core 0.5.6", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "itoa", - "matchit 0.8.4", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde_core", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.5" @@ -238,30 +202,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "sync_wrapper", - "tower-layer", - "tower-service", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -283,21 +223,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bit-set" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" - [[package]] name = "bitflags" version = "1.3.2" @@ -374,40 +299,18 @@ version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive 0.6.12", - "ptr_meta 0.1.4", - "simdutf8", -] - [[package]] name = "bytecheck" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0caa33a2c0edca0419d15ac723dff03f1956f7978329b1e3b5fdaaaed9d3ca8b" dependencies = [ - "bytecheck_derive 0.8.2", - "ptr_meta 0.3.1", + "bytecheck_derive", + "ptr_meta", "rancor", "simdutf8", ] -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bytecheck_derive" version = "0.8.2" @@ -416,7 +319,7 @@ checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -436,7 +339,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -500,15 +403,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "chrono" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" -dependencies = [ - "num-traits", -] - [[package]] name = "ciborium" version = "0.2.2" @@ -588,7 +482,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -603,46 +497,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" -[[package]] -name = "console-api" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8599749b6667e2f0c910c1d0dff6901163ff698a52d5a39720f61b5be4b20d3" -dependencies = [ - "futures-core", - "prost", - "prost-types", - "tonic", - "tonic-prost", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4915b7d8dd960457a1b6c380114c2944f728e7c65294ab247ae6b6f1f37592" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "hyper-util", - "prost", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "const-oid" version = "0.10.2" @@ -713,21 +567,6 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "crc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" - [[package]] name = "crc32fast" version = "1.5.0" @@ -894,7 +733,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.117", + "syn", ] [[package]] @@ -905,7 +744,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -950,15 +789,9 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] -[[package]] -name = "deranged" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" - [[package]] name = "derive_arbitrary" version = "1.4.2" @@ -967,7 +800,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1020,7 +853,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1075,7 +908,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d6712ab7c4bd91d8ff9e09bcb1356e25bf19d191177eaac264db8632707236" dependencies = [ - "base64 0.22.1", + "base64", "bitflags 2.11.0", "bytemuck", "esp-idf-part", @@ -1162,7 +995,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache 1.12.17", + "zccache", "zip", ] @@ -1196,7 +1029,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache 1.12.14", + "zccache", "zip", ] @@ -1229,7 +1062,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache 1.12.17", + "zccache", "zip", ] @@ -1263,7 +1096,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache 1.12.14", + "zccache", "zip", ] @@ -1297,7 +1130,7 @@ dependencies = [ "tree-sitter", "tree-sitter-cpp", "walkdir", - "zccache 1.12.14", + "zccache", "zip", ] @@ -1375,8 +1208,8 @@ name = "fbuild-daemon" version = "2.5.4" dependencies = [ "async-trait", - "axum 0.7.9", - "base64 0.22.1", + "axum", + "base64", "bytes", "clap", "dashmap", @@ -1455,7 +1288,7 @@ name = "fbuild-library" version = "2.5.4" dependencies = [ "async-trait", - "axum 0.7.9", + "axum", "bzip2", "fbuild-config", "fbuild-core", @@ -1505,7 +1338,7 @@ name = "fbuild-packages" version = "2.5.4" dependencies = [ "async-trait", - "axum 0.7.9", + "axum", "bzip2", "fbuild-config", "fbuild-core", @@ -1537,7 +1370,7 @@ name = "fbuild-packages-fetch" version = "2.5.4" dependencies = [ "async-trait", - "axum 0.7.9", + "axum", "bzip2", "fbuild-config", "fbuild-core", @@ -1575,7 +1408,7 @@ dependencies = [ name = "fbuild-python" version = "2.5.4" dependencies = [ - "base64 0.22.1", + "base64", "fbuild-core", "fbuild-paths", "fbuild-serial", @@ -1598,7 +1431,7 @@ name = "fbuild-serial" version = "2.5.4" dependencies = [ "async-trait", - "base64 0.22.1", + "base64", "bytes", "dashmap", "fbuild-core", @@ -1642,7 +1475,7 @@ name = "fbuild-toolchain" version = "2.5.4" dependencies = [ "async-trait", - "axum 0.7.9", + "axum", "bzip2", "fbuild-config", "fbuild-core", @@ -1678,17 +1511,6 @@ dependencies = [ "libredox", ] -[[package]] -name = "filetime_creation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c25b5d475550e559de5b0c0084761c65325444e3b6c9e298af9cefe7a9ef3a5f" -dependencies = [ - "cfg-if", - "filetime", - "windows-sys 0.52.0", -] - [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -1813,7 +1635,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1925,25 +1747,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "h2" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "half" version = "2.7.1" @@ -1955,22 +1758,13 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.12", + "ahash", ] [[package]] @@ -2003,19 +1797,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.7", - "byteorder", - "flate2", - "nom", - "num-traits", -] - [[package]] name = "heck" version = "0.5.0" @@ -2073,12 +1854,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" - [[package]] name = "hybrid-array" version = "0.4.10" @@ -2098,7 +1873,6 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "h2", "http", "http-body", "httparse", @@ -2120,7 +1894,6 @@ dependencies = [ "hyper", "hyper-util", "rustls", - "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -2128,26 +1901,13 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "hyper-timeout" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" -dependencies = [ - "hyper", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-util", @@ -2572,7 +2332,7 @@ dependencies = [ "quote", "regex-syntax", "rustc_version", - "syn 2.0.117", + "syn", ] [[package]] @@ -2590,25 +2350,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" -[[package]] -name = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] - -[[package]] -name = "lzma-rust" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baab2bbbd7d75a144d671e9ff79270e903957d92fb7386fd39034c709bd2661" -dependencies = [ - "byteorder", -] - [[package]] name = "lzma-sys" version = "0.1.20" @@ -2644,12 +2385,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "matchit" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" - [[package]] name = "md-5" version = "0.10.6" @@ -2670,12 +2405,6 @@ dependencies = [ "digest 0.11.2", ] -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" version = "2.8.0" @@ -2710,7 +2439,7 @@ checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -2728,12 +2457,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2779,7 +2502,7 @@ checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -2814,16 +2537,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "notify" version = "7.0.0" @@ -2852,16 +2565,6 @@ dependencies = [ "instant", ] -[[package]] -name = "nt-time" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de419e64947cd8830e66beb584acc3fb42ed411d103e3c794dda355d1b374b5" -dependencies = [ - "chrono", - "time", -] - [[package]] name = "ntapi" version = "0.4.3" @@ -2880,12 +2583,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "num-conv" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" - [[package]] name = "num-traits" version = "0.2.19" @@ -2915,7 +2612,7 @@ checksum = "63944c133d03f44e75866bbd160b95af0ec3f6a13d936d69d31c81078cbc5baf" dependencies = [ "flate2", "memchr", - "ruzstd 0.8.2", + "ruzstd", ] [[package]] @@ -2936,12 +2633,6 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" -[[package]] -name = "openssl-probe" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" - [[package]] name = "option-ext" version = "0.2.0" @@ -3003,26 +2694,6 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project" -version = "1.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "pin-project-lite" version = "0.2.17" @@ -3056,12 +2727,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.21" @@ -3078,7 +2743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.117", + "syn", ] [[package]] @@ -3124,7 +2789,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.117", + "syn", "tempfile", ] @@ -3138,7 +2803,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -3253,33 +2918,13 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive 0.1.4", -] - [[package]] name = "ptr_meta" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b9a0cf95a1196af61d4f1cbdab967179516d9a4a4312af1f31948f8f6224a79" dependencies = [ - "ptr_meta_derive 0.3.1", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "ptr_meta_derive", ] [[package]] @@ -3290,7 +2935,7 @@ checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -3359,7 +3004,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -3371,7 +3016,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -3462,7 +3107,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daff8b7b3ccf5f7ba270b3e7a0a4d4c701c5797e38dec27c7e2c3dbb830fed1c" dependencies = [ - "ptr_meta 0.3.1", + "ptr_meta", ] [[package]] @@ -3552,16 +3197,7 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" [[package]] name = "redb" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eca1e9d98d5a7e9002d0013e18d5a9b000aee942eb134883a82f06ebffb6c01" -dependencies = [ - "libc", -] - -[[package]] -name = "redb" -version = "4.1.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e925444704b5f17d32bf42f5b6e2df050bceebc3dcd6e71cc73dafe8092e839" dependencies = [ @@ -3644,22 +3280,13 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck 0.6.12", -] - [[package]] name = "rend" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "663ba70707f96e871406fe10d68128412e619b06d1d47cb91c3a4c6501176240" dependencies = [ - "bytecheck 0.8.2", + "bytecheck", ] [[package]] @@ -3668,7 +3295,7 @@ version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-core", @@ -3685,7 +3312,6 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", @@ -3719,54 +3345,25 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rkyv" -version = "0.7.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1" -dependencies = [ - "bitvec", - "bytecheck 0.6.12", - "bytes", - "hashbrown 0.12.3", - "ptr_meta 0.1.4", - "rend 0.4.2", - "rkyv_derive 0.7.46", - "seahash", - "tinyvec", - "uuid", -] - [[package]] name = "rkyv" version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "815cc8a37159a463064825246cadb07961e25cd9885908606f6d08a98d8f8874" dependencies = [ - "bytecheck 0.8.2", + "bytecheck", "bytes", "hashbrown 0.17.1", "indexmap", "munge", - "ptr_meta 0.3.1", + "ptr_meta", "rancor", - "rend 0.5.4", - "rkyv_derive 0.8.17", + "rend", + "rkyv_derive", "tinyvec", "uuid", ] -[[package]] -name = "rkyv_derive" -version = "0.7.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rkyv_derive" version = "0.8.17" @@ -3775,7 +3372,7 @@ checksum = "c0ed1a78a1b19d184b0daa629dd9a024573173ec7d485b287cb369fb3607cc1c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -3798,7 +3395,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "sysinfo 0.30.13", + "sysinfo", "thiserror 2.0.18", "tokio", "toml 0.8.23", @@ -3862,18 +3459,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pki-types" version = "1.14.0" @@ -3901,22 +3486,13 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ruzstd" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" -dependencies = [ - "twox-hash 1.6.3", -] - [[package]] name = "ruzstd" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" dependencies = [ - "twox-hash 2.1.2", + "twox-hash", ] [[package]] @@ -3925,15 +3501,6 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" -[[package]] -name = "sadness-generator" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d20a4f9571c8ea84f81041395e9e129b02f1a6789913004f12f528e71ea1ba" -dependencies = [ - "libc", -] - [[package]] name = "same-file" version = "1.0.6" @@ -3943,50 +3510,12 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "security-framework" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" -dependencies = [ - "bitflags 2.11.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.28" @@ -4020,7 +3549,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4105,23 +3634,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "sevenz-rust" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26482cf1ecce4540dc782fc70019eba89ffc4d87b3717eb5ec524b5db6fdefef" -dependencies = [ - "bit-set", - "byteorder", - "crc", - "filetime_creation", - "js-sys", - "lzma-rust", - "nt-time", - "sha2", - "wasm-bindgen", -] - [[package]] name = "sha1" version = "0.10.6" @@ -4221,12 +3733,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "streaming-iterator" version = "0.1.9" @@ -4266,7 +3772,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4278,7 +3784,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4287,17 +3793,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.117" @@ -4326,7 +3821,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4344,20 +3839,6 @@ dependencies = [ "windows 0.52.0", ] -[[package]] -name = "sysinfo" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" -dependencies = [ - "core-foundation-sys", - "libc", - "memchr", - "ntapi", - "rayon", - "windows 0.57.0", -] - [[package]] name = "tap" version = "1.0.1" @@ -4426,7 +3907,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4437,7 +3918,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4449,36 +3930,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "time" -version = "0.3.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c17d80feb7334b40c484e45ed1a5273dfd8bfda537c3be2e74a06a6686f327" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde_core", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" - -[[package]] -name = "time-macros" -version = "0.2.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcef1a61bdb119096e153208ec5cbec23944ce8bca13be5c7f60c634f7403935" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tinystr" version = "0.8.3" @@ -4540,7 +3991,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4553,17 +4004,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-stream" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-tungstenite" version = "0.24.0" @@ -4681,46 +4121,6 @@ version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" -[[package]] -name = "tonic" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" -dependencies = [ - "async-trait", - "axum 0.8.9", - "base64 0.22.1", - "bytes", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "socket2", - "sync_wrapper", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-prost" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" -dependencies = [ - "bytes", - "prost", - "tonic", -] - [[package]] name = "tower" version = "0.5.3" @@ -4729,12 +4129,9 @@ checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", - "indexmap", "pin-project-lite", - "slab", "sync_wrapper", "tokio", - "tokio-util", "tower-layer", "tower-service", "tracing", @@ -4807,7 +4204,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4831,16 +4228,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" -dependencies = [ - "serde", - "tracing-core", -] - [[package]] name = "tracing-subscriber" version = "0.3.23" @@ -4851,15 +4238,12 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex-automata", - "serde", - "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", - "tracing-serde", ] [[package]] @@ -4880,7 +4264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad06847b7afb65c7866a36664b75c40b895e318cea4f71299f013fb22965329d" dependencies = [ "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -4937,16 +4321,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "twox-hash" version = "2.1.2" @@ -5051,15 +4425,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "wait-timeout" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" -dependencies = [ - "libc", -] - [[package]] name = "walkdir" version = "2.5.0" @@ -5145,7 +4510,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.117", + "syn", "wasm-bindgen-shared", ] @@ -5281,16 +4646,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.62.2" @@ -5321,28 +4676,16 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link", - "windows-result 0.4.1", + "windows-result", "windows-strings", ] @@ -5357,17 +4700,6 @@ dependencies = [ "windows-threading", ] -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -5376,18 +4708,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -5398,7 +4719,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -5417,15 +4738,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-result" version = "0.4.1" @@ -5666,7 +4978,7 @@ dependencies = [ "heck", "indexmap", "prettyplease", - "syn 2.0.117", + "syn", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -5682,7 +4994,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.117", + "syn", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -5777,66 +5089,10 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", "synstructure", ] -[[package]] -name = "zccache" -version = "1.12.14" -source = "git+https://github.com/zackees/zccache?rev=4b13676bb3a76c87d2272b2d9ccb76e821734762#4b13676bb3a76c87d2272b2d9ccb76e821734762" -dependencies = [ - "arc-swap", - "bincode", - "blake3", - "bytes", - "clang", - "clap", - "console-subscriber", - "crash-handler", - "dashmap", - "filetime", - "flate2", - "fs2", - "futures", - "globset", - "interprocess", - "jwalk", - "libc", - "lzma-rs", - "md5", - "memmap2", - "mimalloc", - "notify", - "prost", - "prost-build", - "protoc-bin-vendored", - "rayon", - "redb 2.6.3", - "regex", - "reqwest", - "rkyv 0.7.46", - "running-process", - "ruzstd 0.7.3", - "sadness-generator", - "serde", - "serde_json", - "sevenz-rust", - "sha2", - "sysinfo 0.33.1", - "tar", - "tempfile", - "thiserror 2.0.18", - "tokio", - "tokio-util", - "tracing", - "tracing-subscriber", - "uuid", - "wait-timeout", - "windows-sys 0.59.0", - "zip", -] - [[package]] name = "zccache" version = "1.12.17" @@ -5860,14 +5116,14 @@ dependencies = [ "notify", "prost", "rayon", - "redb 4.1.0", + "redb", "reflink-copy", "regex", - "rkyv 0.8.17", + "rkyv", "running-process", "serde", "serde_json", - "sysinfo 0.30.13", + "sysinfo", "tar", "tempfile", "thiserror 2.0.18", @@ -5901,7 +5157,7 @@ dependencies = [ "dashmap", "prost", "rayon", - "redb 4.1.0", + "redb", "reflink-copy", "serde", "serde_json", @@ -5977,14 +5233,14 @@ dependencies = [ "notify", "prost", "rayon", - "redb 4.1.0", + "redb", "reflink-copy", "regex", - "rkyv 0.8.17", + "rkyv", "running-process", "serde", "serde_json", - "sysinfo 0.30.13", + "sysinfo", "tempfile", "thiserror 2.0.18", "tokio", @@ -6015,7 +5271,7 @@ dependencies = [ "blake3", "dashmap", "rayon", - "rkyv 0.8.17", + "rkyv", "serde", "serde_json", "thiserror 2.0.18", @@ -6137,7 +5393,7 @@ checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -6157,7 +5413,7 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", "synstructure", ] @@ -6197,7 +5453,7 @@ checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] diff --git a/crates/fbuild-build-arm/Cargo.toml b/crates/fbuild-build-arm/Cargo.toml index a504bb072..c5e69231e 100644 --- a/crates/fbuild-build-arm/Cargo.toml +++ b/crates/fbuild-build-arm/Cargo.toml @@ -34,7 +34,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" } +zccache = { git = "https://github.com/zackees/zccache", rev = "a16f10e2c3813f0582e0e51eb3b9932c727435f1" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build-esp/Cargo.toml b/crates/fbuild-build-esp/Cargo.toml index ae235aa32..89089fd8f 100644 --- a/crates/fbuild-build-esp/Cargo.toml +++ b/crates/fbuild-build-esp/Cargo.toml @@ -34,7 +34,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" } +zccache = { git = "https://github.com/zackees/zccache", rev = "a16f10e2c3813f0582e0e51eb3b9932c727435f1" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build-mcu/Cargo.toml b/crates/fbuild-build-mcu/Cargo.toml index c151fe4a5..b2f16c5dd 100644 --- a/crates/fbuild-build-mcu/Cargo.toml +++ b/crates/fbuild-build-mcu/Cargo.toml @@ -34,7 +34,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" } +zccache = { git = "https://github.com/zackees/zccache", rev = "a16f10e2c3813f0582e0e51eb3b9932c727435f1" } [dev-dependencies] filetime = { workspace = true }