From 63aaa5c1932cebabc34eceda9d92a70215dcead6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Apr 2025 04:47:09 +0000 Subject: [PATCH 01/32] release: cargo-binstall v1.12.3 (#2114) chore: Release Co-authored-by: github-actions --- Cargo.lock | 2 +- crates/bin/Cargo.toml | 2 +- crates/bin/windows.manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89599192..b241aea8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -547,7 +547,7 @@ dependencies = [ [[package]] name = "cargo-binstall" -version = "1.12.2" +version = "1.12.3" dependencies = [ "atomic-file-install", "binstalk", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 3e8a9c1a..fd5c42b3 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-binstall" description = "Binary installation for rust projects" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/cargo-binstall" -version = "1.12.2" +version = "1.12.3" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/bin/windows.manifest b/crates/bin/windows.manifest index be3ad5b3..215f50b2 100644 --- a/crates/bin/windows.manifest +++ b/crates/bin/windows.manifest @@ -3,7 +3,7 @@ From b28889078798cc98d3e7dc49684c64d77cd374bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 13:52:11 +1200 Subject: [PATCH 02/32] build(deps): bump tj-actions/changed-files from 0b975f61488402a699abcebd6a1e25924cf85218 to 6f67ee9ac810f0192ea7b3d2086406f97847bcf9 (#2115) build(deps): bump tj-actions/changed-files Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 0b975f61488402a699abcebd6a1e25924cf85218 to 6f67ee9ac810f0192ea7b3d2086406f97847bcf9. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/0b975f61488402a699abcebd6a1e25924cf85218...6f67ee9ac810f0192ea7b3d2086406f97847bcf9) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-version: 6f67ee9ac810f0192ea7b3d2086406f97847bcf9 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfd78722..42774319 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@0b975f61488402a699abcebd6a1e25924cf85218 + uses: tj-actions/changed-files@6f67ee9ac810f0192ea7b3d2086406f97847bcf9 with: dir_names: true dir_names_exclude_current_dir: true From acc44cb2074df76ed5fcafe8c2ef6167ad1d750d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 08:26:47 +0000 Subject: [PATCH 03/32] dep: Upgrade transitive dependencies (#2122) Co-authored-by: github-actions --- Cargo.lock | 112 ++++++++++++++++++++++------------------------------- 1 file changed, 47 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b241aea8..418ebe58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,7 +204,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.7", + "miniz_oxide 0.8.8", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", "regex-automata 0.4.9", @@ -842,9 +842,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -905,9 +905,9 @@ checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" [[package]] name = "deranged" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] @@ -1121,7 +1121,7 @@ dependencies = [ "crc32fast", "libz-ng-sys", "libz-rs-sys", - "miniz_oxide 0.8.7", + "miniz_oxide 0.8.8", ] [[package]] @@ -1381,7 +1381,7 @@ dependencies = [ "gix-utils", "itoa", "thiserror 2.0.12", - "winnow 0.7.4", + "winnow 0.7.6", ] [[package]] @@ -1463,7 +1463,7 @@ dependencies = [ "smallvec", "thiserror 2.0.12", "unicode-bom", - "winnow 0.7.4", + "winnow 0.7.6", ] [[package]] @@ -1538,15 +1538,16 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.41.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b7e708352a35b2b37ab39cbc7a2b9d22f8386808a10b6ea7dd4cd1cf817cd" +checksum = "016d6050219458d14520fe22bdfdeb9cb71631dec9bc2724767c983f60109634" dependencies = [ "bytes", "bytesize", "crc32fast", "crossbeam-channel", "flate2", + "gix-path", "gix-trace", "gix-utils", "libc", @@ -1713,7 +1714,7 @@ dependencies = [ "itoa", "smallvec", "thiserror 2.0.12", - "winnow 0.7.4", + "winnow 0.7.6", ] [[package]] @@ -1846,7 +1847,7 @@ dependencies = [ "gix-utils", "maybe-async", "thiserror 2.0.12", - "winnow 0.7.4", + "winnow 0.7.6", ] [[package]] @@ -1878,7 +1879,7 @@ dependencies = [ "gix-validate", "memmap2", "thiserror 2.0.12", - "winnow 0.7.4", + "winnow 0.7.6", ] [[package]] @@ -2253,13 +2254,13 @@ dependencies = [ [[package]] name = "hostname" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows 0.52.0", + "windows-link", ] [[package]] @@ -2595,9 +2596,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260" +checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2610,9 +2611,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c" +checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" dependencies = [ "proc-macro2", "quote", @@ -2720,9 +2721,9 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libmimalloc-sys" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b20daca3a4ac14dbdc753c5e90fc7b490a48a9131daed3c9a9ced7b2defd37b" +checksum = "ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4" dependencies = [ "cc", "libc", @@ -2736,7 +2737,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.9.0", "libc", - "redox_syscall 0.5.10", + "redox_syscall 0.5.11", ] [[package]] @@ -2766,9 +2767,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" @@ -2909,9 +2910,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cb1f88093fe50061ca1195d336ffec131347c7b833db31f9ab62a2d1b7925f" +checksum = "995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af" dependencies = [ "libmimalloc-sys", ] @@ -2939,9 +2940,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] @@ -3176,9 +3177,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-src" -version = "300.4.2+3.4.1" +version = "300.5.0+3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2" +checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" dependencies = [ "cc", ] @@ -3259,7 +3260,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.10", + "redox_syscall 0.5.11", "smallvec", "windows-targets 0.52.6", ] @@ -3349,9 +3350,9 @@ dependencies = [ [[package]] name = "positioned-io" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccabfeeb89c73adf4081f0dca7f8e28dbda90981a222ceea37f619e93ea6afe9" +checksum = "e8078ce4d22da5e8f57324d985cc9befe40c49ab0507a192d6be9e59584495c9" dependencies = [ "byteorder", "libc", @@ -3588,9 +3589,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" dependencies = [ "bitflags 2.9.0", ] @@ -3785,15 +3786,15 @@ dependencies = [ "bitflags 2.9.0", "errno 0.3.11", "libc", - "linux-raw-sys 0.9.3", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.25" +version = "0.23.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ "log", "once_cell", @@ -4393,9 +4394,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.1" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", @@ -4509,7 +4510,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.4", + "winnow 0.7.6", ] [[package]] @@ -4965,16 +4966,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.58.0" @@ -5007,15 +4998,6 @@ dependencies = [ "windows-core 0.61.0", ] -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.58.0" @@ -5392,9 +5374,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" dependencies = [ "memchr", ] From a803508dbf9c51e6ba0a3a68aa5bcb3b8fc6f4e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:02:19 +0000 Subject: [PATCH 04/32] dep: Upgrade transitive dependencies (#2130) Co-authored-by: github-actions --- Cargo.lock | 65 +++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 418ebe58..c19a45dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "arc-swap" @@ -516,6 +516,12 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" +[[package]] +name = "bytesize" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba" + [[package]] name = "bzip2" version = "0.5.2" @@ -635,9 +641,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.18" +version = "1.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" +checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" dependencies = [ "jobserver", "libc", @@ -678,9 +684,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" dependencies = [ "clap_builder", "clap_derive", @@ -698,9 +704,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" dependencies = [ "anstream", "anstyle", @@ -876,9 +882,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "default-net" @@ -1543,7 +1549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "016d6050219458d14520fe22bdfdeb9cb71631dec9bc2724767c983f60109634" dependencies = [ "bytes", - "bytesize", + "bytesize 1.3.3", "crc32fast", "crossbeam-channel", "flate2", @@ -2113,9 +2119,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" +checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" dependencies = [ "atomic-waker", "bytes", @@ -2206,7 +2212,7 @@ dependencies = [ "once_cell", "pin-project-lite", "quinn", - "rand 0.9.0", + "rand 0.9.1", "ring", "rustls", "rustls-pki-types", @@ -2233,7 +2239,7 @@ dependencies = [ "once_cell", "parking_lot", "quinn", - "rand 0.9.0", + "rand 0.9.1", "resolv-conf", "rustls", "smallvec", @@ -2596,9 +2602,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" +checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2611,9 +2617,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" +checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" dependencies = [ "proc-macro2", "quote", @@ -2715,9 +2721,9 @@ checksum = "0864a00c8d019e36216b69c2c4ce50b83b7bd966add3cf5ba554ec44f8bebcf5" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libmimalloc-sys" @@ -3408,20 +3414,20 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "prodash" -version = "29.0.1" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee7ce24c980b976607e2d6ae4aae92827994d23fed71659c3ede3f92528b58b" +checksum = "f04bb108f648884c23b98a0e940ebc2c93c0c3b89f04dbaf7eb8256ce617d1bc" dependencies = [ - "bytesize", + "bytesize 2.0.1", "human_format", "log", "parking_lot", @@ -3456,7 +3462,7 @@ checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" dependencies = [ "bytes", "getrandom 0.3.2", - "rand 0.9.0", + "rand 0.9.1", "ring", "rustc-hash", "rustls", @@ -3508,13 +3514,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha", "rand_core 0.9.3", - "zerocopy 0.8.24", ] [[package]] From b4df017ff79591e3c86dbfa6a783025a24f0dc8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Apr 2025 03:59:01 +0000 Subject: [PATCH 05/32] dep: Upgrade transitive dependencies (#2133) Co-authored-by: github-actions --- Cargo.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c19a45dd..83009abd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -473,9 +473,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37" +checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -684,9 +684,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -704,9 +704,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", @@ -1292,9 +1292,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -1387,7 +1387,7 @@ dependencies = [ "gix-utils", "itoa", "thiserror 2.0.12", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -1469,7 +1469,7 @@ dependencies = [ "smallvec", "thiserror 2.0.12", "unicode-bom", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -1720,7 +1720,7 @@ dependencies = [ "itoa", "smallvec", "thiserror 2.0.12", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -1853,7 +1853,7 @@ dependencies = [ "gix-utils", "maybe-async", "thiserror 2.0.12", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -1885,7 +1885,7 @@ dependencies = [ "gix-validate", "memmap2", "thiserror 2.0.12", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -2602,9 +2602,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" +checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2617,9 +2617,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" +checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" dependencies = [ "proc-macro2", "quote", @@ -3456,9 +3456,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" +checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b" dependencies = [ "bytes", "getrandom 0.3.2", @@ -3573,9 +3573,9 @@ dependencies = [ [[package]] name = "rc-zip-sync" -version = "4.2.6" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd21d17384a7da18df6b70f49bc2daa84d15e0fa0929bc635541383b3827190" +checksum = "dc9658d8ace392ab7f2b149ae6c40bea7a3d70ebc39aaa6c7076ddc3f11c9c32" dependencies = [ "oval", "positioned-io", @@ -3607,7 +3607,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", "libredox", "thiserror 2.0.12", ] @@ -3742,7 +3742,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -4055,9 +4055,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -4473,9 +4473,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -4515,7 +4515,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -5379,9 +5379,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" dependencies = [ "memchr", ] From 38e42845bcee01f3434a95fc21e462c96bc323c5 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Mon, 5 May 2025 23:52:01 +1000 Subject: [PATCH 06/32] Bump ziglang to latest version (#2139) * Bump ziglang to latest version to fix the erorr in https://github.com/cargo-bins/cargo-binstall/actions/runs/14797824334/job/41549189656?pr=2137 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Disable icf on linux since latest zig-cc does not support it Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Disable cargo-auditable Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- .github/workflows/release-packages.yml | 3 +-- justfile | 5 ++--- zigbuild-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 4291de23..61fef550 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -59,7 +59,6 @@ jobs: GLIBC_VERSION: ${{ matrix.g }} JUST_USE_CARGO_ZIGBUILD: ${{ matrix.c }} JUST_FOR_RELEASE: true - JUST_USE_AUDITABLE: true JUST_ENABLE_H3: true steps: @@ -77,7 +76,7 @@ jobs: - uses: ./.github/actions/just-setup with: - tools: cargo-auditable,rsign2,rage + tools: rsign2,rage env: # just-setup use binstall to install sccache, # which works better when we provide it with GITHUB_TOKEN. diff --git a/justfile b/justfile index f4590818..e9cb9f53 100644 --- a/justfile +++ b/justfile @@ -115,13 +115,12 @@ rust-lld := "" #if use-cargo-zigbuild != "" { # ICF: link-time identical code folding # -# On windows it works out of the box and on linux it uses -# rust-lld. +# On windows it works out of the box. rustc-icf := if for-release != "" { if target-os == "windows" { " -C link-arg=-Wl,--icf=safe" } else if target-os == "linux" { - " -C link-arg=-Wl,--icf=safe" + "" } else { "" } diff --git a/zigbuild-requirements.txt b/zigbuild-requirements.txt index 41ba0c5e..3f2a1dfc 100644 --- a/zigbuild-requirements.txt +++ b/zigbuild-requirements.txt @@ -2,4 +2,4 @@ cargo-zigbuild ###### Requirements with Version Specifiers ###### -ziglang < 0.11 # zig 0.11 causes link failure in our CI +ziglang From 20e9b259131d8950a206d6a46bf8643ef3c9a739 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 14:24:40 +0000 Subject: [PATCH 07/32] dep: Upgrade transitive dependencies (#2142) Co-authored-by: github-actions --- Cargo.lock | 397 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 232 insertions(+), 165 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83009abd..d249a452 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -151,17 +151,6 @@ dependencies = [ "zstd-safe", ] -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "async-trait" version = "0.1.88" @@ -641,9 +630,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.19" +version = "1.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0" dependencies = [ "jobserver", "libc", @@ -675,9 +664,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "num-traits", ] @@ -1094,6 +1083,16 @@ dependencies = [ "serde", ] +[[package]] +name = "faster-hex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73" +dependencies = [ + "heapless", + "serde", +] + [[package]] name = "fastrand" version = "2.3.0" @@ -1174,7 +1173,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8640e34b88f7652208ce9e88b1a37a2ae95227d84abec377ccd3c5cfeb141ed4" dependencies = [ - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -1338,11 +1337,11 @@ dependencies = [ "gix-date", "gix-diff", "gix-discover", - "gix-features", + "gix-features 0.41.1", "gix-filter", - "gix-fs", + "gix-fs 0.14.0", "gix-glob", - "gix-hash", + "gix-hash 0.17.0", "gix-hashtable", "gix-ignore", "gix-index", @@ -1367,8 +1366,8 @@ dependencies = [ "gix-transport", "gix-traverse", "gix-url", - "gix-utils", - "gix-validate", + "gix-utils 0.2.0", + "gix-validate 0.9.4", "gix-worktree", "gix-worktree-state", "once_cell", @@ -1384,10 +1383,10 @@ checksum = "f438c87d4028aca4b82f82ba8d8ab1569823cfb3e5bc5fa8456a71678b2a20e7" dependencies = [ "bstr", "gix-date", - "gix-utils", + "gix-utils 0.2.0", "itoa", "thiserror 2.0.12", - "winnow 0.7.7", + "winnow 0.7.9", ] [[package]] @@ -1446,7 +1445,7 @@ checksum = "043cbe49b7a7505150db975f3cb7c15833335ac1e26781f615454d9d640a28fe" dependencies = [ "bstr", "gix-chunk", - "gix-hash", + "gix-hash 0.17.0", "memmap2", "thiserror 2.0.12", ] @@ -1459,7 +1458,7 @@ checksum = "9c6f830bf746604940261b49abf7f655d2c19cadc9f4142ae9379e3a316e8cfa" dependencies = [ "bstr", "gix-config-value", - "gix-features", + "gix-features 0.41.1", "gix-glob", "gix-path", "gix-ref", @@ -1469,7 +1468,7 @@ dependencies = [ "smallvec", "thiserror 2.0.12", "unicode-bom", - "winnow 0.7.7", + "winnow 0.7.9", ] [[package]] @@ -1521,7 +1520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2c975dad2afc85e4e233f444d1efbe436c3cdcf3a07173984509c436d00a3f8" dependencies = [ "bstr", - "gix-hash", + "gix-hash 0.17.0", "gix-object", "thiserror 2.0.12", ] @@ -1534,8 +1533,8 @@ checksum = "f7fb8a4349b854506a3915de18d3341e5f1daa6b489c8affc9ca0d69efe86781" dependencies = [ "bstr", "dunce", - "gix-fs", - "gix-hash", + "gix-fs 0.14.0", + "gix-hash 0.17.0", "gix-path", "gix-ref", "gix-sec", @@ -1555,7 +1554,7 @@ dependencies = [ "flate2", "gix-path", "gix-trace", - "gix-utils", + "gix-utils 0.2.0", "libc", "once_cell", "parking_lot", @@ -1564,6 +1563,18 @@ dependencies = [ "walkdir", ] +[[package]] +name = "gix-features" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f4399af6ec4fd9db84dd4cf9656c5c785ab492ab40a7c27ea92b4241923fed" +dependencies = [ + "gix-trace", + "gix-utils 0.3.0", + "libc", + "prodash", +] + [[package]] name = "gix-filter" version = "0.18.0" @@ -1574,13 +1585,13 @@ dependencies = [ "encoding_rs", "gix-attributes", "gix-command", - "gix-hash", + "gix-hash 0.17.0", "gix-object", "gix-packetline-blocking", "gix-path", "gix-quote", "gix-trace", - "gix-utils", + "gix-utils 0.2.0", "smallvec", "thiserror 2.0.12", ] @@ -1593,9 +1604,23 @@ checksum = "951e886120dc5fa8cac053e5e5c89443f12368ca36811b2e43d1539081f9c111" dependencies = [ "bstr", "fastrand", - "gix-features", + "gix-features 0.41.1", "gix-path", - "gix-utils", + "gix-utils 0.2.0", + "thiserror 2.0.12", +] + +[[package]] +name = "gix-fs" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a0637149b4ef24d3ea55f81f77231401c8463fae6da27331c987957eb597c7" +dependencies = [ + "bstr", + "fastrand", + "gix-features 0.42.1", + "gix-path", + "gix-utils 0.3.0", "thiserror 2.0.12", ] @@ -1607,7 +1632,7 @@ checksum = "20972499c03473e773a2099e5fd0c695b9b72465837797a51a43391a1635a030" dependencies = [ "bitflags 2.9.0", "bstr", - "gix-features", + "gix-features 0.41.1", "gix-path", ] @@ -1617,19 +1642,31 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "834e79722063958b03342edaa1e17595cd2939bb2b3306b3225d0815566dcb49" dependencies = [ - "faster-hex", - "gix-features", + "faster-hex 0.9.0", + "gix-features 0.41.1", + "sha1-checked", + "thiserror 2.0.12", +] + +[[package]] +name = "gix-hash" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d4900562c662852a6b42e2ef03442eccebf24f047d8eab4f23bc12ef0d785d8" +dependencies = [ + "faster-hex 0.10.0", + "gix-features 0.42.1", "sha1-checked", "thiserror 2.0.12", ] [[package]] name = "gix-hashtable" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f06066d8702a9186dc1fdc1ed751ff2d7e924ceca21cb5d51b8f990c9c2e014a" +checksum = "b5b5cb3c308b4144f2612ff64e32130e641279fcf1a84d8d40dad843b4f64904" dependencies = [ - "gix-hash", + "gix-hash 0.18.0", "hashbrown 0.14.5", "parking_lot", ] @@ -1658,14 +1695,14 @@ dependencies = [ "filetime", "fnv", "gix-bitmap", - "gix-features", - "gix-fs", - "gix-hash", + "gix-features 0.41.1", + "gix-fs 0.14.0", + "gix-hash 0.17.0", "gix-lock", "gix-object", "gix-traverse", - "gix-utils", - "gix-validate", + "gix-utils 0.2.0", + "gix-validate 0.9.4", "hashbrown 0.14.5", "itoa", "libc", @@ -1677,12 +1714,12 @@ dependencies = [ [[package]] name = "gix-lock" -version = "17.0.0" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df47b8f11c34520db5541bc5fc9fbc8e4b0bdfcec3736af89ccb1a5728a0126f" +checksum = "570f8b034659f256366dc90f1a24924902f20acccd6a15be96d44d1269e7a796" dependencies = [ "gix-tempfile", - "gix-utils", + "gix-utils 0.3.0", "thiserror 2.0.12", ] @@ -1695,7 +1732,7 @@ dependencies = [ "bitflags 2.9.0", "gix-commitgraph", "gix-date", - "gix-hash", + "gix-hash 0.17.0", "gix-object", "gix-revwalk", "smallvec", @@ -1711,16 +1748,16 @@ dependencies = [ "bstr", "gix-actor", "gix-date", - "gix-features", - "gix-hash", + "gix-features 0.41.1", + "gix-hash 0.17.0", "gix-hashtable", "gix-path", - "gix-utils", - "gix-validate", + "gix-utils 0.2.0", + "gix-validate 0.9.4", "itoa", "smallvec", "thiserror 2.0.12", - "winnow 0.7.7", + "winnow 0.7.9", ] [[package]] @@ -1731,9 +1768,9 @@ checksum = "50306d40dcc982eb6b7593103f066ea6289c7b094cb9db14f3cd2be0b9f5e610" dependencies = [ "arc-swap", "gix-date", - "gix-features", - "gix-fs", - "gix-hash", + "gix-features 0.41.1", + "gix-fs 0.14.0", + "gix-hash 0.17.0", "gix-hashtable", "gix-object", "gix-pack", @@ -1752,8 +1789,8 @@ checksum = "9b65fffb09393c26624ca408d32cfe8776fb94cd0a5cdf984905e1d2f39779cb" dependencies = [ "clru", "gix-chunk", - "gix-features", - "gix-hash", + "gix-features 0.41.1", + "gix-hash 0.17.0", "gix-hashtable", "gix-object", "gix-path", @@ -1772,7 +1809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "123844a70cf4d5352441dc06bab0da8aef61be94ec239cb631e0ba01dc6d3a04" dependencies = [ "bstr", - "faster-hex", + "faster-hex 0.9.0", "gix-trace", "thiserror 2.0.12", ] @@ -1784,19 +1821,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ecf3ea2e105c7e45587bac04099824301262a6c43357fad5205da36dbb233b3" dependencies = [ "bstr", - "faster-hex", + "faster-hex 0.9.0", "gix-trace", "thiserror 2.0.12", ] [[package]] name = "gix-path" -version = "0.10.15" +version = "0.10.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f910668e2f6b2a55ff35a1f04df88a1a049f7b868507f4cbeeaa220eaba7be87" +checksum = "c091d2e887e02c3462f52252c5ea61150270c0f2657b642e8d0d6df56c16e642" dependencies = [ "bstr", "gix-trace", + "gix-validate 0.10.0", "home", "once_cell", "thiserror 2.0.12", @@ -1839,8 +1877,8 @@ dependencies = [ "bstr", "gix-credentials", "gix-date", - "gix-features", - "gix-hash", + "gix-features 0.41.1", + "gix-hash 0.17.0", "gix-lock", "gix-negotiate", "gix-object", @@ -1850,10 +1888,10 @@ dependencies = [ "gix-shallow", "gix-trace", "gix-transport", - "gix-utils", + "gix-utils 0.2.0", "maybe-async", "thiserror 2.0.12", - "winnow 0.7.7", + "winnow 0.7.9", ] [[package]] @@ -1863,7 +1901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b005c550bf84de3b24aa5e540a23e6146a1c01c7d30470e35d75a12f827f969" dependencies = [ "bstr", - "gix-utils", + "gix-utils 0.2.0", "thiserror 2.0.12", ] @@ -1874,18 +1912,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2e1f7eb6b7ce82d2d19961f74bd637bab3ea79b1bc7bfb23dbefc67b0415d8b" dependencies = [ "gix-actor", - "gix-features", - "gix-fs", - "gix-hash", + "gix-features 0.41.1", + "gix-fs 0.14.0", + "gix-hash 0.17.0", "gix-lock", "gix-object", "gix-path", "gix-tempfile", - "gix-utils", - "gix-validate", + "gix-utils 0.2.0", + "gix-validate 0.9.4", "memmap2", "thiserror 2.0.12", - "winnow 0.7.7", + "winnow 0.7.9", ] [[package]] @@ -1895,9 +1933,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d8587b21e2264a6e8938d940c5c99662779c13a10741a5737b15fc85c252ffc" dependencies = [ "bstr", - "gix-hash", + "gix-hash 0.17.0", "gix-revision", - "gix-validate", + "gix-validate 0.9.4", "smallvec", "thiserror 2.0.12", ] @@ -1911,7 +1949,7 @@ dependencies = [ "bstr", "gix-commitgraph", "gix-date", - "gix-hash", + "gix-hash 0.17.0", "gix-object", "gix-revwalk", "thiserror 2.0.12", @@ -1925,7 +1963,7 @@ checksum = "2dc7c3d7e5cdc1ab8d35130106e4af0a4f9f9eca0c81f4312b690780e92bde0d" dependencies = [ "gix-commitgraph", "gix-date", - "gix-hash", + "gix-hash 0.17.0", "gix-hashtable", "gix-object", "smallvec", @@ -1951,7 +1989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc0598aacfe1d52575a21c9492fee086edbb21e228ec36c819c42ab923f434c3" dependencies = [ "bstr", - "gix-hash", + "gix-hash 0.17.0", "gix-lock", "thiserror 2.0.12", ] @@ -1973,11 +2011,11 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "17.0.0" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6de439bbb9a5d3550c9c7fab0e16d2d637d120fcbe0dfbc538772a187f099b" +checksum = "c750e8c008453a2dba67a2b0d928b7716e05da31173a3f5e351d5457ad4470aa" dependencies = [ - "gix-fs", + "gix-fs 0.15.0", "libc", "once_cell", "parking_lot", @@ -2000,7 +2038,7 @@ dependencies = [ "bstr", "gix-command", "gix-credentials", - "gix-features", + "gix-features 0.41.1", "gix-packetline", "gix-quote", "gix-sec", @@ -2018,7 +2056,7 @@ dependencies = [ "bitflags 2.9.0", "gix-commitgraph", "gix-date", - "gix-hash", + "gix-hash 0.17.0", "gix-hashtable", "gix-object", "gix-revwalk", @@ -2033,7 +2071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48dfe23f93f1ddb84977d80bb0dd7aa09d1bf5d5afc0c9b6820cccacc25ae860" dependencies = [ "bstr", - "gix-features", + "gix-features 0.41.1", "gix-path", "percent-encoding", "thiserror 2.0.12", @@ -2050,6 +2088,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "gix-utils" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5351af2b172caf41a3728eb4455326d84e0d70fe26fc4de74ab0bd37df4191c5" +dependencies = [ + "fastrand", + "unicode-normalization", +] + [[package]] name = "gix-validate" version = "0.9.4" @@ -2060,6 +2108,16 @@ dependencies = [ "thiserror 2.0.12", ] +[[package]] +name = "gix-validate" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b9e00cacde5b51388d28ed746c493b18a6add1f19b5e01d686b3b9ece66d4d" +dependencies = [ + "bstr", + "thiserror 2.0.12", +] + [[package]] name = "gix-worktree" version = "0.40.0" @@ -2068,15 +2126,15 @@ checksum = "f7760dbc4b79aa274fed30adc0d41dca6b917641f26e7867c4071b1fb4dc727b" dependencies = [ "bstr", "gix-attributes", - "gix-features", - "gix-fs", + "gix-features 0.41.1", + "gix-fs 0.14.0", "gix-glob", - "gix-hash", + "gix-hash 0.17.0", "gix-ignore", "gix-index", "gix-object", "gix-path", - "gix-validate", + "gix-validate 0.9.4", ] [[package]] @@ -2086,11 +2144,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490eb4d38ec2735b3466840aa3881b44ec1a4c180d6a658abfab03910380e18b" dependencies = [ "bstr", - "gix-features", + "gix-features 0.41.1", "gix-filter", - "gix-fs", + "gix-fs 0.14.0", "gix-glob", - "gix-hash", + "gix-hash 0.17.0", "gix-index", "gix-object", "gix-path", @@ -2119,9 +2177,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" +checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" dependencies = [ "atomic-waker", "bytes", @@ -2164,6 +2222,15 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.14.5" @@ -2176,9 +2243,19 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" + +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32", + "stable_deref_trait", +] [[package]] name = "heck" @@ -2188,16 +2265,14 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hickory-proto" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d844af74f7b799e41c78221be863bade11c430d46042c3b49ca8ae0c6d27287" +checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" dependencies = [ - "async-recursion", "async-trait", "bitflags 2.9.0", "bytes", "cfg-if", - "critical-section", "data-encoding", "enum-as-inner", "futures-channel", @@ -2227,9 +2302,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a128410b38d6f931fcc6ca5c107a3b02cabd6c05967841269a4ad65d23c44331" +checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" dependencies = [ "cfg-if", "futures-util", @@ -2258,17 +2333,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "hostname" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" -dependencies = [ - "cfg-if", - "libc", - "windows-link", -] - [[package]] name = "http" version = "1.3.1" @@ -2542,7 +2606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.3", ] [[package]] @@ -2602,9 +2666,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6" +checksum = "d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2617,9 +2681,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" +checksum = "f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300" dependencies = [ "proc-macro2", "quote", @@ -2743,7 +2807,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.9.0", "libc", - "redox_syscall 0.5.11", + "redox_syscall 0.5.12", ] [[package]] @@ -2885,9 +2949,9 @@ dependencies = [ [[package]] name = "miette" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" +checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" dependencies = [ "backtrace", "backtrace-ext", @@ -2899,15 +2963,14 @@ dependencies = [ "supports-unicode", "terminal_size", "textwrap", - "thiserror 1.0.69", "unicode-width 0.1.14", ] [[package]] name = "miette-derive" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" +checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" dependencies = [ "proc-macro2", "quote", @@ -3192,9 +3255,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.107" +version = "0.9.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" dependencies = [ "cc", "libc", @@ -3266,7 +3329,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.11", + "redox_syscall 0.5.12", "smallvec", "windows-targets 0.52.6", ] @@ -3377,7 +3440,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.24", + "zerocopy 0.8.25", ] [[package]] @@ -3476,9 +3539,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" dependencies = [ "cfg_aliases", "libc", @@ -3594,9 +3657,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" dependencies = [ "bitflags 2.9.0", ] @@ -3620,7 +3683,7 @@ checksum = "78c81d000a2c524133cc00d2f92f019d399e57906c3b7119271a2495354fe895" dependencies = [ "cfg-if", "libc", - "rustix 1.0.5", + "rustix 1.0.7", "windows 0.61.1", ] @@ -3727,12 +3790,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48375394603e3dd4b2d64371f7148fd8c7baa2680e28741f2cb8d23b59e3d4c4" -dependencies = [ - "hostname", -] +checksum = "fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302" [[package]] name = "ring" @@ -3784,9 +3844,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags 2.9.0", "errno 0.3.11", @@ -4023,9 +4083,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -4173,9 +4233,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -4193,9 +4253,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", @@ -4265,7 +4325,7 @@ dependencies = [ "fastrand", "getrandom 0.3.2", "once_cell", - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -4275,7 +4335,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" dependencies = [ - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -4486,9 +4546,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", "serde_spanned", @@ -4498,26 +4558,33 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.24" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.7", + "toml_write", + "winnow 0.7.9", ] +[[package]] +name = "toml_write" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" + [[package]] name = "tower" version = "0.5.2" @@ -4918,9 +4985,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.8" +version = "0.26.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93" dependencies = [ "rustls-pki-types", ] @@ -5379,9 +5446,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" +checksum = "d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3" dependencies = [ "memchr", ] @@ -5434,7 +5501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" dependencies = [ "libc", - "rustix 1.0.5", + "rustix 1.0.7", ] [[package]] @@ -5481,11 +5548,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "zerocopy-derive 0.8.24", + "zerocopy-derive 0.8.25", ] [[package]] @@ -5501,9 +5568,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ "proc-macro2", "quote", From 1394d1bbda09c88a6668ff9749f935bb58505417 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Wed, 7 May 2025 18:43:36 +1000 Subject: [PATCH 08/32] Fix glibc detection on ubuntu 24.02 (#2143) * Fix glibc detection on ubuntu 24.02 On ubuntu 24.02, glibc are installed in: ``` /usr/lib/aarch64-linux-gnu/libc.so.6 /usr/lib/aarch64-linux-gnu/libc.so ``` Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Add tests for ubuntu-24.02-arm Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix CI: Add detect-targets-ubuntu-arm-test Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Bump ubuntu-20.04 to ubuntu-22.04 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Update outdated comment in detect-targets-ubuntu-arm-test in ci.yml Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- .github/workflows/ci.yml | 23 ++++++++++++++++++++--- crates/detect-targets/src/detect/linux.rs | 4 ++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42774319..3ac95670 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -275,7 +275,23 @@ jobs: --mount src="$PWD/.github/scripts/test-detect-targets-musl.sh",dst=/usr/local/bin/test.sh,type=bind \ alpine /bin/ash -c "apk update && apk add bash && test.sh x86_64-unknown-linux-musl" - detect-targets-ubuntu-test: + detect-targets-ubuntu-arm-test: + runs-on: ubuntu-24.04-arm + steps: + - uses: actions/checkout@v4 + - uses: Swatinem/rust-cache@v2 + with: + cache-all-crates: true + - name: Build and run detect-targets tests + run: | + set -euxo pipefail + output="$(cargo run --features cli-logging --bin detect-targets)" + [ "$output" = "$(printf 'aarch64-unknown-linux-gnu\naarch64-unknown-linux-musl')" ] + # Set working directory here, otherwise `cargo` would download + # and build quite a few unused dependencies. + working-directory: crates/detect-targets + + detect-targets-ubuntu-x86_64-test: needs: - detect-targets-build - changed-files @@ -284,7 +300,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-20.04 + - ubuntu-22.04 - ubuntu-latest runs-on: ${{ matrix.os }} steps: @@ -385,7 +401,8 @@ jobs: - release-dry-run - detect-targets-build - detect-targets-alpine-test - - detect-targets-ubuntu-test + - detect-targets-ubuntu-arm-test + - detect-targets-ubuntu-x86_64-test - detect-targets-more-glibc-test - detect-targets-nix-test - detect-targets-android-check diff --git a/crates/detect-targets/src/detect/linux.rs b/crates/detect-targets/src/detect/linux.rs index c1fcf75b..7068db8e 100644 --- a/crates/detect-targets/src/detect/linux.rs +++ b/crates/detect-targets/src/detect/linux.rs @@ -52,6 +52,10 @@ pub(super) async fn detect_targets(target: String) -> Vec { format!("/lib64/{dirname}/{filename}"), format!("/usr/lib/{dirname}/{filename}"), format!("/usr/lib64/{dirname}/{filename}"), + format!("/usr/lib/{dirname}/libc.so.6"), + format!("/usr/lib64/{dirname}/libc.so.6"), + format!("/usr/lib/{dirname}/libc.so"), + format!("/usr/lib64/{dirname}/libc.so"), ] .into_iter() .map(|p| AutoAbortHandle(tokio::spawn(is_gnu_ld(p)))) From 15dc05f12b65c47f1ac9a653128ee597c7544a43 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 11:12:21 +0000 Subject: [PATCH 09/32] dep: Upgrade transitive dependencies (#2145) Co-authored-by: github-actions --- Cargo.lock | 57 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d249a452..57dd731e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -186,9 +186,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -1386,7 +1386,7 @@ dependencies = [ "gix-utils 0.2.0", "itoa", "thiserror 2.0.12", - "winnow 0.7.9", + "winnow 0.7.10", ] [[package]] @@ -1468,7 +1468,7 @@ dependencies = [ "smallvec", "thiserror 2.0.12", "unicode-bom", - "winnow 0.7.9", + "winnow 0.7.10", ] [[package]] @@ -1757,7 +1757,7 @@ dependencies = [ "itoa", "smallvec", "thiserror 2.0.12", - "winnow 0.7.9", + "winnow 0.7.10", ] [[package]] @@ -1891,7 +1891,7 @@ dependencies = [ "gix-utils 0.2.0", "maybe-async", "thiserror 2.0.12", - "winnow 0.7.9", + "winnow 0.7.10", ] [[package]] @@ -1923,7 +1923,7 @@ dependencies = [ "gix-validate 0.9.4", "memmap2", "thiserror 2.0.12", - "winnow 0.7.9", + "winnow 0.7.10", ] [[package]] @@ -2421,7 +2421,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots", + "webpki-roots 0.26.11", ] [[package]] @@ -2666,9 +2666,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd" +checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2681,9 +2681,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300" +checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48" dependencies = [ "proc-macro2", "quote", @@ -3784,7 +3784,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.26.11", "windows-registry", ] @@ -3857,9 +3857,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.26" +version = "0.23.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" dependencies = [ "log", "once_cell", @@ -3902,9 +3902,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.1" +version = "0.103.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +checksum = "7149975849f1abb3832b246010ef62ccc80d3a76169517ada7188252b9cfb437" dependencies = [ "ring", "rustls-pki-types", @@ -4459,9 +4459,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.2" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" dependencies = [ "backtrace", "bytes", @@ -4576,7 +4576,7 @@ dependencies = [ "serde_spanned", "toml_datetime", "toml_write", - "winnow 0.7.9", + "winnow 0.7.10", ] [[package]] @@ -4985,9 +4985,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.10" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.0", +] + +[[package]] +name = "webpki-roots" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" dependencies = [ "rustls-pki-types", ] @@ -5446,9 +5455,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ "memchr", ] From f95e90d82c5fa4bf4f283f8e99569ae5bcc6d127 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 11:42:02 +0000 Subject: [PATCH 10/32] chore: release (#2123) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- crates/bin/Cargo.toml | 4 ++-- crates/binstalk-manifests/CHANGELOG.md | 6 ++++++ crates/binstalk-manifests/Cargo.toml | 4 ++-- crates/binstalk/CHANGELOG.md | 6 ++++++ crates/binstalk/Cargo.toml | 4 ++-- crates/detect-targets/CHANGELOG.md | 6 ++++++ crates/detect-targets/Cargo.toml | 2 +- crates/detect-wasi/CHANGELOG.md | 6 ++++++ crates/detect-wasi/Cargo.toml | 2 +- 10 files changed, 36 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57dd731e..b9347eca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,7 +231,7 @@ dependencies = [ [[package]] name = "binstalk" -version = "0.28.31" +version = "0.28.32" dependencies = [ "binstalk-bins", "binstalk-downloader", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "binstalk-manifests" -version = "0.15.28" +version = "0.15.29" dependencies = [ "beef", "binstalk-types", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "detect-targets" -version = "0.1.47" +version = "0.1.48" dependencies = [ "cfg-if", "guess_host_triple", @@ -932,7 +932,7 @@ dependencies = [ [[package]] name = "detect-wasi" -version = "1.0.28" +version = "1.0.29" dependencies = [ "tempfile", ] diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index fd5c42b3..84b9a9a2 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -23,8 +23,8 @@ pkg-fmt = "zip" [dependencies] atomic-file-install = { version = "1.0.11", path = "../atomic-file-install" } -binstalk = { path = "../binstalk", version = "0.28.31", default-features = false } -binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.28" } +binstalk = { path = "../binstalk", version = "0.28.32", default-features = false } +binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.29" } clap = { version = "4.5.3", features = ["derive", "env", "wrap_help"] } clap-cargo = "0.15.2" compact_str = "0.9.0" diff --git a/crates/binstalk-manifests/CHANGELOG.md b/crates/binstalk-manifests/CHANGELOG.md index aa0fe9bf..8f9ee547 100644 --- a/crates/binstalk-manifests/CHANGELOG.md +++ b/crates/binstalk-manifests/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.15.29](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.28...binstalk-manifests-v0.15.29) - 2025-05-07 + +### Other + +- updated the following local packages: detect-targets + ## [0.15.28](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.27...binstalk-manifests-v0.15.28) - 2025-04-05 ### Other diff --git a/crates/binstalk-manifests/Cargo.toml b/crates/binstalk-manifests/Cargo.toml index 8f650dfb..9c8f11c3 100644 --- a/crates/binstalk-manifests/Cargo.toml +++ b/crates/binstalk-manifests/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-manifests" description = "The binstall toolkit for manipulating with manifest" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-manifests" -version = "0.15.28" +version = "0.15.29" rust-version = "1.61.0" authors = ["ryan "] edition = "2021" @@ -25,5 +25,5 @@ toml_edit = { version = "0.22.12", features = ["serde"] } url = { version = "2.5.4", features = ["serde"] } [dev-dependencies] -detect-targets = { version = "0.1.47", path = "../detect-targets" } +detect-targets = { version = "0.1.48", path = "../detect-targets" } tempfile = "3.5.0" diff --git a/crates/binstalk/CHANGELOG.md b/crates/binstalk/CHANGELOG.md index ce5bb284..a4adc296 100644 --- a/crates/binstalk/CHANGELOG.md +++ b/crates/binstalk/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.28.32](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.31...binstalk-v0.28.32) - 2025-05-07 + +### Other + +- updated the following local packages: detect-targets + ## [0.28.31](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.30...binstalk-v0.28.31) - 2025-04-05 ### Other diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 3c26c8a7..2756ca4d 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk" description = "The binstall toolkit (library interface)" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk" -version = "0.28.31" +version = "0.28.32" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" @@ -21,7 +21,7 @@ binstalk-types = { version = "0.9.4", path = "../binstalk-types" } cargo-toml-workspace = { version = "7.0.6", path = "../cargo-toml-workspace" } command-group = { version = "5.0.1", features = ["with-tokio"] } compact_str = { version = "0.9.0", features = ["serde"] } -detect-targets = { version = "0.1.47", path = "../detect-targets", features = [ +detect-targets = { version = "0.1.48", path = "../detect-targets", features = [ "tracing", ] } either = "1.11.0" diff --git a/crates/detect-targets/CHANGELOG.md b/crates/detect-targets/CHANGELOG.md index d73d200d..c26592e7 100644 --- a/crates/detect-targets/CHANGELOG.md +++ b/crates/detect-targets/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.48](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.47...detect-targets-v0.1.48) - 2025-05-07 + +### Other + +- Fix glibc detection on ubuntu 24.02 ([#2143](https://github.com/cargo-bins/cargo-binstall/pull/2143)) + ## [0.1.47](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.46...detect-targets-v0.1.47) - 2025-04-05 ### Other diff --git a/crates/detect-targets/Cargo.toml b/crates/detect-targets/Cargo.toml index cfc01aaa..22210fa6 100644 --- a/crates/detect-targets/Cargo.toml +++ b/crates/detect-targets/Cargo.toml @@ -3,7 +3,7 @@ name = "detect-targets" description = "Detect the target of the env at runtime" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/detect-targets" -version = "0.1.47" +version = "0.1.48" rust-version = "1.62.0" authors = ["Jiahao XU "] edition = "2021" diff --git a/crates/detect-wasi/CHANGELOG.md b/crates/detect-wasi/CHANGELOG.md index 9466296f..a2203393 100644 --- a/crates/detect-wasi/CHANGELOG.md +++ b/crates/detect-wasi/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.29](https://github.com/cargo-bins/cargo-binstall/compare/detect-wasi-v1.0.28...detect-wasi-v1.0.29) - 2025-05-07 + +### Other + +- update Cargo.lock dependencies + ## [1.0.28](https://github.com/cargo-bins/cargo-binstall/compare/detect-wasi-v1.0.27...detect-wasi-v1.0.28) - 2025-04-05 ### Other diff --git a/crates/detect-wasi/Cargo.toml b/crates/detect-wasi/Cargo.toml index 65920f7a..f1d63ede 100644 --- a/crates/detect-wasi/Cargo.toml +++ b/crates/detect-wasi/Cargo.toml @@ -3,7 +3,7 @@ name = "detect-wasi" description = "Detect if WASI can be run" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/detect-wasi" -version = "1.0.28" +version = "1.0.29" rust-version = "1.61.0" authors = ["Félix Saparelli "] edition = "2021" From 13f9d60d5358393bf14644dba56d9f123bc5d595 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 12:19:04 +0000 Subject: [PATCH 11/32] release: cargo-binstall v1.12.4 (#2146) chore: Release Co-authored-by: github-actions --- Cargo.lock | 2 +- crates/bin/Cargo.toml | 2 +- crates/bin/windows.manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9347eca..aafb534f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "cargo-binstall" -version = "1.12.3" +version = "1.12.4" dependencies = [ "atomic-file-install", "binstalk", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 84b9a9a2..1435758c 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-binstall" description = "Binary installation for rust projects" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/cargo-binstall" -version = "1.12.3" +version = "1.12.4" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/bin/windows.manifest b/crates/bin/windows.manifest index 215f50b2..dd5feb67 100644 --- a/crates/bin/windows.manifest +++ b/crates/bin/windows.manifest @@ -3,7 +3,7 @@ From 45abf0e8273028b529919845ebaf796856a19c2f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 May 2025 10:15:25 +0000 Subject: [PATCH 12/32] dep: Upgrade transitive dependencies (#2148) Co-authored-by: github-actions --- Cargo.lock | 179 ++++++++++++++++++++--------------------------------- 1 file changed, 68 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aafb534f..6c86b6d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,14 +25,14 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -807,9 +807,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" dependencies = [ "crc-catalog", ] @@ -2462,21 +2462,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -2485,31 +2486,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -2517,67 +2498,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" +checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "idna" version = "1.0.3" @@ -2591,9 +2559,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -2843,9 +2811,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" @@ -3428,6 +3396,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3440,7 +3417,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.25", + "zerocopy", ] [[package]] @@ -3893,11 +3870,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ "web-time", + "zeroize", ] [[package]] @@ -4434,9 +4412,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -4765,12 +4743,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -5491,17 +5463,11 @@ dependencies = [ "bitflags 2.9.0", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "xattr" @@ -5524,9 +5490,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -5536,9 +5502,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", @@ -5546,33 +5512,13 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive 0.7.35", -] - [[package]] name = "zerocopy" version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "zerocopy-derive 0.8.25", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "zerocopy-derive", ] [[package]] @@ -5614,10 +5560,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] -name = "zerovec" -version = "0.10.4" +name = "zerotrie" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -5626,9 +5583,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", From 277269fc8e4ebd8cf30d06174714419e0c1e438e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 May 2025 01:49:27 +0000 Subject: [PATCH 13/32] build(deps): bump file-format from 0.26.0 to 0.27.0 in the deps group (#2149) Bumps the deps group with 1 update: [file-format](https://github.com/mmalecot/file-format). Updates `file-format` from 0.26.0 to 0.27.0 - [Release notes](https://github.com/mmalecot/file-format/releases) - [Changelog](https://github.com/mmalecot/file-format/blob/main/CHANGELOG.md) - [Commits](https://github.com/mmalecot/file-format/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: file-format dependency-version: 0.27.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: deps ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- crates/bin/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c86b6d1..1ad05050 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1101,9 +1101,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "file-format" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ef3d5e8ae27277c8285ac43ed153158178ef0f79567f32024ca8140a0c7cd8" +checksum = "0ff8badf6e72ff15e42c9ade15d01375837173b17d10c228ab41d821082619db" [[package]] name = "filetime" diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 1435758c..c3ccfd47 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -29,7 +29,7 @@ clap = { version = "4.5.3", features = ["derive", "env", "wrap_help"] } clap-cargo = "0.15.2" compact_str = "0.9.0" dirs = "6.0.0" -file-format = { version = "0.26.0", default-features = false } +file-format = { version = "0.27.0", default-features = false } home = "0.5.9" log = { version = "0.4.22", features = ["std"] } miette = "7.0.0" From 8d438736eb1c92a5039cefac98948367ca8be77f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 23:29:39 +1000 Subject: [PATCH 14/32] dep: Upgrade transitive dependencies (#2154) * dep: Upgrade transitive dependencies * Simplify download.rs using io::Error::other Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix utils.rs in io::Error::other Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix typo in download.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Use io::Error::other in errors.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Use TempDir::keep instead of deprecated into_path in entry.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Use io::Error::other in gh_token.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fmt gh_token.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fmt utils.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Co-authored-by: github-actions Co-authored-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- Cargo.lock | 226 ++++++++------------- crates/bin/src/entry.rs | 4 +- crates/bin/src/gh_token.rs | 15 +- crates/binstalk-downloader/src/download.rs | 2 +- crates/binstalk-downloader/src/utils.rs | 5 +- crates/binstalk/src/errors.rs | 2 +- 6 files changed, 100 insertions(+), 154 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ad05050..0fcc2098 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -436,9 +436,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "block-buffer" @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.21" +version = "1.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0" +checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1" dependencies = [ "jobserver", "libc", @@ -673,9 +673,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" dependencies = [ "clap_builder", "clap_derive", @@ -693,9 +693,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" dependencies = [ "anstream", "anstyle", @@ -1056,9 +1056,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys 0.59.0", @@ -1268,15 +1268,16 @@ dependencies = [ [[package]] name = "generator" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" +checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827" dependencies = [ + "cc", "cfg-if", "libc", "log", "rustversion", - "windows 0.58.0", + "windows 0.61.1", ] [[package]] @@ -1304,9 +1305,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "js-sys", @@ -1477,7 +1478,7 @@ version = "0.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dc2c844c4cf141884678cabef736fd91dd73068b9146e6f004ba1a0457944b6" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "bstr", "gix-path", "libc", @@ -1630,7 +1631,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20972499c03473e773a2099e5fd0c695b9b72465837797a51a43391a1635a030" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "bstr", "gix-features 0.41.1", "gix-path", @@ -1690,7 +1691,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "855bece2d4153453aa5d0a80d51deea1ce8cd6a3b4cf213da85ac344ccb908a7" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "bstr", "filetime", "fnv", @@ -1729,7 +1730,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dad912acf5a68a7defa4836014337ff4381af8c3c098f41f818a8c524285e57b" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "gix-commitgraph", "gix-date", "gix-hash 0.17.0", @@ -1828,9 +1829,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.17" +version = "0.10.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091d2e887e02c3462f52252c5ea61150270c0f2657b642e8d0d6df56c16e642" +checksum = "567f65fec4ef10dfab97ae71f26a27fd4d7fe7b8e3f90c8a58551c41ff3fb65b" dependencies = [ "bstr", "gix-trace", @@ -1846,7 +1847,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fef8422c3c9066d649074b24025125963f85232bfad32d6d16aea9453b82ec14" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "bstr", "gix-attributes", "gix-config-value", @@ -1976,7 +1977,7 @@ version = "0.10.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47aeb0f13de9ef2f3033f5ff218de30f44db827ac9f1286f9ef050aacddd5888" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "gix-path", "libc", "windows-sys 0.52.0", @@ -2053,7 +2054,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36c0b049f8bdb61b20016694102f7b507f2e1727e83e9c5e6dad4f7d84ff7384" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "gix-commitgraph", "gix-date", "gix-hash 0.17.0", @@ -2270,7 +2271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" dependencies = [ "async-trait", - "bitflags 2.9.0", + "bitflags 2.9.1", "bytes", "cfg-if", "data-encoding", @@ -2679,7 +2680,7 @@ version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", "libc", ] @@ -2691,7 +2692,7 @@ checksum = "c14ffb4145759d1032337501fb73b427c754a5f37d89dfe281dd89f48048e6ef" dependencies = [ "cfg-if", "derive_destructure2", - "getrandom 0.3.2", + "getrandom 0.3.3", "libc", "scopeguard", "tokio", @@ -2773,7 +2774,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "libc", "redox_syscall 0.5.12", ] @@ -2844,6 +2845,12 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "lzma-rs" version = "0.3.0" @@ -3085,7 +3092,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "cfg-if", "libc", ] @@ -3186,7 +3193,7 @@ version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "cfg-if", "foreign-types", "libc", @@ -3275,9 +3282,9 @@ dependencies = [ [[package]] name = "owo-colors" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" +checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" [[package]] name = "parking_lot" @@ -3475,9 +3482,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012" +checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" dependencies = [ "bytes", "cfg_aliases", @@ -3496,12 +3503,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b" +checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" dependencies = [ "bytes", - "getrandom 0.3.2", + "getrandom 0.3.3", + "lru-slab", "rand 0.9.1", "ring", "rustc-hash", @@ -3584,7 +3592,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", ] [[package]] @@ -3638,7 +3646,7 @@ version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", ] [[package]] @@ -3767,9 +3775,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302" +checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" [[package]] name = "ring" @@ -3812,8 +3820,8 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.9.0", - "errno 0.3.11", + "bitflags 2.9.1", + "errno 0.3.12", "libc", "linux-raw-sys 0.4.15", "windows-sys 0.59.0", @@ -3825,8 +3833,8 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ - "bitflags 2.9.0", - "errno 0.3.11", + "bitflags 2.9.1", + "errno 0.3.12", "libc", "linux-raw-sys 0.9.4", "windows-sys 0.59.0", @@ -3880,9 +3888,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.2" +version = "0.103.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7149975849f1abb3832b246010ef62ccc80d3a76169517ada7188252b9cfb437" +checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" dependencies = [ "ring", "rustls-pki-types", @@ -3937,7 +3945,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -3950,7 +3958,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "core-foundation 0.10.0", "core-foundation-sys", "libc", @@ -4257,7 +4265,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -4296,12 +4304,12 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "tempfile" -version = "3.19.1" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ "fastrand", - "getrandom 0.3.2", + "getrandom 0.3.3", "once_cell", "rustix 1.0.7", "windows-sys 0.59.0", @@ -4761,7 +4769,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", ] [[package]] @@ -5019,16 +5027,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.61.1" @@ -5036,7 +5034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419" dependencies = [ "windows-collections", - "windows-core 0.61.0", + "windows-core", "windows-future", "windows-link", "windows-numerics", @@ -5048,54 +5046,31 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" dependencies = [ - "windows-core 0.61.0", + "windows-core", ] [[package]] name = "windows-core" -version = "0.58.0" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40" dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" -dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", + "windows-implement", + "windows-interface", "windows-link", - "windows-result 0.3.2", - "windows-strings 0.4.0", + "windows-result", + "windows-strings 0.4.1", ] [[package]] name = "windows-future" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ - "windows-core 0.61.0", + "windows-core", "windows-link", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-threading", ] [[package]] @@ -5109,17 +5084,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-interface" version = "0.59.1" @@ -5143,7 +5107,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ - "windows-core 0.61.0", + "windows-core", "windows-link", ] @@ -5153,39 +5117,20 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" dependencies = [ - "windows-result 0.3.2", + "windows-result", "windows-strings 0.3.1", "windows-targets 0.53.0", ] [[package]] name = "windows-result" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d" dependencies = [ "windows-link", ] -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-strings" version = "0.3.1" @@ -5197,9 +5142,9 @@ dependencies = [ [[package]] name = "windows-strings" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a" dependencies = [ "windows-link", ] @@ -5278,6 +5223,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -5460,7 +5414,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", ] [[package]] diff --git a/crates/bin/src/entry.rs b/crates/bin/src/entry.rs index 43feaa3a..9df479f4 100644 --- a/crates/bin/src/entry.rs +++ b/crates/bin/src/entry.rs @@ -527,7 +527,7 @@ fn do_install_fetches( if no_cleanup { // Consume temp_dir without removing it from fs. - let _ = temp_dir.into_path(); + let _ = temp_dir.keep(); } else { temp_dir.close().unwrap_or_else(|err| { warn!("Failed to clean up some resources: {err}"); @@ -577,7 +577,7 @@ fn do_install_fetches_continue_on_failure( if no_cleanup { // Consume temp_dir without removing it from fs. - let _ = temp_dir.into_path(); + let _ = temp_dir.keep(); } else { temp_dir.close().unwrap_or_else(|err| { warn!("Failed to clean up some resources: {err}"); diff --git a/crates/bin/src/gh_token.rs b/crates/bin/src/gh_token.rs index 9cc7adeb..28659f76 100644 --- a/crates/bin/src/gh_token.rs +++ b/crates/bin/src/gh_token.rs @@ -27,12 +27,7 @@ pub(super) async fn get() -> io::Result>> { .strip_prefix("password=") .map(|token| Zeroizing::new(token.into())) }) - .ok_or_else(|| { - io::Error::new( - io::ErrorKind::Other, - "Password not found in `git credential fill` output", - ) - }) + .ok_or_else(|| io::Error::other("Password not found in `git credential fill` output")) } trait CommandExt { @@ -86,10 +81,10 @@ impl CommandExt for Command { } else { zeroize_and_drop(stdout); - Err(io::Error::new( - io::ErrorKind::Other, - format!("`{:?}` process exited with `{status}`", self.as_std()), - )) + Err(io::Error::other(format!( + "`{:?}` process exited with `{status}`", + self.as_std() + ))) } } } diff --git a/crates/binstalk-downloader/src/download.rs b/crates/binstalk-downloader/src/download.rs index 78943730..53dd9f1e 100644 --- a/crates/binstalk-downloader/src/download.rs +++ b/crates/binstalk-downloader/src/download.rs @@ -53,7 +53,7 @@ impl From for io::Error { fn from(e: DownloadError) -> io::Error { match e { DownloadError::Io(io_error) => io_error, - e => io::Error::new(io::ErrorKind::Other, e), + e => io::Error::other(e), } } } diff --git a/crates/binstalk-downloader/src/utils.rs b/crates/binstalk-downloader/src/utils.rs index 65f38918..0fcb4f57 100644 --- a/crates/binstalk-downloader/src/utils.rs +++ b/crates/binstalk-downloader/src/utils.rs @@ -100,10 +100,7 @@ where async fn inner(handle: task::JoinHandle>) -> io::Result { match handle.await { Ok(res) => res, - Err(err) => Err(io::Error::new( - io::ErrorKind::Other, - format!("background task failed: {err}"), - )), + Err(err) => Err(io::Error::other(format!("background task failed: {err}"))), } } diff --git a/crates/binstalk/src/errors.rs b/crates/binstalk/src/errors.rs index 80686ef1..afbcfe55 100644 --- a/crates/binstalk/src/errors.rs +++ b/crates/binstalk/src/errors.rs @@ -539,7 +539,7 @@ impl From for io::Error { fn from(e: BinstallError) -> io::Error { match e { BinstallError::Io(io_error) => io_error, - e => io::Error::new(io::ErrorKind::Other, e), + e => io::Error::other(e), } } } From 205aaa5a4fc552ecdbfdbc0ef48c2d9b5cc52725 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 May 2025 01:14:11 +1000 Subject: [PATCH 15/32] chore: release (#2155) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- Cargo.lock | 16 ++++++++-------- crates/bin/Cargo.toml | 4 ++-- crates/binstalk-downloader/CHANGELOG.md | 6 ++++++ crates/binstalk-downloader/Cargo.toml | 2 +- crates/binstalk-fetchers/CHANGELOG.md | 6 ++++++ crates/binstalk-fetchers/Cargo.toml | 8 ++++---- crates/binstalk-git-repo-api/CHANGELOG.md | 6 ++++++ crates/binstalk-git-repo-api/Cargo.toml | 6 +++--- crates/binstalk-manifests/CHANGELOG.md | 6 ++++++ crates/binstalk-manifests/Cargo.toml | 4 ++-- crates/binstalk-registry/CHANGELOG.md | 6 ++++++ crates/binstalk-registry/Cargo.toml | 6 +++--- crates/binstalk/CHANGELOG.md | 6 ++++++ crates/binstalk/Cargo.toml | 12 ++++++------ crates/detect-targets/CHANGELOG.md | 6 ++++++ crates/detect-targets/Cargo.toml | 2 +- crates/detect-wasi/CHANGELOG.md | 6 ++++++ crates/detect-wasi/Cargo.toml | 2 +- 18 files changed, 79 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fcc2098..63549647 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,7 +231,7 @@ dependencies = [ [[package]] name = "binstalk" -version = "0.28.32" +version = "0.28.33" dependencies = [ "binstalk-bins", "binstalk-downloader", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "binstalk-downloader" -version = "0.13.17" +version = "0.13.18" dependencies = [ "async-compression", "async-trait", @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "binstalk-fetchers" -version = "0.10.18" +version = "0.10.19" dependencies = [ "async-trait", "binstalk-downloader", @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "binstalk-git-repo-api" -version = "0.5.19" +version = "0.5.20" dependencies = [ "binstalk-downloader", "compact_str", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "binstalk-manifests" -version = "0.15.29" +version = "0.15.30" dependencies = [ "beef", "binstalk-types", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "binstalk-registry" -version = "0.11.18" +version = "0.11.19" dependencies = [ "async-trait", "base16", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "detect-targets" -version = "0.1.48" +version = "0.1.49" dependencies = [ "cfg-if", "guess_host_triple", @@ -932,7 +932,7 @@ dependencies = [ [[package]] name = "detect-wasi" -version = "1.0.29" +version = "1.0.30" dependencies = [ "tempfile", ] diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index c3ccfd47..d783ddd8 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -23,8 +23,8 @@ pkg-fmt = "zip" [dependencies] atomic-file-install = { version = "1.0.11", path = "../atomic-file-install" } -binstalk = { path = "../binstalk", version = "0.28.32", default-features = false } -binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.29" } +binstalk = { path = "../binstalk", version = "0.28.33", default-features = false } +binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.30" } clap = { version = "4.5.3", features = ["derive", "env", "wrap_help"] } clap-cargo = "0.15.2" compact_str = "0.9.0" diff --git a/crates/binstalk-downloader/CHANGELOG.md b/crates/binstalk-downloader/CHANGELOG.md index 3dfaa698..3f58563a 100644 --- a/crates/binstalk-downloader/CHANGELOG.md +++ b/crates/binstalk-downloader/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.13.18](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-downloader-v0.13.17...binstalk-downloader-v0.13.18) - 2025-05-16 + +### Other + +- Upgrade transitive dependencies ([#2154](https://github.com/cargo-bins/cargo-binstall/pull/2154)) + ## [0.13.17](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-downloader-v0.13.16...binstalk-downloader-v0.13.17) - 2025-04-05 ### Other diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml index c89c539e..74597d1f 100644 --- a/crates/binstalk-downloader/Cargo.toml +++ b/crates/binstalk-downloader/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-downloader" description = "The binstall toolkit for downloading and extracting file" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-downloader" -version = "0.13.17" +version = "0.13.18" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/binstalk-fetchers/CHANGELOG.md b/crates/binstalk-fetchers/CHANGELOG.md index 5158130e..31d4fd23 100644 --- a/crates/binstalk-fetchers/CHANGELOG.md +++ b/crates/binstalk-fetchers/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.10.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-fetchers-v0.10.18...binstalk-fetchers-v0.10.19) - 2025-05-16 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader, binstalk-git-repo-api + ## [0.10.18](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-fetchers-v0.10.17...binstalk-fetchers-v0.10.18) - 2025-04-05 ### Other diff --git a/crates/binstalk-fetchers/Cargo.toml b/crates/binstalk-fetchers/Cargo.toml index 4d525049..0852ef0b 100644 --- a/crates/binstalk-fetchers/Cargo.toml +++ b/crates/binstalk-fetchers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-fetchers" -version = "0.10.18" +version = "0.10.19" edition = "2021" description = "The binstall fetchers" @@ -12,8 +12,8 @@ license = "GPL-3.0-only" [dependencies] async-trait = "0.1.88" -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader", default-features = false } -binstalk-git-repo-api = { version = "0.5.19", path = "../binstalk-git-repo-api" } +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false } +binstalk-git-repo-api = { version = "0.5.20", path = "../binstalk-git-repo-api" } binstalk-types = { version = "0.9.4", path = "../binstalk-types" } bytes = "1.4.0" compact_str = { version = "0.9.0" } @@ -34,7 +34,7 @@ tracing = "0.1.39" url = "2.5.4" [dev-dependencies] -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader" } +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader" } [features] quickinstall = [] diff --git a/crates/binstalk-git-repo-api/CHANGELOG.md b/crates/binstalk-git-repo-api/CHANGELOG.md index 1d6ac3c8..737d062c 100644 --- a/crates/binstalk-git-repo-api/CHANGELOG.md +++ b/crates/binstalk-git-repo-api/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.5.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-git-repo-api-v0.5.19...binstalk-git-repo-api-v0.5.20) - 2025-05-16 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader + ## [0.5.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-git-repo-api-v0.5.18...binstalk-git-repo-api-v0.5.19) - 2025-04-05 ### Other diff --git a/crates/binstalk-git-repo-api/Cargo.toml b/crates/binstalk-git-repo-api/Cargo.toml index 1ce83fb4..d50d7b83 100644 --- a/crates/binstalk-git-repo-api/Cargo.toml +++ b/crates/binstalk-git-repo-api/Cargo.toml @@ -3,14 +3,14 @@ name = "binstalk-git-repo-api" description = "The binstall toolkit for accessing API for git repository" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-git-repo-api" -version = "0.5.19" +version = "0.5.20" rust-version = "1.70.0" authors = ["Jiahao XU "] edition = "2021" license = "Apache-2.0 OR MIT" [dependencies] -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false, features = [ "json", ] } compact_str = "0.9.0" @@ -25,6 +25,6 @@ url = "2.5.4" zeroize = "1.8.1" [dev-dependencies] -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader" } +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader" } tracing-subscriber = "0.3" once_cell = "1" diff --git a/crates/binstalk-manifests/CHANGELOG.md b/crates/binstalk-manifests/CHANGELOG.md index 8f9ee547..e5976edf 100644 --- a/crates/binstalk-manifests/CHANGELOG.md +++ b/crates/binstalk-manifests/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.15.30](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.29...binstalk-manifests-v0.15.30) - 2025-05-16 + +### Other + +- updated the following local packages: detect-targets + ## [0.15.29](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.28...binstalk-manifests-v0.15.29) - 2025-05-07 ### Other diff --git a/crates/binstalk-manifests/Cargo.toml b/crates/binstalk-manifests/Cargo.toml index 9c8f11c3..a0a858f9 100644 --- a/crates/binstalk-manifests/Cargo.toml +++ b/crates/binstalk-manifests/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-manifests" description = "The binstall toolkit for manipulating with manifest" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-manifests" -version = "0.15.29" +version = "0.15.30" rust-version = "1.61.0" authors = ["ryan "] edition = "2021" @@ -25,5 +25,5 @@ toml_edit = { version = "0.22.12", features = ["serde"] } url = { version = "2.5.4", features = ["serde"] } [dev-dependencies] -detect-targets = { version = "0.1.48", path = "../detect-targets" } +detect-targets = { version = "0.1.49", path = "../detect-targets" } tempfile = "3.5.0" diff --git a/crates/binstalk-registry/CHANGELOG.md b/crates/binstalk-registry/CHANGELOG.md index e1f6edfc..439cf2c0 100644 --- a/crates/binstalk-registry/CHANGELOG.md +++ b/crates/binstalk-registry/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.11.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-registry-v0.11.18...binstalk-registry-v0.11.19) - 2025-05-16 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader + ## [0.11.18](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-registry-v0.11.17...binstalk-registry-v0.11.18) - 2025-04-05 ### Other diff --git a/crates/binstalk-registry/Cargo.toml b/crates/binstalk-registry/Cargo.toml index 4c6b879d..4e3581f4 100644 --- a/crates/binstalk-registry/Cargo.toml +++ b/crates/binstalk-registry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-registry" -version = "0.11.18" +version = "0.11.19" edition = "2021" rust-version = "1.65.0" @@ -13,7 +13,7 @@ license = "Apache-2.0 OR MIT" [dependencies] async-trait = "0.1.88" base16 = "0.2.1" -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false, features = [ "json", ] } binstalk-types = { version = "0.9.4", path = "../binstalk-types" } @@ -40,7 +40,7 @@ url = "2.5.4" [dev-dependencies] tokio = { version = "1", features = ["rt-multi-thread", "macros"] } toml_edit = { version = "0.22.12", features = ["serde"] } -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false, features = [ "rustls", ] } diff --git a/crates/binstalk/CHANGELOG.md b/crates/binstalk/CHANGELOG.md index a4adc296..4d6f2e01 100644 --- a/crates/binstalk/CHANGELOG.md +++ b/crates/binstalk/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.28.33](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.32...binstalk-v0.28.33) - 2025-05-16 + +### Other + +- Upgrade transitive dependencies ([#2154](https://github.com/cargo-bins/cargo-binstall/pull/2154)) + ## [0.28.32](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.31...binstalk-v0.28.32) - 2025-05-07 ### Other diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 2756ca4d..4bfe0a2b 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk" description = "The binstall toolkit (library interface)" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk" -version = "0.28.32" +version = "0.28.33" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" @@ -11,17 +11,17 @@ license = "GPL-3.0-only" [dependencies] binstalk-bins = { version = "0.6.13", path = "../binstalk-bins" } -binstalk-downloader = { version = "0.13.17", path = "../binstalk-downloader", default-features = false } -binstalk-git-repo-api = { version = "0.5.19", path = "../binstalk-git-repo-api" } -binstalk-fetchers = { version = "0.10.18", path = "../binstalk-fetchers", features = [ +binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false } +binstalk-git-repo-api = { version = "0.5.20", path = "../binstalk-git-repo-api" } +binstalk-fetchers = { version = "0.10.19", path = "../binstalk-fetchers", features = [ "quickinstall", ] } -binstalk-registry = { version = "0.11.18", path = "../binstalk-registry" } +binstalk-registry = { version = "0.11.19", path = "../binstalk-registry" } binstalk-types = { version = "0.9.4", path = "../binstalk-types" } cargo-toml-workspace = { version = "7.0.6", path = "../cargo-toml-workspace" } command-group = { version = "5.0.1", features = ["with-tokio"] } compact_str = { version = "0.9.0", features = ["serde"] } -detect-targets = { version = "0.1.48", path = "../detect-targets", features = [ +detect-targets = { version = "0.1.49", path = "../detect-targets", features = [ "tracing", ] } either = "1.11.0" diff --git a/crates/detect-targets/CHANGELOG.md b/crates/detect-targets/CHANGELOG.md index c26592e7..5f3cc48d 100644 --- a/crates/detect-targets/CHANGELOG.md +++ b/crates/detect-targets/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.49](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.48...detect-targets-v0.1.49) - 2025-05-16 + +### Other + +- update Cargo.lock dependencies + ## [0.1.48](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.47...detect-targets-v0.1.48) - 2025-05-07 ### Other diff --git a/crates/detect-targets/Cargo.toml b/crates/detect-targets/Cargo.toml index 22210fa6..269a05c0 100644 --- a/crates/detect-targets/Cargo.toml +++ b/crates/detect-targets/Cargo.toml @@ -3,7 +3,7 @@ name = "detect-targets" description = "Detect the target of the env at runtime" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/detect-targets" -version = "0.1.48" +version = "0.1.49" rust-version = "1.62.0" authors = ["Jiahao XU "] edition = "2021" diff --git a/crates/detect-wasi/CHANGELOG.md b/crates/detect-wasi/CHANGELOG.md index a2203393..2a4dc9b9 100644 --- a/crates/detect-wasi/CHANGELOG.md +++ b/crates/detect-wasi/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.30](https://github.com/cargo-bins/cargo-binstall/compare/detect-wasi-v1.0.29...detect-wasi-v1.0.30) - 2025-05-16 + +### Other + +- update Cargo.lock dependencies + ## [1.0.29](https://github.com/cargo-bins/cargo-binstall/compare/detect-wasi-v1.0.28...detect-wasi-v1.0.29) - 2025-05-07 ### Other diff --git a/crates/detect-wasi/Cargo.toml b/crates/detect-wasi/Cargo.toml index f1d63ede..88ed8eaf 100644 --- a/crates/detect-wasi/Cargo.toml +++ b/crates/detect-wasi/Cargo.toml @@ -3,7 +3,7 @@ name = "detect-wasi" description = "Detect if WASI can be run" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/detect-wasi" -version = "1.0.29" +version = "1.0.30" rust-version = "1.61.0" authors = ["Félix Saparelli "] edition = "2021" From 5cbf019d8cb9b9d5b086218c41458ea35d817691 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 15:46:21 +0000 Subject: [PATCH 16/32] release: cargo-binstall v1.12.5 (#2156) chore: Release Co-authored-by: github-actions --- Cargo.lock | 2 +- crates/bin/Cargo.toml | 2 +- crates/bin/windows.manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 63549647..dd85f3c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "cargo-binstall" -version = "1.12.4" +version = "1.12.5" dependencies = [ "atomic-file-install", "binstalk", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index d783ddd8..c03d6d52 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-binstall" description = "Binary installation for rust projects" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/cargo-binstall" -version = "1.12.4" +version = "1.12.5" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/bin/windows.manifest b/crates/bin/windows.manifest index dd5feb67..dccfa6c8 100644 --- a/crates/bin/windows.manifest +++ b/crates/bin/windows.manifest @@ -3,7 +3,7 @@ From 3b64237893f03d6cce15ff4c5163026b681d5f9e Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sun, 18 May 2025 13:08:47 +1000 Subject: [PATCH 17/32] Add --retry 10 to curl call in install-from-binstall-release.sh (#2158) * Add --retry 10 to curl call in install-from-binstall-release.sh Fix #2157 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix install-from-binstall-release.sh Use do_curl() instead of function do_curl as the latter is non standard Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- install-from-binstall-release.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/install-from-binstall-release.sh b/install-from-binstall-release.sh index 83f6ca8d..b228b9d3 100755 --- a/install-from-binstall-release.sh +++ b/install-from-binstall-release.sh @@ -2,6 +2,10 @@ set -eux +do_curl() { + curl --retry 10 -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L --proto '=https' --tlsv1.2 -sSf "$@" +} + # Set pipefail if it works in a subshell, disregard if unsupported # shellcheck disable=SC3040 (set -o pipefail 2> /dev/null) && set -o pipefail @@ -26,7 +30,7 @@ fi os="$(uname -s)" if [ "$os" = "Darwin" ]; then url="${base_url}universal-apple-darwin.zip" - curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -LO --proto '=https' --tlsv1.2 -sSf "$url" + do_curl -O "$url" unzip cargo-binstall-universal-apple-darwin.zip elif [ "$os" = "Linux" ]; then machine="$(uname -m)" @@ -39,12 +43,12 @@ elif [ "$os" = "Linux" ]; then fi url="${base_url}${target}.tgz" - curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L --proto '=https' --tlsv1.2 -sSf "$url" | tar -xvzf - + do_curl "$url" | tar -xvzf - elif [ "${OS-}" = "Windows_NT" ]; then machine="$(uname -m)" target="${machine}-pc-windows-msvc" url="${base_url}${target}.zip" - curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -LO --proto '=https' --tlsv1.2 -sSf "$url" + do_curl -O "$url" unzip "cargo-binstall-${target}.zip" else echo "Unsupported OS ${os}" From 3cdba561a313217b22dc79ae30fdccfe1620ed30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar=20Rubio?= Date: Sun, 18 May 2025 16:10:26 +0200 Subject: [PATCH 18/32] Safer GH action execution for sh shells (#2159) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Safer GH action execution for sh shells Signed-off-by: Álvaro Mondéjar Rubio * Remove o and pipefail Signed-off-by: Álvaro Mondéjar Rubio * Use sh instead of bash Signed-off-by: Álvaro Mondéjar Rubio * Revert change Signed-off-by: Álvaro Mondéjar Rubio * Fix error Signed-off-by: Álvaro Mondéjar Rubio --------- Signed-off-by: Álvaro Mondéjar Rubio --- action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 3c3b1663..8fd7804a 100644 --- a/action.yml +++ b/action.yml @@ -7,7 +7,9 @@ runs: - name: Install cargo-binstall if: runner.os != 'Windows' shell: sh - run: curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash + run: | + set -eu + (curl --retry 10 -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh || echo 'exit 1') | bash - name: Install cargo-binstall if: runner.os == 'Windows' run: Set-ExecutionPolicy Unrestricted -Scope Process; iex (iwr "https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.ps1").Content From 268643a6b5ea099f5718ee5cd3ff7dc89a5eb49b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 23 May 2025 10:19:12 +0000 Subject: [PATCH 19/32] dep: Upgrade transitive dependencies (#2163) Co-authored-by: github-actions --- Cargo.lock | 64 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd85f3c3..3a217bdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,12 +106,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa" dependencies = [ "anstyle", - "once_cell", + "once_cell_polyfill", "windows-sys 0.59.0", ] @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.22" +version = "1.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1" +checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" dependencies = [ "jobserver", "libc", @@ -2443,9 +2443,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" +checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710" dependencies = [ "bytes", "futures-channel", @@ -2510,9 +2510,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", @@ -2526,9 +2526,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" @@ -2635,9 +2635,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806" +checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2650,9 +2650,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48" +checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" dependencies = [ "proc-macro2", "quote", @@ -2969,9 +2969,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minisign-verify" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3" +checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43" [[package]] name = "miniz_oxide" @@ -3187,6 +3187,12 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + [[package]] name = "openssl" version = "0.10.72" @@ -3899,9 +3905,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "ryu" @@ -4765,11 +4771,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" dependencies = [ "getrandom 0.3.3", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -5051,15 +5059,15 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.61.1" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", "windows-link", "windows-result", - "windows-strings 0.4.1", + "windows-strings 0.4.2", ] [[package]] @@ -5124,9 +5132,9 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ "windows-link", ] @@ -5142,9 +5150,9 @@ dependencies = [ [[package]] name = "windows-strings" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ "windows-link", ] From a333bb922d0eb05fd7e8c27debcd40401fc97a62 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Thu, 29 May 2025 00:59:21 +1000 Subject: [PATCH 20/32] deps: Upgrade reqwest to 0.12.17 (#2168) * Upgrade reqwest to 0.12.18 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Enable bbr and early data for http3 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * fix dep reqwest 0.12.18 does not exist use reqwest 0.12.17 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix builder Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix setting tls early data Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Add reqwest_unstable as checked-cfg Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- crates/binstalk-downloader/Cargo.toml | 5 ++++- crates/binstalk-downloader/src/remote.rs | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml index 74597d1f..842579d3 100644 --- a/crates/binstalk-downloader/Cargo.toml +++ b/crates/binstalk-downloader/Cargo.toml @@ -36,7 +36,7 @@ rc-zip-sync = { version = "4.2.6", features = [ "lzma", "zstd", ] } -reqwest = { version = "0.12.5", features = [ +reqwest = { version = "0.12.17", features = [ "http2", "stream", "zstd", @@ -136,3 +136,6 @@ ipconfig = { version = "0.3.2", optional = true, default-features = false } [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(reqwest_unstable)'] } diff --git a/crates/binstalk-downloader/src/remote.rs b/crates/binstalk-downloader/src/remote.rs index 1ab1391c..7ef3d56e 100644 --- a/crates/binstalk-downloader/src/remote.rs +++ b/crates/binstalk-downloader/src/remote.rs @@ -144,6 +144,11 @@ impl Client { } } + #[cfg(all(reqwest_unstable, feature = "http3"))] + { + builder = builder.http3_congestion_bbr().tls_early_data(true); + } + builder } From a42083c1460fd215dbe1e3a5a905ab5a4f0555c6 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sat, 31 May 2025 01:41:30 +1000 Subject: [PATCH 21/32] fix ci: temporarily disable bitbucket testing as bitbucket is down (#2171) * fix ci: temporarily disable bitbucket testing as bitbucket is down fix ci Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix other-repos.sh Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix other-repos.sh (#2172) Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- e2e-tests/other-repos.sh | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/e2e-tests/other-repos.sh b/e2e-tests/other-repos.sh index 917a21aa..d492d126 100755 --- a/e2e-tests/other-repos.sh +++ b/e2e-tests/other-repos.sh @@ -16,21 +16,22 @@ export PATH="$CARGO_HOME/bin:$PATH" # --disable-strategies compile \ # cargo-binstall -# Test default BitBucket pkg-url templates -"./$1" binstall \ - --force \ - --manifest-path "manifests/bitbucket-test-Cargo.toml" \ - --no-confirm \ - --disable-strategies compile \ - cargo-binstall - -# Test that the installed binaries can be run -cargo binstall --help >/dev/null - -cargo_binstall_version="$(cargo binstall -V)" -echo "$cargo_binstall_version" - -[ "$cargo_binstall_version" = "cargo-binstall 0.12.0" ] +# temporarily disable bitbucket testing as bitbucket is down +## Test default BitBucket pkg-url templates +#"./$1" binstall \ +# --force \ +# --manifest-path "manifests/bitbucket-test-Cargo.toml" \ +# --no-confirm \ +# --disable-strategies compile \ +# cargo-binstall +# +## Test that the installed binaries can be run +#cargo binstall --help >/dev/null +# +#cargo_binstall_version="$(cargo binstall -V)" +#echo "$cargo_binstall_version" +# +#[ "$cargo_binstall_version" = "cargo-binstall 0.12.0" ] # Test default Github pkg-url templates, # with bin-dir provided From 8c0e1b27a3070678ea853afc6eb17f30b55e685f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 15:49:06 +0000 Subject: [PATCH 22/32] build(deps): bump tj-actions/changed-files from 6f67ee9ac810f0192ea7b3d2086406f97847bcf9 to 050a3d3360d29711ee9d8210fc639d902d23ad07 (#2169) build(deps): bump tj-actions/changed-files Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 6f67ee9ac810f0192ea7b3d2086406f97847bcf9 to 050a3d3360d29711ee9d8210fc639d902d23ad07. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/6f67ee9ac810f0192ea7b3d2086406f97847bcf9...050a3d3360d29711ee9d8210fc639d902d23ad07) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-version: 050a3d3360d29711ee9d8210fc639d902d23ad07 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ac95670..54d20a40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@6f67ee9ac810f0192ea7b3d2086406f97847bcf9 + uses: tj-actions/changed-files@050a3d3360d29711ee9d8210fc639d902d23ad07 with: dir_names: true dir_names_exclude_current_dir: true From 12373e5c3ffa64e705bc1b71cd1a55f1fb20a830 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 16:12:05 +0000 Subject: [PATCH 23/32] dep: Upgrade transitive dependencies (#2173) Co-authored-by: github-actions --- Cargo.lock | 175 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 108 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a217bdd..2935360d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.23" +version = "1.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" dependencies = [ "jobserver", "libc", @@ -673,9 +673,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.38" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" dependencies = [ "clap_builder", "clap_derive", @@ -693,9 +693,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.38" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" dependencies = [ "anstream", "anstyle", @@ -782,9 +782,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -1004,16 +1004,16 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "embed-resource" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbc6e0d8e0c03a655b53ca813f0463d2c956bc4db8138dbc89f120b066551e3" +checksum = "e8fe7d068ca6b3a5782ca5ec9afc244acd99dd441e4686a83b1c3973aba1d489" dependencies = [ "cc", "memchr", "rustc_version", "toml", "vswhom", - "winreg 0.52.0", + "winreg 0.55.0", ] [[package]] @@ -2209,6 +2209,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "h3" +version = "0.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10872b55cfb02a821b69dc7cf8dc6a71d6af25eb9a79662bec4a9d016056b3be" +dependencies = [ + "bytes", + "fastrand", + "futures-util", + "http", + "pin-project-lite", + "tokio", +] + [[package]] name = "h3-quinn" version = "0.0.9" @@ -2217,7 +2231,21 @@ checksum = "6d482318ae94198fc8e3cbb0b7ba3099c865d744e6ec7c62039ca7b6b6c66fbf" dependencies = [ "bytes", "futures", - "h3", + "h3 0.0.7", + "quinn", + "tokio", + "tokio-util", +] + +[[package]] +name = "h3-quinn" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2e732c8d91a74731663ac8479ab505042fbf547b9a207213ab7fbcbfc4f8b4" +dependencies = [ + "bytes", + "futures", + "h3 0.0.8", "quinn", "tokio", "tokio-util", @@ -2280,8 +2308,8 @@ dependencies = [ "futures-io", "futures-util", "h2", - "h3", - "h3-quinn", + "h3 0.0.7", + "h3-quinn 0.0.9", "http", "idna", "ipnet", @@ -2408,11 +2436,10 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.5" +version = "0.27.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d" dependencies = [ - "futures-util", "http", "hyper", "hyper-util", @@ -2422,7 +2449,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.11", + "webpki-roots", ] [[package]] @@ -2443,22 +2470,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710" +checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" dependencies = [ + "base64", "bytes", "futures-channel", + "futures-core", "futures-util", "http", "http-body", "hyper", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", "socket2", + "system-configuration 0.6.1", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -2606,6 +2639,16 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "is_ci" version = "1.2.0" @@ -2818,9 +2861,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", @@ -2993,13 +3036,13 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3195,9 +3238,9 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "openssl" -version = "0.10.72" +version = "0.10.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" dependencies = [ "bitflags 2.9.1", "cfg-if", @@ -3236,9 +3279,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.108" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" dependencies = [ "cc", "libc", @@ -3294,9 +3337,9 @@ checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", "parking_lot_core", @@ -3304,9 +3347,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", @@ -3724,9 +3767,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.15" +version = "0.12.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" +checksum = "e98ff6b0dbbe4d5a37318f433d4fc82babd21631f194d370409ceb2e40b2f0b5" dependencies = [ "async-compression", "base64", @@ -3736,8 +3779,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "h3", - "h3-quinn", + "h3 0.0.8", + "h3-quinn 0.0.10", "http", "http-body", "http-body-util", @@ -3756,27 +3799,25 @@ dependencies = [ "quinn", "rustls", "rustls-native-certs", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "slab", "sync_wrapper", - "system-configuration 0.6.1", "tokio", "tokio-native-tls", "tokio-rustls", "tokio-util", "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.11", - "windows-registry", + "webpki-roots", ] [[package]] @@ -3873,15 +3914,6 @@ dependencies = [ "security-framework 3.2.0", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" version = "1.12.0" @@ -3965,7 +3997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -4151,9 +4183,9 @@ checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "socket2" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4451,9 +4483,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.0" +version = "1.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" dependencies = [ "backtrace", "bytes", @@ -4592,6 +4624,24 @@ dependencies = [ "tower-service", ] +[[package]] +name = "tower-http" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e" +dependencies = [ + "bitflags 2.9.1", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -4971,15 +5021,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.26.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" -dependencies = [ - "webpki-roots 1.0.0", -] - [[package]] name = "webpki-roots" version = "1.0.0" @@ -5408,12 +5449,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.52.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] From 0aa114bfe0531af066c2cc211293fc596c919f2b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 31 May 2025 03:49:59 +0000 Subject: [PATCH 24/32] chore: release (#2164) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- Cargo.lock | 14 +++++++------- crates/bin/Cargo.toml | 4 ++-- crates/binstalk-downloader/CHANGELOG.md | 6 ++++++ crates/binstalk-downloader/Cargo.toml | 2 +- crates/binstalk-fetchers/CHANGELOG.md | 6 ++++++ crates/binstalk-fetchers/Cargo.toml | 8 ++++---- crates/binstalk-git-repo-api/CHANGELOG.md | 6 ++++++ crates/binstalk-git-repo-api/Cargo.toml | 6 +++--- crates/binstalk-manifests/CHANGELOG.md | 6 ++++++ crates/binstalk-manifests/Cargo.toml | 4 ++-- crates/binstalk-registry/CHANGELOG.md | 6 ++++++ crates/binstalk-registry/Cargo.toml | 6 +++--- crates/binstalk/CHANGELOG.md | 6 ++++++ crates/binstalk/Cargo.toml | 12 ++++++------ crates/detect-targets/CHANGELOG.md | 6 ++++++ crates/detect-targets/Cargo.toml | 2 +- 16 files changed, 71 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2935360d..4f40db7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,7 +231,7 @@ dependencies = [ [[package]] name = "binstalk" -version = "0.28.33" +version = "0.28.34" dependencies = [ "binstalk-bins", "binstalk-downloader", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "binstalk-downloader" -version = "0.13.18" +version = "0.13.19" dependencies = [ "async-compression", "async-trait", @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "binstalk-fetchers" -version = "0.10.19" +version = "0.10.20" dependencies = [ "async-trait", "binstalk-downloader", @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "binstalk-git-repo-api" -version = "0.5.20" +version = "0.5.21" dependencies = [ "binstalk-downloader", "compact_str", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "binstalk-manifests" -version = "0.15.30" +version = "0.15.31" dependencies = [ "beef", "binstalk-types", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "binstalk-registry" -version = "0.11.19" +version = "0.11.20" dependencies = [ "async-trait", "base16", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "detect-targets" -version = "0.1.49" +version = "0.1.50" dependencies = [ "cfg-if", "guess_host_triple", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index c03d6d52..bac659d6 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -23,8 +23,8 @@ pkg-fmt = "zip" [dependencies] atomic-file-install = { version = "1.0.11", path = "../atomic-file-install" } -binstalk = { path = "../binstalk", version = "0.28.33", default-features = false } -binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.30" } +binstalk = { path = "../binstalk", version = "0.28.34", default-features = false } +binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.31" } clap = { version = "4.5.3", features = ["derive", "env", "wrap_help"] } clap-cargo = "0.15.2" compact_str = "0.9.0" diff --git a/crates/binstalk-downloader/CHANGELOG.md b/crates/binstalk-downloader/CHANGELOG.md index 3f58563a..678671e7 100644 --- a/crates/binstalk-downloader/CHANGELOG.md +++ b/crates/binstalk-downloader/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.13.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-downloader-v0.13.18...binstalk-downloader-v0.13.19) - 2025-05-30 + +### Other + +- Upgrade reqwest to 0.12.17 ([#2168](https://github.com/cargo-bins/cargo-binstall/pull/2168)) + ## [0.13.18](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-downloader-v0.13.17...binstalk-downloader-v0.13.18) - 2025-05-16 ### Other diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml index 842579d3..1336845c 100644 --- a/crates/binstalk-downloader/Cargo.toml +++ b/crates/binstalk-downloader/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-downloader" description = "The binstall toolkit for downloading and extracting file" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-downloader" -version = "0.13.18" +version = "0.13.19" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/binstalk-fetchers/CHANGELOG.md b/crates/binstalk-fetchers/CHANGELOG.md index 31d4fd23..121dea53 100644 --- a/crates/binstalk-fetchers/CHANGELOG.md +++ b/crates/binstalk-fetchers/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.10.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-fetchers-v0.10.19...binstalk-fetchers-v0.10.20) - 2025-05-30 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader, binstalk-git-repo-api + ## [0.10.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-fetchers-v0.10.18...binstalk-fetchers-v0.10.19) - 2025-05-16 ### Other diff --git a/crates/binstalk-fetchers/Cargo.toml b/crates/binstalk-fetchers/Cargo.toml index 0852ef0b..b1a1d77a 100644 --- a/crates/binstalk-fetchers/Cargo.toml +++ b/crates/binstalk-fetchers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-fetchers" -version = "0.10.19" +version = "0.10.20" edition = "2021" description = "The binstall fetchers" @@ -12,8 +12,8 @@ license = "GPL-3.0-only" [dependencies] async-trait = "0.1.88" -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false } -binstalk-git-repo-api = { version = "0.5.20", path = "../binstalk-git-repo-api" } +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false } +binstalk-git-repo-api = { version = "0.5.21", path = "../binstalk-git-repo-api" } binstalk-types = { version = "0.9.4", path = "../binstalk-types" } bytes = "1.4.0" compact_str = { version = "0.9.0" } @@ -34,7 +34,7 @@ tracing = "0.1.39" url = "2.5.4" [dev-dependencies] -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader" } +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader" } [features] quickinstall = [] diff --git a/crates/binstalk-git-repo-api/CHANGELOG.md b/crates/binstalk-git-repo-api/CHANGELOG.md index 737d062c..b70875c4 100644 --- a/crates/binstalk-git-repo-api/CHANGELOG.md +++ b/crates/binstalk-git-repo-api/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.5.21](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-git-repo-api-v0.5.20...binstalk-git-repo-api-v0.5.21) - 2025-05-30 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader + ## [0.5.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-git-repo-api-v0.5.19...binstalk-git-repo-api-v0.5.20) - 2025-05-16 ### Other diff --git a/crates/binstalk-git-repo-api/Cargo.toml b/crates/binstalk-git-repo-api/Cargo.toml index d50d7b83..9f116210 100644 --- a/crates/binstalk-git-repo-api/Cargo.toml +++ b/crates/binstalk-git-repo-api/Cargo.toml @@ -3,14 +3,14 @@ name = "binstalk-git-repo-api" description = "The binstall toolkit for accessing API for git repository" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-git-repo-api" -version = "0.5.20" +version = "0.5.21" rust-version = "1.70.0" authors = ["Jiahao XU "] edition = "2021" license = "Apache-2.0 OR MIT" [dependencies] -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false, features = [ "json", ] } compact_str = "0.9.0" @@ -25,6 +25,6 @@ url = "2.5.4" zeroize = "1.8.1" [dev-dependencies] -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader" } +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader" } tracing-subscriber = "0.3" once_cell = "1" diff --git a/crates/binstalk-manifests/CHANGELOG.md b/crates/binstalk-manifests/CHANGELOG.md index e5976edf..fbe665b3 100644 --- a/crates/binstalk-manifests/CHANGELOG.md +++ b/crates/binstalk-manifests/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.15.31](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.30...binstalk-manifests-v0.15.31) - 2025-05-30 + +### Other + +- updated the following local packages: detect-targets + ## [0.15.30](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.29...binstalk-manifests-v0.15.30) - 2025-05-16 ### Other diff --git a/crates/binstalk-manifests/Cargo.toml b/crates/binstalk-manifests/Cargo.toml index a0a858f9..462e3f83 100644 --- a/crates/binstalk-manifests/Cargo.toml +++ b/crates/binstalk-manifests/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-manifests" description = "The binstall toolkit for manipulating with manifest" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-manifests" -version = "0.15.30" +version = "0.15.31" rust-version = "1.61.0" authors = ["ryan "] edition = "2021" @@ -25,5 +25,5 @@ toml_edit = { version = "0.22.12", features = ["serde"] } url = { version = "2.5.4", features = ["serde"] } [dev-dependencies] -detect-targets = { version = "0.1.49", path = "../detect-targets" } +detect-targets = { version = "0.1.50", path = "../detect-targets" } tempfile = "3.5.0" diff --git a/crates/binstalk-registry/CHANGELOG.md b/crates/binstalk-registry/CHANGELOG.md index 439cf2c0..24b1ed27 100644 --- a/crates/binstalk-registry/CHANGELOG.md +++ b/crates/binstalk-registry/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.11.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-registry-v0.11.19...binstalk-registry-v0.11.20) - 2025-05-30 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader + ## [0.11.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-registry-v0.11.18...binstalk-registry-v0.11.19) - 2025-05-16 ### Other diff --git a/crates/binstalk-registry/Cargo.toml b/crates/binstalk-registry/Cargo.toml index 4e3581f4..f9829793 100644 --- a/crates/binstalk-registry/Cargo.toml +++ b/crates/binstalk-registry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-registry" -version = "0.11.19" +version = "0.11.20" edition = "2021" rust-version = "1.65.0" @@ -13,7 +13,7 @@ license = "Apache-2.0 OR MIT" [dependencies] async-trait = "0.1.88" base16 = "0.2.1" -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false, features = [ "json", ] } binstalk-types = { version = "0.9.4", path = "../binstalk-types" } @@ -40,7 +40,7 @@ url = "2.5.4" [dev-dependencies] tokio = { version = "1", features = ["rt-multi-thread", "macros"] } toml_edit = { version = "0.22.12", features = ["serde"] } -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false, features = [ "rustls", ] } diff --git a/crates/binstalk/CHANGELOG.md b/crates/binstalk/CHANGELOG.md index 4d6f2e01..39de5958 100644 --- a/crates/binstalk/CHANGELOG.md +++ b/crates/binstalk/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.28.34](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.33...binstalk-v0.28.34) - 2025-05-30 + +### Other + +- updated the following local packages: binstalk-downloader, detect-targets, binstalk-git-repo-api, binstalk-fetchers, binstalk-registry + ## [0.28.33](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.32...binstalk-v0.28.33) - 2025-05-16 ### Other diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 4bfe0a2b..434c96d0 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk" description = "The binstall toolkit (library interface)" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk" -version = "0.28.33" +version = "0.28.34" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" @@ -11,17 +11,17 @@ license = "GPL-3.0-only" [dependencies] binstalk-bins = { version = "0.6.13", path = "../binstalk-bins" } -binstalk-downloader = { version = "0.13.18", path = "../binstalk-downloader", default-features = false } -binstalk-git-repo-api = { version = "0.5.20", path = "../binstalk-git-repo-api" } -binstalk-fetchers = { version = "0.10.19", path = "../binstalk-fetchers", features = [ +binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false } +binstalk-git-repo-api = { version = "0.5.21", path = "../binstalk-git-repo-api" } +binstalk-fetchers = { version = "0.10.20", path = "../binstalk-fetchers", features = [ "quickinstall", ] } -binstalk-registry = { version = "0.11.19", path = "../binstalk-registry" } +binstalk-registry = { version = "0.11.20", path = "../binstalk-registry" } binstalk-types = { version = "0.9.4", path = "../binstalk-types" } cargo-toml-workspace = { version = "7.0.6", path = "../cargo-toml-workspace" } command-group = { version = "5.0.1", features = ["with-tokio"] } compact_str = { version = "0.9.0", features = ["serde"] } -detect-targets = { version = "0.1.49", path = "../detect-targets", features = [ +detect-targets = { version = "0.1.50", path = "../detect-targets", features = [ "tracing", ] } either = "1.11.0" diff --git a/crates/detect-targets/CHANGELOG.md b/crates/detect-targets/CHANGELOG.md index 5f3cc48d..1388b52f 100644 --- a/crates/detect-targets/CHANGELOG.md +++ b/crates/detect-targets/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.50](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.49...detect-targets-v0.1.50) - 2025-05-30 + +### Other + +- update Cargo.lock dependencies + ## [0.1.49](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.48...detect-targets-v0.1.49) - 2025-05-16 ### Other diff --git a/crates/detect-targets/Cargo.toml b/crates/detect-targets/Cargo.toml index 269a05c0..7ae781ed 100644 --- a/crates/detect-targets/Cargo.toml +++ b/crates/detect-targets/Cargo.toml @@ -3,7 +3,7 @@ name = "detect-targets" description = "Detect the target of the env at runtime" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/detect-targets" -version = "0.1.49" +version = "0.1.50" rust-version = "1.62.0" authors = ["Jiahao XU "] edition = "2021" From e8c9cc3599f6c4063d143083205f98ca25d91677 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 31 May 2025 06:15:47 +0000 Subject: [PATCH 25/32] release: cargo-binstall v1.12.6 (#2174) chore: Release Co-authored-by: github-actions --- Cargo.lock | 2 +- crates/bin/Cargo.toml | 2 +- crates/bin/windows.manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f40db7a..b655eed2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "cargo-binstall" -version = "1.12.5" +version = "1.12.6" dependencies = [ "atomic-file-install", "binstalk", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index bac659d6..70713983 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-binstall" description = "Binary installation for rust projects" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/cargo-binstall" -version = "1.12.5" +version = "1.12.6" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/bin/windows.manifest b/crates/bin/windows.manifest index dccfa6c8..d193452f 100644 --- a/crates/bin/windows.manifest +++ b/crates/bin/windows.manifest @@ -3,7 +3,7 @@ From 25a52038ef190f9ba599670a0898e8e8b83f02c7 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Fri, 6 Jun 2025 14:13:05 +1000 Subject: [PATCH 26/32] fix updating of installed crates manifest on custom sparse registry (#2178) * Add either v1.15.0 to binstalk-registry Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Add `SourceType::Sparse` Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Add `Registry::crate_source` Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Use `Registry::crate_siouy Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Add support for `Source::Sparse` Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Optimize `CratesToml::append_to_file` Bulkify remove Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix typing in cargo_crates_v1.rs and optimize append_to_file Use `Vec::reserve_exact ` in `append_to_file` to avoid unnecessary allocation Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix Registry::url Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix unused variable in `Registry::crate_source` Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix fmt in cargo_crates_v1.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix fmt in binstalk-registry/src/lib.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix fmt in cargo_crates_v1.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Refactor: Extract new fn CratesToml::add_crate Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix `::fmt` impl for `Source::Sprase` Add `/` to the end of the url if it doesn't have one Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix crate_version_source.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix lifetime of `CrateToml::add_crate` API Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix lifetime of `CratesToml<'::add_crate` API Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * cargo fmt crate_version_source.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix `Registery::crate_source` Match sparse/git crates.io registry to standardrised `CrateSource::cratesio_registry()`. Also optimize it to avoid unnecessary `.to_string()` and `Url::parse` for sparse registry. Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix `GitRegistry::url` ret type Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix `SparseRegistery::url` return type Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix typing in `Registry::crate_source` Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Rm unused import in sparse_registry.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Rm unused import in git_registry.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * cargo fmt binstalk-registry/src/lib.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Rm unused dep either from binstalk-registry Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- .../binstalk-manifests/src/cargo_crates_v1.rs | 78 ++++++++++--------- .../cargo_crates_v1/crate_version_source.rs | 18 ++++- crates/binstalk-registry/src/git_registry.rs | 4 +- crates/binstalk-registry/src/lib.rs | 40 +++++++++- .../binstalk-registry/src/sparse_registry.rs | 4 +- crates/binstalk-types/src/crate_info.rs | 1 + crates/binstalk/src/ops/resolve.rs | 12 +-- 7 files changed, 101 insertions(+), 56 deletions(-) diff --git a/crates/binstalk-manifests/src/cargo_crates_v1.rs b/crates/binstalk-manifests/src/cargo_crates_v1.rs index 3cf0794e..85a072d8 100644 --- a/crates/binstalk-manifests/src/cargo_crates_v1.rs +++ b/crates/binstalk-manifests/src/cargo_crates_v1.rs @@ -37,7 +37,7 @@ pub struct CratesToml<'a> { v1: Vec<(String, Cow<'a, [CompactString]>)>, } -impl CratesToml<'_> { +impl<'v1> CratesToml<'v1> { pub fn default_path() -> Result { Ok(cargo_home()?.join(".crates.toml")) } @@ -68,9 +68,14 @@ impl CratesToml<'_> { } pub fn remove(&mut self, name: &str) { + self.remove_all(&[name]); + } + + /// * `sorted_names` - must be sorted + pub fn remove_all(&mut self, sorted_names: &[&str]) { self.v1.retain(|(s, _bin)| { s.split_once(' ') - .map(|(crate_name, _rest)| crate_name != name) + .map(|(crate_name, _rest)| sorted_names.binary_search(&crate_name).is_err()) .unwrap_or_default() }); } @@ -106,53 +111,52 @@ impl CratesToml<'_> { self.write_to_file(&mut file) } - pub fn append_to_file<'a, Iter>(file: &mut File, iter: Iter) -> Result<(), CratesTomlParseError> - where - Iter: IntoIterator, - { - fn inner( - file: &mut File, - iter: &mut dyn Iterator, - ) -> Result<(), CratesTomlParseError> { - let mut c1 = CratesToml::load_from_reader(&mut *file)?; + pub fn add_crate(&mut self, metadata: &'v1 CrateInfo) { + let name = &metadata.name; + let version = &metadata.current_version; + let source = Source::from(&metadata.source); - for metadata in iter { - let name = &metadata.name; - let version = &metadata.current_version; - let source = Source::from(&metadata.source); + self.v1.push(( + format!("{name} {version} ({source})"), + Cow::borrowed(&metadata.bins), + )); + } - c1.remove(name); - c1.v1.push(( - format!("{name} {version} ({source})"), - Cow::borrowed(&metadata.bins), - )); - } + pub fn append_to_file( + file: &mut File, + crates: &[CrateInfo], + ) -> Result<(), CratesTomlParseError> { + let mut c1 = CratesToml::load_from_reader(&mut *file)?; - file.rewind()?; - c1.write_to_file(file)?; + let mut crate_names: Vec<_> = crates + .iter() + .map(|metadata| metadata.name.as_str()) + .collect(); + crate_names.sort_unstable(); + c1.remove_all(&crate_names); - Ok(()) + c1.v1.reserve_exact(crates.len()); + + for metadata in crates { + c1.add_crate(metadata); } - inner(file, &mut iter.into_iter()) + file.rewind()?; + c1.write_to_file(file)?; + + Ok(()) } - pub fn append_to_path<'a, Iter>( + pub fn append_to_path( path: impl AsRef, - iter: Iter, - ) -> Result<(), CratesTomlParseError> - where - Iter: IntoIterator, - { + crates: &[CrateInfo], + ) -> Result<(), CratesTomlParseError> { let mut file = create_if_not_exist(path.as_ref())?; - Self::append_to_file(&mut file, iter) + Self::append_to_file(&mut file, crates) } - pub fn append<'a, Iter>(iter: Iter) -> Result<(), CratesTomlParseError> - where - Iter: IntoIterator, - { - Self::append_to_path(Self::default_path()?, iter) + pub fn append(crates: &[CrateInfo]) -> Result<(), CratesTomlParseError> { + Self::append_to_path(Self::default_path()?, crates) } /// Return BTreeMap with crate name as key and its corresponding version diff --git a/crates/binstalk-manifests/src/cargo_crates_v1/crate_version_source.rs b/crates/binstalk-manifests/src/cargo_crates_v1/crate_version_source.rs index a705bba2..e58b99bf 100644 --- a/crates/binstalk-manifests/src/cargo_crates_v1/crate_version_source.rs +++ b/crates/binstalk-manifests/src/cargo_crates_v1/crate_version_source.rs @@ -1,4 +1,8 @@ -use std::{borrow::Cow, fmt, str::FromStr}; +use std::{ + borrow::Cow, + fmt::{self, Write as _}, + str::FromStr, +}; use binstalk_types::maybe_owned::MaybeOwned; use compact_str::CompactString; @@ -30,6 +34,7 @@ impl From<&CrateInfo> for CrateVersionSource { Git => Source::Git(url), Path => Source::Path(url), Registry => Source::Registry(url), + Sparse => Source::Sparse(url), }, } } @@ -40,6 +45,7 @@ pub enum Source<'a> { Git(MaybeOwned<'a, Url>), Path(MaybeOwned<'a, Url>), Registry(MaybeOwned<'a, Url>), + Sparse(MaybeOwned<'a, Url>), } impl<'a> From<&'a CrateSource> for Source<'a> { @@ -52,6 +58,7 @@ impl<'a> From<&'a CrateSource> for Source<'a> { Git => Self::Git(url), Path => Self::Path(url), Registry => Self::Registry(url), + Sparse => Self::Sparse(url), } } } @@ -125,6 +132,15 @@ impl fmt::Display for Source<'_> { Source::Git(url) => write!(f, "git+{url}"), Source::Path(url) => write!(f, "path+{url}"), Source::Registry(url) => write!(f, "registry+{url}"), + Source::Sparse(url) => { + let url = url.as_str(); + write!(f, "sparse+{url}")?; + if url.ends_with("/") { + Ok(()) + } else { + f.write_char('/') + } + } } } } diff --git a/crates/binstalk-registry/src/git_registry.rs b/crates/binstalk-registry/src/git_registry.rs index b707b602..ac0a3b2e 100644 --- a/crates/binstalk-registry/src/git_registry.rs +++ b/crates/binstalk-registry/src/git_registry.rs @@ -1,4 +1,4 @@ -use std::{fmt::Display, io, path::PathBuf, sync::Arc}; +use std::{io, path::PathBuf, sync::Arc}; use binstalk_downloader::remote::Client; use binstalk_types::cargo_toml_binstall::Meta; @@ -73,7 +73,7 @@ impl GitRegistry { })) } - pub fn url(&self) -> impl Display + '_ { + pub fn url(&self) -> &GitUrl { &self.0.url } diff --git a/crates/binstalk-registry/src/lib.rs b/crates/binstalk-registry/src/lib.rs index 6dd19ecc..5c7dddd6 100644 --- a/crates/binstalk-registry/src/lib.rs +++ b/crates/binstalk-registry/src/lib.rs @@ -7,7 +7,11 @@ use binstalk_downloader::{ download::DownloadError, remote::{Client, Error as RemoteError}, }; -use binstalk_types::cargo_toml_binstall::Meta; +use binstalk_types::{ + cargo_toml_binstall::Meta, + crate_info::{CrateSource, SourceType}, + maybe_owned::MaybeOwned, +}; use cargo_toml_workspace::cargo_toml::{Error as CargoTomlError, Manifest}; use compact_str::CompactString; use leon::{ParseError, RenderError}; @@ -80,7 +84,7 @@ pub enum RegistryError { CargoManifest(#[from] Box), #[error("Failed to parse url: {0}")] - UrlParse(#[from] url::ParseError), + UrlParse(#[from] UrlParseError), #[error(transparent)] Download(#[from] DownloadError), @@ -195,6 +199,38 @@ impl Registry { } } } + + /// Get url of the regsitry + pub fn url(&self) -> Result, UrlParseError> { + match self { + #[cfg(feature = "git")] + Registry::Git(registry) => { + Url::parse(®istry.url().to_string()).map(MaybeOwned::Owned) + } + Registry::Sparse(registry) => Ok(MaybeOwned::Borrowed(registry.url())), + } + } + + /// Get crate source of this registry + pub fn crate_source(&self) -> Result { + let registry = self.url()?; + let source_type = match self { + #[cfg(feature = "git")] + Registry::Git(_) => SourceType::Git, + Registry::Sparse(_) => SourceType::Sparse, + }; + + Ok(match (registry.as_str(), source_type) { + ("https://index.crates.io/", SourceType::Sparse) + | ("https://github.com/rust-lang/crates.io-index", SourceType::Git) => { + CrateSource::cratesio_registry() + } + _ => CrateSource { + source_type, + url: MaybeOwned::Owned(registry.into_owned()), + }, + }) + } } impl fmt::Display for Registry { diff --git a/crates/binstalk-registry/src/sparse_registry.rs b/crates/binstalk-registry/src/sparse_registry.rs index 48a4f5b2..7d65f180 100644 --- a/crates/binstalk-registry/src/sparse_registry.rs +++ b/crates/binstalk-registry/src/sparse_registry.rs @@ -1,5 +1,3 @@ -use std::fmt::Display; - use binstalk_downloader::remote::{Client, Error as RemoteError}; use binstalk_types::cargo_toml_binstall::Meta; use cargo_toml_workspace::cargo_toml::Manifest; @@ -30,7 +28,7 @@ impl SparseRegistry { } } - pub fn url(&self) -> impl Display + '_ { + pub fn url(&self) -> &Url { &self.url } diff --git a/crates/binstalk-types/src/crate_info.rs b/crates/binstalk-types/src/crate_info.rs index 9d46d82e..7c8f2b64 100644 --- a/crates/binstalk-types/src/crate_info.rs +++ b/crates/binstalk-types/src/crate_info.rs @@ -65,6 +65,7 @@ pub enum SourceType { Git, Path, Registry, + Sparse, } #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/crates/binstalk/src/ops/resolve.rs b/crates/binstalk/src/ops/resolve.rs index 265a18b6..74266340 100644 --- a/crates/binstalk/src/ops/resolve.rs +++ b/crates/binstalk/src/ops/resolve.rs @@ -496,17 +496,7 @@ impl PackageInfo { .fetch_crate_matched(client, &name, version_req), ) .await?, - { - let registry = format!("{}", opts.registry); - if registry == "https://index.crates.io/" { - CrateSource::cratesio_registry() - } else { - CrateSource { - source_type: SourceType::Registry, - url: MaybeOwned::Owned(Url::parse(®istry)?), - } - } - }, + opts.registry.crate_source()?, ), }; From 619707990ad1b1b500bc76368fe57b09d7e03db6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 15:08:16 +1000 Subject: [PATCH 27/32] build(deps): bump tj-actions/changed-files from 050a3d3360d29711ee9d8210fc639d902d23ad07 to 115870536a85eaf050e369291c7895748ff12aea (#2177) build(deps): bump tj-actions/changed-files Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 050a3d3360d29711ee9d8210fc639d902d23ad07 to 115870536a85eaf050e369291c7895748ff12aea. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/050a3d3360d29711ee9d8210fc639d902d23ad07...115870536a85eaf050e369291c7895748ff12aea) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-version: 115870536a85eaf050e369291c7895748ff12aea dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54d20a40..02e00ca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@050a3d3360d29711ee9d8210fc639d902d23ad07 + uses: tj-actions/changed-files@115870536a85eaf050e369291c7895748ff12aea with: dir_names: true dir_names_exclude_current_dir: true From 95391744748cf1a7313aa8c366e8f83429ab05fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 05:17:55 +0000 Subject: [PATCH 28/32] dep: Upgrade transitive dependencies (#2182) Co-authored-by: github-actions --- Cargo.lock | 133 ++++++++++++----------------------------------------- 1 file changed, 30 insertions(+), 103 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b655eed2..dafaf25a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,9 +67,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", @@ -82,33 +82,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.8" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", "once_cell_polyfill", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" [[package]] name = "byteorder" @@ -533,9 +533,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" dependencies = [ "serde", ] @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.25" +version = "1.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" +checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac" dependencies = [ "jobserver", "libc", @@ -739,9 +739,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "command-group" @@ -2470,9 +2470,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" +checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ "base64", "bytes", @@ -3767,9 +3767,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.18" +version = "0.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff6b0dbbe4d5a37318f433d4fc82babd21631f194d370409ceb2e40b2f0b5" +checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119" dependencies = [ "async-compression", "base64", @@ -4626,9 +4626,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ "bitflags 2.9.1", "bytes", @@ -5108,7 +5108,7 @@ dependencies = [ "windows-interface", "windows-link", "windows-result", - "windows-strings 0.4.2", + "windows-strings", ] [[package]] @@ -5162,13 +5162,13 @@ dependencies = [ [[package]] name = "windows-registry" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820" dependencies = [ + "windows-link", "windows-result", - "windows-strings 0.3.1", - "windows-targets 0.53.0", + "windows-strings", ] [[package]] @@ -5180,15 +5180,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-strings" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-strings" version = "0.4.2" @@ -5249,29 +5240,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" -dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", -] - [[package]] name = "windows-threading" version = "0.1.0" @@ -5293,12 +5268,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -5311,12 +5280,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -5329,24 +5292,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -5359,12 +5310,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -5377,12 +5322,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -5395,12 +5334,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -5413,12 +5346,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "winnow" version = "0.5.40" From 28525359d3a72d25702395175cff2abfcf4b73d7 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Fri, 6 Jun 2025 17:36:07 +1000 Subject: [PATCH 29/32] Ensure cargo-binstall build.rs always join the thread (#2185) Make sure the build script waits for it to finish before exiting the whole process Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- crates/bin/build.rs | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/crates/bin/build.rs b/crates/bin/build.rs index ed3b0772..617c8d87 100644 --- a/crates/bin/build.rs +++ b/crates/bin/build.rs @@ -11,17 +11,7 @@ fn succeeds(res: io::Result) -> bool { .unwrap_or(false) } -fn main() { - let handle = thread::spawn(|| { - println!("cargo:rerun-if-changed=build.rs"); - println!("cargo:rerun-if-changed=manifest.rc"); - println!("cargo:rerun-if-changed=windows.manifest"); - - embed_resource::compile("manifest.rc", embed_resource::NONE) - .manifest_required() - .unwrap(); - }); - +fn emit_vergen_info() { let git = Command::new("git").arg("--version").spawn(); // .git is usually a dir, but it also can be a file containing @@ -41,6 +31,22 @@ fn main() { } builder.emit().unwrap(); - - handle.join().unwrap(); +} + +fn main() { + thread::scope(|s| { + let handle = s.spawn(|| { + println!("cargo:rerun-if-changed=build.rs"); + println!("cargo:rerun-if-changed=manifest.rc"); + println!("cargo:rerun-if-changed=windows.manifest"); + + embed_resource::compile("manifest.rc", embed_resource::NONE) + .manifest_required() + .unwrap(); + }); + + emit_vergen_info(); + + handle.join().unwrap(); + }); } From 4ec96064b6e1cd8a2458fb9b4291a782cf98f270 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Fri, 6 Jun 2025 20:39:55 +1000 Subject: [PATCH 30/32] Optimize CratesToml (#2186) * Optimize CratesToml Use Box instead of String Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fix CrateToml::add_crate optimize apoend_to_file, drop crate_names before reserving Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Cargo fmt cargo_crates_v1.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- .../binstalk-manifests/src/cargo_crates_v1.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/crates/binstalk-manifests/src/cargo_crates_v1.rs b/crates/binstalk-manifests/src/cargo_crates_v1.rs index 85a072d8..fb254238 100644 --- a/crates/binstalk-manifests/src/cargo_crates_v1.rs +++ b/crates/binstalk-manifests/src/cargo_crates_v1.rs @@ -34,7 +34,7 @@ use crate_version_source::*; #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct CratesToml<'a> { #[serde(with = "tuple_vec_map")] - v1: Vec<(String, Cow<'a, [CompactString]>)>, + v1: Vec<(Box, Cow<'a, [CompactString]>)>, } impl<'v1> CratesToml<'v1> { @@ -117,7 +117,7 @@ impl<'v1> CratesToml<'v1> { let source = Source::from(&metadata.source); self.v1.push(( - format!("{name} {version} ({source})"), + format!("{name} {version} ({source})").into(), Cow::borrowed(&metadata.bins), )); } @@ -128,12 +128,14 @@ impl<'v1> CratesToml<'v1> { ) -> Result<(), CratesTomlParseError> { let mut c1 = CratesToml::load_from_reader(&mut *file)?; - let mut crate_names: Vec<_> = crates - .iter() - .map(|metadata| metadata.name.as_str()) - .collect(); - crate_names.sort_unstable(); - c1.remove_all(&crate_names); + c1.remove_all(&{ + let mut crate_names: Vec<_> = crates + .iter() + .map(|metadata| metadata.name.as_str()) + .collect(); + crate_names.sort_unstable(); + crate_names + }); c1.v1.reserve_exact(crates.len()); From 293f2378d6291d8ed758e1de006c12611f95575a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 14:52:08 +0000 Subject: [PATCH 31/32] chore: release (#2183) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- Cargo.lock | 18 +++++++++--------- crates/bin/Cargo.toml | 4 ++-- crates/binstalk-bins/CHANGELOG.md | 6 ++++++ crates/binstalk-bins/Cargo.toml | 4 ++-- crates/binstalk-downloader/CHANGELOG.md | 6 ++++++ crates/binstalk-downloader/Cargo.toml | 4 ++-- crates/binstalk-fetchers/CHANGELOG.md | 6 ++++++ crates/binstalk-fetchers/Cargo.toml | 10 +++++----- crates/binstalk-git-repo-api/CHANGELOG.md | 6 ++++++ crates/binstalk-git-repo-api/Cargo.toml | 6 +++--- crates/binstalk-manifests/CHANGELOG.md | 10 ++++++++++ crates/binstalk-manifests/Cargo.toml | 6 +++--- crates/binstalk-registry/CHANGELOG.md | 6 ++++++ crates/binstalk-registry/Cargo.toml | 8 ++++---- crates/binstalk-types/CHANGELOG.md | 6 ++++++ crates/binstalk-types/Cargo.toml | 2 +- crates/binstalk/CHANGELOG.md | 6 ++++++ crates/binstalk/Cargo.toml | 16 ++++++++-------- crates/detect-targets/CHANGELOG.md | 6 ++++++ crates/detect-targets/Cargo.toml | 2 +- 20 files changed, 98 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dafaf25a..da92bcbf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,7 +231,7 @@ dependencies = [ [[package]] name = "binstalk" -version = "0.28.34" +version = "0.28.35" dependencies = [ "binstalk-bins", "binstalk-downloader", @@ -263,7 +263,7 @@ dependencies = [ [[package]] name = "binstalk-bins" -version = "0.6.13" +version = "0.6.14" dependencies = [ "atomic-file-install", "binstalk-types", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "binstalk-downloader" -version = "0.13.19" +version = "0.13.20" dependencies = [ "async-compression", "async-trait", @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "binstalk-fetchers" -version = "0.10.20" +version = "0.10.21" dependencies = [ "async-trait", "binstalk-downloader", @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "binstalk-git-repo-api" -version = "0.5.21" +version = "0.5.22" dependencies = [ "binstalk-downloader", "compact_str", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "binstalk-manifests" -version = "0.15.31" +version = "0.16.0" dependencies = [ "beef", "binstalk-types", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "binstalk-registry" -version = "0.11.20" +version = "0.11.21" dependencies = [ "async-trait", "base16", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "binstalk-types" -version = "0.9.4" +version = "0.10.0" dependencies = [ "compact_str", "maybe-owned", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "detect-targets" -version = "0.1.50" +version = "0.1.51" dependencies = [ "cfg-if", "guess_host_triple", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 70713983..582d36ff 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -23,8 +23,8 @@ pkg-fmt = "zip" [dependencies] atomic-file-install = { version = "1.0.11", path = "../atomic-file-install" } -binstalk = { path = "../binstalk", version = "0.28.34", default-features = false } -binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.31" } +binstalk = { path = "../binstalk", version = "0.28.35", default-features = false } +binstalk-manifests = { path = "../binstalk-manifests", version = "0.16.0" } clap = { version = "4.5.3", features = ["derive", "env", "wrap_help"] } clap-cargo = "0.15.2" compact_str = "0.9.0" diff --git a/crates/binstalk-bins/CHANGELOG.md b/crates/binstalk-bins/CHANGELOG.md index de489e3e..909f0ae8 100644 --- a/crates/binstalk-bins/CHANGELOG.md +++ b/crates/binstalk-bins/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.6.14](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-bins-v0.6.13...binstalk-bins-v0.6.14) - 2025-06-06 + +### Other + +- updated the following local packages: binstalk-types + ## [0.6.13](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-bins-v0.6.12...binstalk-bins-v0.6.13) - 2025-03-19 ### Other diff --git a/crates/binstalk-bins/Cargo.toml b/crates/binstalk-bins/Cargo.toml index d3f8c6c4..f2dbc956 100644 --- a/crates/binstalk-bins/Cargo.toml +++ b/crates/binstalk-bins/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-bins" -version = "0.6.13" +version = "0.6.14" edition = "2021" description = "The binstall binaries discovery and installation crate." @@ -12,7 +12,7 @@ license = "GPL-3.0-only" [dependencies] atomic-file-install = { version = "1.0.11", path = "../atomic-file-install" } -binstalk-types = { version = "0.9.4", path = "../binstalk-types" } +binstalk-types = { version = "0.10.0", path = "../binstalk-types" } compact_str = { version = "0.9.0", features = ["serde"] } leon = "3.0.0" miette = "7.0.0" diff --git a/crates/binstalk-downloader/CHANGELOG.md b/crates/binstalk-downloader/CHANGELOG.md index 678671e7..bf6b6042 100644 --- a/crates/binstalk-downloader/CHANGELOG.md +++ b/crates/binstalk-downloader/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.13.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-downloader-v0.13.19...binstalk-downloader-v0.13.20) - 2025-06-06 + +### Other + +- updated the following local packages: binstalk-types + ## [0.13.19](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-downloader-v0.13.18...binstalk-downloader-v0.13.19) - 2025-05-30 ### Other diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml index 1336845c..7e0cbf93 100644 --- a/crates/binstalk-downloader/Cargo.toml +++ b/crates/binstalk-downloader/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-downloader" description = "The binstall toolkit for downloading and extracting file" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-downloader" -version = "0.13.19" +version = "0.13.20" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" @@ -18,7 +18,7 @@ async-compression = { version = "0.4.4", features = [ "bzip2", "tokio", ] } -binstalk-types = { version = "0.9.4", path = "../binstalk-types" } +binstalk-types = { version = "0.10.0", path = "../binstalk-types" } bytes = "1.4.0" bzip2 = { version = "0.5.2", default-features = false, features = [ "libbz2-rs-sys", diff --git a/crates/binstalk-fetchers/CHANGELOG.md b/crates/binstalk-fetchers/CHANGELOG.md index 121dea53..a1160400 100644 --- a/crates/binstalk-fetchers/CHANGELOG.md +++ b/crates/binstalk-fetchers/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.10.21](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-fetchers-v0.10.20...binstalk-fetchers-v0.10.21) - 2025-06-06 + +### Other + +- updated the following local packages: binstalk-types, binstalk-downloader, binstalk-downloader, binstalk-git-repo-api + ## [0.10.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-fetchers-v0.10.19...binstalk-fetchers-v0.10.20) - 2025-05-30 ### Other diff --git a/crates/binstalk-fetchers/Cargo.toml b/crates/binstalk-fetchers/Cargo.toml index b1a1d77a..8f716e1d 100644 --- a/crates/binstalk-fetchers/Cargo.toml +++ b/crates/binstalk-fetchers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-fetchers" -version = "0.10.20" +version = "0.10.21" edition = "2021" description = "The binstall fetchers" @@ -12,9 +12,9 @@ license = "GPL-3.0-only" [dependencies] async-trait = "0.1.88" -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false } -binstalk-git-repo-api = { version = "0.5.21", path = "../binstalk-git-repo-api" } -binstalk-types = { version = "0.9.4", path = "../binstalk-types" } +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader", default-features = false } +binstalk-git-repo-api = { version = "0.5.22", path = "../binstalk-git-repo-api" } +binstalk-types = { version = "0.10.0", path = "../binstalk-types" } bytes = "1.4.0" compact_str = { version = "0.9.0" } either = "1.11.0" @@ -34,7 +34,7 @@ tracing = "0.1.39" url = "2.5.4" [dev-dependencies] -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader" } +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader" } [features] quickinstall = [] diff --git a/crates/binstalk-git-repo-api/CHANGELOG.md b/crates/binstalk-git-repo-api/CHANGELOG.md index b70875c4..f2ceba62 100644 --- a/crates/binstalk-git-repo-api/CHANGELOG.md +++ b/crates/binstalk-git-repo-api/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.5.22](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-git-repo-api-v0.5.21...binstalk-git-repo-api-v0.5.22) - 2025-06-06 + +### Other + +- updated the following local packages: binstalk-downloader, binstalk-downloader + ## [0.5.21](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-git-repo-api-v0.5.20...binstalk-git-repo-api-v0.5.21) - 2025-05-30 ### Other diff --git a/crates/binstalk-git-repo-api/Cargo.toml b/crates/binstalk-git-repo-api/Cargo.toml index 9f116210..a03f4781 100644 --- a/crates/binstalk-git-repo-api/Cargo.toml +++ b/crates/binstalk-git-repo-api/Cargo.toml @@ -3,14 +3,14 @@ name = "binstalk-git-repo-api" description = "The binstall toolkit for accessing API for git repository" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-git-repo-api" -version = "0.5.21" +version = "0.5.22" rust-version = "1.70.0" authors = ["Jiahao XU "] edition = "2021" license = "Apache-2.0 OR MIT" [dependencies] -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader", default-features = false, features = [ "json", ] } compact_str = "0.9.0" @@ -25,6 +25,6 @@ url = "2.5.4" zeroize = "1.8.1" [dev-dependencies] -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader" } +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader" } tracing-subscriber = "0.3" once_cell = "1" diff --git a/crates/binstalk-manifests/CHANGELOG.md b/crates/binstalk-manifests/CHANGELOG.md index fbe665b3..a2950ea4 100644 --- a/crates/binstalk-manifests/CHANGELOG.md +++ b/crates/binstalk-manifests/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.16.0](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.31...binstalk-manifests-v0.16.0) - 2025-06-06 + +### Fixed + +- fix updating of installed crates manifest on custom sparse registry ([#2178](https://github.com/cargo-bins/cargo-binstall/pull/2178)) + +### Other + +- Optimize CratesToml ([#2186](https://github.com/cargo-bins/cargo-binstall/pull/2186)) + ## [0.15.31](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-manifests-v0.15.30...binstalk-manifests-v0.15.31) - 2025-05-30 ### Other diff --git a/crates/binstalk-manifests/Cargo.toml b/crates/binstalk-manifests/Cargo.toml index 462e3f83..6308c5d0 100644 --- a/crates/binstalk-manifests/Cargo.toml +++ b/crates/binstalk-manifests/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-manifests" description = "The binstall toolkit for manipulating with manifest" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-manifests" -version = "0.15.31" +version = "0.16.0" rust-version = "1.61.0" authors = ["ryan "] edition = "2021" @@ -11,7 +11,7 @@ license = "Apache-2.0 OR MIT" [dependencies] beef = { version = "0.5.2", features = ["impl_serde"] } -binstalk-types = { version = "0.9.4", path = "../binstalk-types" } +binstalk-types = { version = "0.10.0", path = "../binstalk-types" } compact_str = { version = "0.9.0", features = ["serde"] } fs-lock = { version = "0.1.10", path = "../fs-lock", features = ["tracing"] } home = "0.5.9" @@ -25,5 +25,5 @@ toml_edit = { version = "0.22.12", features = ["serde"] } url = { version = "2.5.4", features = ["serde"] } [dev-dependencies] -detect-targets = { version = "0.1.50", path = "../detect-targets" } +detect-targets = { version = "0.1.51", path = "../detect-targets" } tempfile = "3.5.0" diff --git a/crates/binstalk-registry/CHANGELOG.md b/crates/binstalk-registry/CHANGELOG.md index 24b1ed27..1d869d8c 100644 --- a/crates/binstalk-registry/CHANGELOG.md +++ b/crates/binstalk-registry/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.11.21](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-registry-v0.11.20...binstalk-registry-v0.11.21) - 2025-06-06 + +### Fixed + +- fix updating of installed crates manifest on custom sparse registry ([#2178](https://github.com/cargo-bins/cargo-binstall/pull/2178)) + ## [0.11.20](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-registry-v0.11.19...binstalk-registry-v0.11.20) - 2025-05-30 ### Other diff --git a/crates/binstalk-registry/Cargo.toml b/crates/binstalk-registry/Cargo.toml index f9829793..256030c8 100644 --- a/crates/binstalk-registry/Cargo.toml +++ b/crates/binstalk-registry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "binstalk-registry" -version = "0.11.20" +version = "0.11.21" edition = "2021" rust-version = "1.65.0" @@ -13,10 +13,10 @@ license = "Apache-2.0 OR MIT" [dependencies] async-trait = "0.1.88" base16 = "0.2.1" -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader", default-features = false, features = [ "json", ] } -binstalk-types = { version = "0.9.4", path = "../binstalk-types" } +binstalk-types = { version = "0.10.0", path = "../binstalk-types" } cargo-toml-workspace = { version = "7.0.6", path = "../cargo-toml-workspace" } compact_str = { version = "0.9.0", features = ["serde"] } leon = "3.0.0" @@ -40,7 +40,7 @@ url = "2.5.4" [dev-dependencies] tokio = { version = "1", features = ["rt-multi-thread", "macros"] } toml_edit = { version = "0.22.12", features = ["serde"] } -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false, features = [ +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader", default-features = false, features = [ "rustls", ] } diff --git a/crates/binstalk-types/CHANGELOG.md b/crates/binstalk-types/CHANGELOG.md index 8d7e76d6..9c32637c 100644 --- a/crates/binstalk-types/CHANGELOG.md +++ b/crates/binstalk-types/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.10.0](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-types-v0.9.4...binstalk-types-v0.10.0) - 2025-06-06 + +### Fixed + +- fix updating of installed crates manifest on custom sparse registry ([#2178](https://github.com/cargo-bins/cargo-binstall/pull/2178)) + ## [0.9.4](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-types-v0.9.3...binstalk-types-v0.9.4) - 2025-03-07 ### Other diff --git a/crates/binstalk-types/Cargo.toml b/crates/binstalk-types/Cargo.toml index 70f83f2e..158afde2 100644 --- a/crates/binstalk-types/Cargo.toml +++ b/crates/binstalk-types/Cargo.toml @@ -3,7 +3,7 @@ name = "binstalk-types" description = "The binstall toolkit that contains basic types for binstalk crates" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk-types" -version = "0.9.4" +version = "0.10.0" rust-version = "1.61.0" authors = ["ryan "] edition = "2021" diff --git a/crates/binstalk/CHANGELOG.md b/crates/binstalk/CHANGELOG.md index 39de5958..98e87260 100644 --- a/crates/binstalk/CHANGELOG.md +++ b/crates/binstalk/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.28.35](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.34...binstalk-v0.28.35) - 2025-06-06 + +### Fixed + +- fix updating of installed crates manifest on custom sparse registry ([#2178](https://github.com/cargo-bins/cargo-binstall/pull/2178)) + ## [0.28.34](https://github.com/cargo-bins/cargo-binstall/compare/binstalk-v0.28.33...binstalk-v0.28.34) - 2025-05-30 ### Other diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 434c96d0..32344eb4 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -3,25 +3,25 @@ name = "binstalk" description = "The binstall toolkit (library interface)" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/binstalk" -version = "0.28.34" +version = "0.28.35" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" license = "GPL-3.0-only" [dependencies] -binstalk-bins = { version = "0.6.13", path = "../binstalk-bins" } -binstalk-downloader = { version = "0.13.19", path = "../binstalk-downloader", default-features = false } -binstalk-git-repo-api = { version = "0.5.21", path = "../binstalk-git-repo-api" } -binstalk-fetchers = { version = "0.10.20", path = "../binstalk-fetchers", features = [ +binstalk-bins = { version = "0.6.14", path = "../binstalk-bins" } +binstalk-downloader = { version = "0.13.20", path = "../binstalk-downloader", default-features = false } +binstalk-git-repo-api = { version = "0.5.22", path = "../binstalk-git-repo-api" } +binstalk-fetchers = { version = "0.10.21", path = "../binstalk-fetchers", features = [ "quickinstall", ] } -binstalk-registry = { version = "0.11.20", path = "../binstalk-registry" } -binstalk-types = { version = "0.9.4", path = "../binstalk-types" } +binstalk-registry = { version = "0.11.21", path = "../binstalk-registry" } +binstalk-types = { version = "0.10.0", path = "../binstalk-types" } cargo-toml-workspace = { version = "7.0.6", path = "../cargo-toml-workspace" } command-group = { version = "5.0.1", features = ["with-tokio"] } compact_str = { version = "0.9.0", features = ["serde"] } -detect-targets = { version = "0.1.50", path = "../detect-targets", features = [ +detect-targets = { version = "0.1.51", path = "../detect-targets", features = [ "tracing", ] } either = "1.11.0" diff --git a/crates/detect-targets/CHANGELOG.md b/crates/detect-targets/CHANGELOG.md index 1388b52f..7d074814 100644 --- a/crates/detect-targets/CHANGELOG.md +++ b/crates/detect-targets/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.51](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.50...detect-targets-v0.1.51) - 2025-06-06 + +### Other + +- update Cargo.lock dependencies + ## [0.1.50](https://github.com/cargo-bins/cargo-binstall/compare/detect-targets-v0.1.49...detect-targets-v0.1.50) - 2025-05-30 ### Other diff --git a/crates/detect-targets/Cargo.toml b/crates/detect-targets/Cargo.toml index 7ae781ed..9b390312 100644 --- a/crates/detect-targets/Cargo.toml +++ b/crates/detect-targets/Cargo.toml @@ -3,7 +3,7 @@ name = "detect-targets" description = "Detect the target of the env at runtime" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/detect-targets" -version = "0.1.50" +version = "0.1.51" rust-version = "1.62.0" authors = ["Jiahao XU "] edition = "2021" From ea65a39d2dcca142c53bddd3a097a674e903f475 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 15:39:45 +0000 Subject: [PATCH 32/32] release: cargo-binstall v1.12.7 (#2187) chore: Release Co-authored-by: github-actions --- Cargo.lock | 2 +- crates/bin/Cargo.toml | 2 +- crates/bin/windows.manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da92bcbf..a622c992 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "cargo-binstall" -version = "1.12.6" +version = "1.12.7" dependencies = [ "atomic-file-install", "binstalk", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 582d36ff..70ef4c36 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-binstall" description = "Binary installation for rust projects" repository = "https://github.com/cargo-bins/cargo-binstall" documentation = "https://docs.rs/cargo-binstall" -version = "1.12.6" +version = "1.12.7" rust-version = "1.79.0" authors = ["ryan "] edition = "2021" diff --git a/crates/bin/windows.manifest b/crates/bin/windows.manifest index d193452f..11848e79 100644 --- a/crates/bin/windows.manifest +++ b/crates/bin/windows.manifest @@ -3,7 +3,7 @@