From 290764cb257c72d159b11d3d26731cd3c196da9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 08:00:07 +0000 Subject: [PATCH 1/6] Bump the known_good_semver group across 1 directory with 6 updates Bumps the known_good_semver group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [camino](https://github.com/camino-rs/camino) | `1.1.9` | `1.1.10` | | [cargo_metadata](https://github.com/oli-obk/cargo_metadata) | `0.19.2` | `0.20.0` | | [clap](https://github.com/clap-rs/clap) | `4.5.37` | `4.5.39` | | [criterion](https://github.com/bheisler/criterion.rs) | `0.5.1` | `0.6.0` | | [tempfile](https://github.com/Stebalien/tempfile) | `3.19.1` | `3.20.0` | | [toml_edit](https://github.com/toml-rs/toml) | `0.22.26` | `0.22.27` | Updates `camino` from 1.1.9 to 1.1.10 - [Release notes](https://github.com/camino-rs/camino/releases) - [Changelog](https://github.com/camino-rs/camino/blob/main/CHANGELOG.md) - [Commits](https://github.com/camino-rs/camino/compare/camino-1.1.9...camino-1.1.10) Updates `cargo_metadata` from 0.19.2 to 0.20.0 - [Release notes](https://github.com/oli-obk/cargo_metadata/releases) - [Changelog](https://github.com/oli-obk/cargo_metadata/blob/main/CHANGELOG.md) - [Commits](https://github.com/oli-obk/cargo_metadata/compare/0.19.2...0.20.0) Updates `clap` from 4.5.37 to 4.5.39 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.37...clap_complete-v4.5.39) Updates `criterion` from 0.5.1 to 0.6.0 - [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/bheisler/criterion.rs/compare/0.5.1...0.6.0) Updates `tempfile` from 3.19.1 to 3.20.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.19.1...v3.20.0) Updates `toml_edit` from 0.22.26 to 0.22.27 - [Commits](https://github.com/toml-rs/toml/compare/v0.22.26...v0.22.27) --- updated-dependencies: - dependency-name: camino dependency-version: 1.1.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: known_good_semver - dependency-name: cargo_metadata dependency-version: 0.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: known_good_semver - dependency-name: clap dependency-version: 4.5.39 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: known_good_semver - dependency-name: criterion dependency-version: 0.6.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: known_good_semver - dependency-name: tempfile dependency-version: 3.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: known_good_semver - dependency-name: toml_edit dependency-version: 0.22.27 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: known_good_semver ... Signed-off-by: dependabot[bot] --- Cargo.lock | 476 ++++++++++++++++++++++++++++++++++++++++++++++++----- Cargo.toml | 12 +- 2 files changed, 437 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 466c078..2c455a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,34 +120,51 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[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", ] [[package]] name = "cargo-platform" -version = "0.1.9" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-util-schemas" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca" dependencies = [ + "semver", "serde", + "serde-untagged", + "serde-value", + "thiserror 1.0.69", + "toml", + "unicode-xid", + "url", ] [[package]] name = "cargo_metadata" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502" dependencies = [ "camino", "cargo-platform", + "cargo-util-schemas", "semver", "serde", "serde_json", - "thiserror", + "thiserror 2.0.12", ] [[package]] @@ -191,9 +208,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.37" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" dependencies = [ "clap_builder", "clap_derive", @@ -201,9 +218,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" dependencies = [ "anstream", "anstyle", @@ -246,25 +263,22 @@ dependencies = [ [[package]] name = "criterion" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679" dependencies = [ "anes", "cast", "ciborium", "clap", "criterion-plot", - "is-terminal", - "itertools 0.10.5", + "itertools 0.13.0", "num-traits", - "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_derive", "serde_json", "tinytemplate", "walkdir", @@ -323,6 +337,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -364,6 +389,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "erased-serde" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.11" @@ -380,6 +415,15 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "futures-core" version = "0.3.31" @@ -463,12 +507,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" - [[package]] name = "histo" version = "1.0.0" @@ -479,24 +517,120 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "2.9.0" +name = "icu_collections" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ - "equivalent", - "hashbrown", + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", ] [[package]] -name = "is-terminal" -version = "0.4.16" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ - "hermit-abi", - "libc", - "windows-sys", + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown", ] [[package]] @@ -514,6 +648,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.14.0" @@ -581,6 +724,12 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" +[[package]] +name = "litemap" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + [[package]] name = "log" version = "0.4.27" @@ -614,6 +763,21 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -669,6 +833,15 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -923,6 +1096,27 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "299d9c19d7d466db4ab10addd5703e4c615dec2a5a16dbbafe191045e87ee66e" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.219" @@ -946,6 +1140,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + [[package]] name = "serde_yaml_ng" version = "0.10.0" @@ -968,6 +1171,18 @@ dependencies = [ "autocfg", ] +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "streaming-stats" version = "0.1.29" @@ -994,11 +1209,22 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[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", @@ -1013,13 +1239,33 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.12", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1033,6 +1279,16 @@ dependencies = [ "syn", ] +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -1043,19 +1299,36 @@ dependencies = [ "serde_json", ] +[[package]] +name = "toml" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.22.26" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "toml_write", "winnow", @@ -1063,9 +1336,9 @@ dependencies = [ [[package]] name = "toml_write" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "tracing" @@ -1098,18 +1371,47 @@ dependencies = [ "once_cell", ] +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "unicode-ident" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "unsafe-libyaml" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "url" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1318,9 +1620,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.6" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ "memchr", ] @@ -1334,12 +1636,42 @@ dependencies = [ "bitflags", ] +[[package]] +name = "writeable" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" + [[package]] name = "yansi" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zepter" version = "1.78.2" @@ -1390,3 +1722,57 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index 5c66c75..750883d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,11 @@ required-features = [ "benchmarking" ] [dependencies] anyhow = { version = "1.0.98", optional = true } assert_cmd = { version = "2.0.17", optional = true } -camino = "1.1.9" -cargo_metadata = "0.19.2" -clap = { version = "4.5.37", features = ["derive", "cargo"] } +camino = "1.1.10" +cargo_metadata = "0.20.0" +clap = { version = "4.5.39", features = ["derive", "cargo"] } colour = { version = "2.1.0", optional = true } -criterion = { version = "0.5", optional = true } +criterion = { version = "0.6", optional = true } env_logger = { version = "0.11.8", features = [ "auto-color", "humantime" ], optional = true } histo = { version = "1.0.0", optional = true } itertools = "0.14.0" @@ -36,8 +36,8 @@ semver = "1" serde = "1.0.219" serde_json = { version = "1.0.140", optional = true } serde_yaml_ng = "0.10.0" -tempfile = { version = "3.19.1", optional = true } -toml_edit = "0.22.26" +tempfile = { version = "3.20.0", optional = true } +toml_edit = "0.22.27" tracing = { version = "0.1.41", optional = true } [dev-dependencies] From f469e51218d3d4045816b9a816e97ce89ba3f414 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Wed, 23 Jul 2025 23:33:07 +0200 Subject: [PATCH 2/6] fix test Signed-off-by: Oliver Tale-Yazdi --- Cargo.lock | 266 +++++++++++++++-------- Cargo.toml | 4 +- src/cmd/fmt.rs | 2 +- src/cmd/lint.rs | 10 +- src/cmd/mod.rs | 10 +- src/cmd/trace.rs | 4 +- src/cmd/transpose/lift_to_workspace.rs | 16 +- src/cmd/transpose/mod.rs | 4 +- src/mock/mod.rs | 2 +- tests/integration/sdk/transpose_v18.yaml | 7 +- tests/ui/lint/never-enables/diamond.yaml | 4 +- tests/ui/lint/never-enables/rename.yaml | 4 +- tests/ui/lint/never-enables/simple.yaml | 4 +- 13 files changed, 206 insertions(+), 131 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c455a3..1714972 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[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", @@ -34,37 +34,37 @@ 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", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", - "once_cell", - "windows-sys", + "once_cell_polyfill", + "windows-sys 0.59.0", ] [[package]] @@ -91,15 +91,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[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 = "bstr" @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "camino" @@ -175,9 +175,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "ciborium" @@ -208,9 +208,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.39" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" +checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" dependencies = [ "clap_builder", "clap_derive", @@ -218,9 +218,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.39" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" +checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" dependencies = [ "anstream", "anstyle", @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.32" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" dependencies = [ "heck", "proc-macro2", @@ -242,15 +242,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[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 = "colour" @@ -321,9 +321,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "diff" @@ -401,12 +401,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.60.2", ] [[package]] @@ -469,9 +469,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", "libc", @@ -497,9 +497,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" [[package]] name = "heck" @@ -625,9 +625,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown", @@ -674,9 +674,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.6" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" dependencies = [ "jiff-static", "log", @@ -687,9 +687,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.6" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" dependencies = [ "proc-macro2", "quote", @@ -714,15 +714,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[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" @@ -738,9 +738,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "num-traits" @@ -757,6 +757,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + [[package]] name = "oorandom" version = "11.1.5" @@ -820,9 +826,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "portable-atomic-util" @@ -899,9 +905,9 @@ 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", ] @@ -917,9 +923,9 @@ dependencies = [ [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -1046,22 +1052,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.60.2", ] [[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" @@ -1130,9 +1136,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" dependencies = [ "itoa", "memchr", @@ -1164,12 +1170,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "smallvec" @@ -1200,9 +1203,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -1230,7 +1233,7 @@ dependencies = [ "getrandom", "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1301,9 +1304,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned", @@ -1353,9 +1356,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", @@ -1364,9 +1367,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -1536,7 +1539,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1551,7 +1554,16 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.2", ] [[package]] @@ -1560,14 +1572,30 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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_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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +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]] @@ -1576,53 +1604,101 @@ 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.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.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.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.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.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.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.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] @@ -1705,18 +1781,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.24" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.24" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 750883d..c3b155e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ anyhow = { version = "1.0.98", optional = true } assert_cmd = { version = "2.0.17", optional = true } camino = "1.1.10" cargo_metadata = "0.20.0" -clap = { version = "4.5.39", features = ["derive", "cargo"] } +clap = { version = "4.5.41", features = ["derive", "cargo"] } colour = { version = "2.1.0", optional = true } criterion = { version = "0.6", optional = true } env_logger = { version = "0.11.8", features = [ "auto-color", "humantime" ], optional = true } @@ -34,7 +34,7 @@ log = { version = "0.4.27", optional = true } regex = "1.11.1" semver = "1" serde = "1.0.219" -serde_json = { version = "1.0.140", optional = true } +serde_json = { version = "1.0.141", optional = true } serde_yaml_ng = "0.10.0" tempfile = { version = "3.20.0", optional = true } toml_edit = "0.22.27" diff --git a/src/cmd/fmt.rs b/src/cmd/fmt.rs index d3f3394..7db1c14 100644 --- a/src/cmd/fmt.rs +++ b/src/cmd/fmt.rs @@ -129,7 +129,7 @@ impl FormatFeaturesCmd { let mut fixer = AutoFixer::from_manifest(&path).unwrap(); if let Err(errs) = fixer.canonicalize_features(&pkg.name, &modes, self.line_width) { let path = path.strip_prefix(&allowed_dir).unwrap().to_path_buf(); - errors.entry((path.clone(), pkg.name.clone())).or_default().extend(errs); + errors.entry((path.clone(), pkg.name.to_string())).or_default().extend(errs); } else if fixer.modified() { offenders.push((path, &pkg.name, fixer)); } diff --git a/src/cmd/lint.rs b/src/cmd/lint.rs index e1e7ea1..e2eaefe 100644 --- a/src/cmd/lint.rs +++ b/src/cmd/lint.rs @@ -522,9 +522,9 @@ impl PropagateFeatureCmd { } if let Some((_, lhs_ignore)) = - ignore_missing_propagate.iter().find(|(c, _)| pkg.name == c.0 && c.1 == feature) + ignore_missing_propagate.iter().find(|(c, _)| pkg.name.to_string() == c.0 && c.1 == feature) { - if lhs_ignore.iter().any(|i| dep.pkg.name == i.0 && i.1 == feature) { + if lhs_ignore.iter().any(|i| dep.pkg.name.to_string() == i.0 && i.1 == feature) { continue } } @@ -579,7 +579,7 @@ impl PropagateFeatureCmd { ); if self.fixer_args.enable && - self.fix_package.as_ref().map_or(true, |p| p == &krate.name) && + self.fix_package.as_ref().map_or(true, |p| p == &krate.name.to_string()) && self.left_side_feature_missing == MuteSetting::Fix && (self.left_side_outside_workspace == MuteSetting::Fix || in_workspace) { @@ -599,7 +599,7 @@ impl PropagateFeatureCmd { println!(" must propagate to:\n {}", named.join("\n ")); if self.fixer_args.enable && - self.fix_package.as_ref().map_or(true, |p| p == &krate.name) + self.fix_package.as_ref().map_or(true, |p| p == &krate.name.to_string()) { for dep in deps.iter() { let dep_name = dep.name(); @@ -765,7 +765,7 @@ impl WhyEnabledCmd { for (lhs, rhs) in dag.edges.iter() { for rhs in rhs.iter() { // A bit ghetto, but i don't want to loose unresolved rhs crates. - let resolved = lookup(&rhs.0).map(|r| r.name.clone()).unwrap_or(rhs.0.clone()); + let resolved = lookup(&rhs.0).map(|r| r.name.to_string()).unwrap_or(rhs.0.clone()); if resolved == self.package { found_crate = true; } diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs index f5dfea9..f3f3642 100644 --- a/src/cmd/mod.rs +++ b/src/cmd/mod.rs @@ -280,7 +280,7 @@ pub(crate) fn resolve_dep_from_workspace( meta: &Metadata, ) -> Option { for work in meta.workspace_packages() { - if work.name == dep.name { + if work.name.to_string() == dep.name { let pkg = meta.packages.iter().find(|pkg| pkg.id == work.id).cloned(); return pkg.map(|pkg| RenamedPackage::new(pkg, dep.rename.clone(), dep.optional)) } @@ -299,7 +299,7 @@ pub(crate) fn resolve_dep_from_graph( ) -> Option { let dep_name = dep.rename.clone().unwrap_or(dep.name.clone()).replace('-', "_"); let resolved_pkg = resolve.nodes.iter().find(|node| node.id == pkg.id)?; - let resolved_dep_id = resolved_pkg.deps.iter().find(|node| node.name == dep_name)?; + let resolved_dep_id = resolved_pkg.deps.iter().find(|node| node.name.to_string() == dep_name)?; let resolve_dep = meta.packages.iter().find(|pkg| pkg.id == resolved_dep_id.pkg)?; Some(RenamedPackage::new(resolve_dep.clone(), dep.rename.clone(), dep.optional)) @@ -318,17 +318,17 @@ impl RenamedPackage { } pub fn name(&self) -> String { - self.rename.clone().unwrap_or(self.pkg.name.clone()) + self.rename.clone().unwrap_or(self.pkg.name.to_string()) } pub fn original_name(&self) -> String { - self.pkg.name.clone() + self.pkg.name.to_string() } pub fn display_name(&self) -> String { match &self.rename { Some(rename) => format!("{} (renamed from {})", rename, self.pkg.name), - None => self.pkg.name.clone(), + None => self.pkg.name.to_string(), } } } diff --git a/src/cmd/trace.rs b/src/cmd/trace.rs index f4f3589..913df30 100644 --- a/src/cmd/trace.rs +++ b/src/cmd/trace.rs @@ -56,7 +56,7 @@ impl TraceCmd { let froms = index .iter() - .filter(|(_id, krate)| krate.name == self.from) + .filter(|(_id, krate)| krate.name.to_string() == self.from) .map(|(id, _)| id) .collect::>(); if froms.is_empty() { @@ -65,7 +65,7 @@ impl TraceCmd { let tos = index .iter() - .filter(|(_id, krate)| krate.name == self.to) + .filter(|(_id, krate)| krate.name.to_string() == self.to) .map(|(id, _)| id) .collect::>(); if tos.is_empty() { diff --git a/src/cmd/transpose/lift_to_workspace.rs b/src/cmd/transpose/lift_to_workspace.rs index 2536b87..b8f7815 100644 --- a/src/cmd/transpose/lift_to_workspace.rs +++ b/src/cmd/transpose/lift_to_workspace.rs @@ -214,15 +214,15 @@ impl LiftToWorkspaceCmd { continue } if let Some(skip_package) = &self.skip_package { - if pkg.name == *skip_package { + if pkg.name.to_string() == *skip_package { continue } } - fixers.entry(pkg.name.clone()).or_insert_with(|| { + fixers.entry(pkg.name.to_string()).or_insert_with(|| { (Some(pkg.clone()), AutoFixer::from_manifest(&pkg.manifest_path).unwrap()) }); - let (_, fixer) = fixers.get_mut(&pkg.name).unwrap(); + let (_, fixer) = fixers.get_mut(&pkg.name.to_string()).unwrap(); // We can safely use the rename here, since we found it with `detect_rename`. let dep_name = dep.rename.as_ref().unwrap_or(&dep.name); if let Some(rename) = &maybe_rename { @@ -287,7 +287,7 @@ impl LiftToWorkspaceCmd { for pkg in meta.packages.iter() { if let Some(skip_package) = &self.skip_package { - if pkg.name == *skip_package { + if pkg.name.to_string() == *skip_package { continue } } @@ -331,7 +331,7 @@ impl LiftToWorkspaceCmd { for pkg in meta.packages.iter() { if let Some(skip_package) = &self.skip_package { - if pkg.name == *skip_package { + if pkg.name.to_string() == *skip_package { continue } } @@ -345,15 +345,15 @@ impl LiftToWorkspaceCmd { name, pkg.name ); - unnrenamed.insert(pkg.name.clone()); + unnrenamed.insert(pkg.name.to_string()); } else { renames .entry(dep.rename.clone().unwrap()) .or_default() - .push(pkg.name.clone()); + .push(pkg.name.to_string()); } } else { - unnrenamed.insert(pkg.name.clone()); + unnrenamed.insert(pkg.name.to_string()); } } } diff --git a/src/cmd/transpose/mod.rs b/src/cmd/transpose/mod.rs index 3e47bbd..179d98f 100644 --- a/src/cmd/transpose/mod.rs +++ b/src/cmd/transpose/mod.rs @@ -110,7 +110,7 @@ impl StripDevDepsCmd { let allowed_dir = canonicalize(meta.workspace_root.as_std_path()).unwrap(); for name in self.packages.iter().flatten() { - if !meta.packages.iter().any(|p| p.name == *name) { + if !meta.packages.iter().any(|p| p.name.to_string() == *name) { eprintln!("Could not find package named '{}'", g.red(name)); std::process::exit(1); } @@ -119,7 +119,7 @@ impl StripDevDepsCmd { let mut fixers = Map::new(); for pkg in meta.packages.iter() { if let Some(packages) = &self.packages { - if !packages.contains(&pkg.name) { + if !packages.contains(&pkg.name.to_string()) { continue } } diff --git a/src/mock/mod.rs b/src/mock/mod.rs index 2978175..b49bc8c 100644 --- a/src/mock/mod.rs +++ b/src/mock/mod.rs @@ -256,7 +256,7 @@ impl Context { } pub fn persist(self) -> PathBuf { - self.root.into_path() + self.root.keep() } pub fn create_crate(&self, module: &CrateConfig) -> Result<(), anyhow::Error> { diff --git a/tests/integration/sdk/transpose_v18.yaml b/tests/integration/sdk/transpose_v18.yaml index 212763f..435d1fa 100644 --- a/tests/integration/sdk/transpose_v18.yaml +++ b/tests/integration/sdk/transpose_v18.yaml @@ -9790,7 +9790,7 @@ cases: +sc-keystore = { workspace = true, default-features = true } +sc-client-db = { workspace = true, default-features = true } +sc-consensus = { workspace = true } - @@ -126,22 +126,22 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" } + @@ -126,20 +126,20 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" } -sc-consensus-epochs = { path = "../../../client/consensus/epochs" } -sc-service-test = { path = "../../../client/service/test" } -sc-block-builder = { path = "../../../client/block-builder" } @@ -9811,8 +9811,6 @@ cases: -substrate-rpc-client = { path = "../../../utils/frame/rpc/client" } -pallet-timestamp = { path = "../../../frame/timestamp" } -substrate-cli-test-utils = { path = "../../../test-utils/cli" } - - - -wat = "1.0" +sc-consensus-epochs = { workspace = true } +sc-service-test = { workspace = true } +sc-block-builder = { workspace = true } @@ -9833,7 +9831,8 @@ cases: +substrate-rpc-client = { workspace = true } +pallet-timestamp = { workspace = true, default-features = true } +substrate-cli-test-utils = { workspace = true } - + + @@ -147 +147 @@ substrate-cli-test-utils = { path = "../../../test-utils/cli" } + -wat = "1.0" +wat = { workspace = true } @@ -149,7 +149,7 @@ frame-support = { path = "../../../frame/support" } -node-testing = { path = "../testing" } diff --git a/tests/ui/lint/never-enables/diamond.yaml b/tests/ui/lint/never-enables/diamond.yaml index dee4555..bc571bd 100644 --- a/tests/ui/lint/never-enables/diamond.yaml +++ b/tests/ui/lint/never-enables/diamond.yaml @@ -29,14 +29,14 @@ crates: cases: - cmd: lint never-enables --precondition F0 --stays-disabled G0 stdout: | - crate "A" + crate PackageName("A") feature "F0" enables feature "G0" on dependencies: B b - cmd: lint never-enables --precondition F0 --stays-disabled G0 --workspace stdout: | - crate "A" + crate PackageName("A") feature "F0" enables feature "G0" on dependencies: B diff --git a/tests/ui/lint/never-enables/rename.yaml b/tests/ui/lint/never-enables/rename.yaml index e599dec..00dde1e 100644 --- a/tests/ui/lint/never-enables/rename.yaml +++ b/tests/ui/lint/never-enables/rename.yaml @@ -13,13 +13,13 @@ crates: cases: - cmd: lint never-enables --precondition F0 --stays-disabled G0 stdout: | - crate "A" + crate PackageName("A") feature "F0" enables feature "G0" on dependencies: B (renamed from b) - cmd: lint never-enables --precondition F0 --stays-disabled G0 --workspace stdout: | - crate "A" + crate PackageName("A") feature "F0" enables feature "G0" on dependencies: B (renamed from b) diff --git a/tests/ui/lint/never-enables/simple.yaml b/tests/ui/lint/never-enables/simple.yaml index 3a007bf..9fd3f8b 100644 --- a/tests/ui/lint/never-enables/simple.yaml +++ b/tests/ui/lint/never-enables/simple.yaml @@ -16,13 +16,13 @@ crates: cases: - cmd: lint never-enables --precondition F0 --stays-disabled G0 stdout: | - crate "A" + crate PackageName("A") feature "F0" enables feature "G0" on dependencies: B - cmd: lint never-enables --precondition F1 --stays-disabled G1 stdout: | - crate "A" + crate PackageName("A") feature "F1" enables feature "G1" on dependencies: B From 4e209e54e770cda58b5d2cabb5bcd9d3c6dab38e Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 24 Jul 2025 00:38:35 +0200 Subject: [PATCH 3/6] Run CI on depot Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/changelog.yml | 2 +- .github/workflows/install.yml | 2 +- .github/workflows/license-header.yml | 2 +- .github/workflows/linkcheck.yml | 2 +- .github/workflows/toml.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 7c2ca4c..195b041 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -10,7 +10,7 @@ concurrency: jobs: changelog: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 name: Validate steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 126cdc0..e4e3d84 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -17,7 +17,7 @@ env: jobs: install: name: "Cargo install" - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.yml index 7e6ed2d..5d54083 100644 --- a/.github/workflows/license-header.yml +++ b/.github/workflows/license-header.yml @@ -12,7 +12,7 @@ on: jobs: header: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index dea9b99..2b7bf4c 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -15,7 +15,7 @@ env: jobs: linkCheck: name: "Lint" - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/toml.yml b/.github/workflows/toml.yml index 5a01764..e199bf9 100644 --- a/.github/workflows/toml.yml +++ b/.github/workflows/toml.yml @@ -16,7 +16,7 @@ env: jobs: lint: name: "Lint" - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v2 From 39da520459d346c62e9adfe8233d24612e1979c7 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 24 Jul 2025 00:43:04 +0200 Subject: [PATCH 4/6] run on private server Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/changelog.yml | 2 +- .github/workflows/install.yml | 2 +- .github/workflows/license-header.yml | 2 +- .github/workflows/linkcheck.yml | 2 +- .github/workflows/toml.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 195b041..d58aa58 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -10,7 +10,7 @@ concurrency: jobs: changelog: - runs-on: depot-ubuntu-24.04 + runs-on: self-hosted name: Validate steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index e4e3d84..3dffdbb 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -17,7 +17,7 @@ env: jobs: install: name: "Cargo install" - runs-on: depot-ubuntu-24.04 + runs-on: self-hosted steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.yml index 5d54083..4b3b5d7 100644 --- a/.github/workflows/license-header.yml +++ b/.github/workflows/license-header.yml @@ -12,7 +12,7 @@ on: jobs: header: - runs-on: depot-ubuntu-24.04 + runs-on: self-hosted steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index 2b7bf4c..432fce9 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -15,7 +15,7 @@ env: jobs: linkCheck: name: "Lint" - runs-on: depot-ubuntu-24.04 + runs-on: self-hosted steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/toml.yml b/.github/workflows/toml.yml index e199bf9..180aea9 100644 --- a/.github/workflows/toml.yml +++ b/.github/workflows/toml.yml @@ -16,7 +16,7 @@ env: jobs: lint: name: "Lint" - runs-on: depot-ubuntu-24.04 + runs-on: self-hosted steps: - uses: actions/checkout@v2 From cc570feb42539bde1854e8bf90e0f07cc579174f Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 24 Jul 2025 02:29:16 +0200 Subject: [PATCH 5/6] Bump to Rust 1.82 Signed-off-by: Oliver Tale-Yazdi --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- tests/ui/config/v1/basic.yaml | 10 +++++----- tests/ui/config/v1/finds_all.yaml | 16 ++++++++-------- tests/ui/config/v1/version_bin.yaml | 4 ++-- tests/ui/root-args/version.yaml | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1714972..f52144b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1750,7 +1750,7 @@ dependencies = [ [[package]] name = "zepter" -version = "1.78.2" +version = "1.82.0" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index c3b155e..7996572 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "zepter" -version = "1.78.2" +version = "1.82.0" edition = "2021" authors = [ "Oliver Tale-Yazdi" ] description = "Analyze, Fix and Format features in your Rust workspace." license = "GPL-3.0-only" repository = "https://github.com/ggwpez/zepter" # Update the README if you change this: -rust-version = "1.78" +rust-version = "1.82" keywords = ["features", "linting", "formatting"] categories = ["development-tools"] diff --git a/tests/ui/config/v1/basic.yaml b/tests/ui/config/v1/basic.yaml index 4bfd64f..211ed1e 100644 --- a/tests/ui/config/v1/basic.yaml +++ b/tests/ui/config/v1/basic.yaml @@ -3,25 +3,25 @@ crates: cases: - cmd: run default stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version - cmd: run stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version - cmd: '' stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version - cmd: run my_version stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'my_version' [INFO] 1/1 --version @@ -36,7 +36,7 @@ cases: [INFO] 1/1 debug --no-benchmark - cmd: run both stdout: | - zepter 1.78.2 + zepter 1.82.0 Num workspace members: 1 Num dependencies: 1 DAG nodes: 0, links: 0 diff --git a/tests/ui/config/v1/finds_all.yaml b/tests/ui/config/v1/finds_all.yaml index 6fb91bc..0cbdcdc 100644 --- a/tests/ui/config/v1/finds_all.yaml +++ b/tests/ui/config/v1/finds_all.yaml @@ -3,7 +3,7 @@ crates: cases: - cmd: '' stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -19,7 +19,7 @@ cases: - [ '--version' ] - cmd: '' stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -35,7 +35,7 @@ cases: - [ '--version' ] - cmd: '' stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -51,7 +51,7 @@ cases: - [ '--version' ] - cmd: run default stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -67,7 +67,7 @@ cases: - [ '--version' ] - cmd: run default stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -83,7 +83,7 @@ cases: - [ '--version' ] - cmd: run default stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -99,7 +99,7 @@ cases: - [ '--version' ] - cmd: run default --config .cargo/polkadot.yaml stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version @@ -115,7 +115,7 @@ cases: - [ '--version' ] - cmd: run default -c .cargo/polkadot.yaml stdout: | - zepter 1.78.2 + zepter 1.82.0 stderr: | [INFO] Running workflow 'default' [INFO] 1/1 --version diff --git a/tests/ui/config/v1/version_bin.yaml b/tests/ui/config/v1/version_bin.yaml index 02383ae..2f06479 100644 --- a/tests/ui/config/v1/version_bin.yaml +++ b/tests/ui/config/v1/version_bin.yaml @@ -5,7 +5,7 @@ cases: stderr: |2 thread 'main' panicked at src/cmd/run.rs:27:46: - Invalid config file: "Config file version is too new. The file requires at least version 2.0.0, but the current version is 1.78.2. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`." + Invalid config file: "Config file version is too new. The file requires at least version 2.0.0, but the current version is 1.82.0. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`." note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace code: 101 - cmd: run default --check-cfg-compatibility=off @@ -15,7 +15,7 @@ cases: [INFO] Running workflow 'default' thread 'main' panicked at src/cmd/run.rs:27:46: - Invalid config file: "Config file version is too new. The file requires at least version 2.0.0, but the current version is 1.78.2. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`." + Invalid config file: "Config file version is too new. The file requires at least version 2.0.0, but the current version is 1.82.0. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`." note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace code: 1 configs: diff --git a/tests/ui/root-args/version.yaml b/tests/ui/root-args/version.yaml index b1ae8d3..50872f7 100644 --- a/tests/ui/root-args/version.yaml +++ b/tests/ui/root-args/version.yaml @@ -2,7 +2,7 @@ crates: [] cases: - cmd: --version stdout: | - zepter 1.78.2 + zepter 1.82.0 - cmd: -V stdout: | - zepter 1.78.2 + zepter 1.82.0 From 3a5732b3fac0482c04827fa5cab8ffa1c08078f8 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 24 Jul 2025 02:32:41 +0200 Subject: [PATCH 6/6] fix Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/license-header.yml | 2 +- benches/dag.rs | 3 ++- src/cmd/lint.rs | 8 +++++--- src/cmd/mod.rs | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.yml index 4b3b5d7..08c71e7 100644 --- a/.github/workflows/license-header.yml +++ b/.github/workflows/license-header.yml @@ -19,4 +19,4 @@ jobs: with: fetch-depth: 1 - name: SPDX Header - run: python .github/header.py .github/HEADER . + run: python3 .github/header.py .github/HEADER . diff --git a/benches/dag.rs b/benches/dag.rs index 38d74e3..50fd78a 100644 --- a/benches/dag.rs +++ b/benches/dag.rs @@ -1,8 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-only // SPDX-FileCopyrightText: Oliver Tale-Yazdi -use criterion::{black_box, criterion_group, criterion_main, Criterion}; +use criterion::{criterion_group, criterion_main, Criterion}; use rand::{Rng, SeedableRng}; +use std::hint::black_box; use zepter::{cmd::lint::build_feature_dag, prelude::*}; fn build_dag(nodes: usize, edges: usize) -> Dag { diff --git a/src/cmd/lint.rs b/src/cmd/lint.rs index 44edebf..0756b64 100644 --- a/src/cmd/lint.rs +++ b/src/cmd/lint.rs @@ -527,10 +527,12 @@ impl PropagateFeatureCmd { continue } - if let Some((_, lhs_ignore)) = - ignore_missing_propagate.iter().find(|(c, _)| pkg.name.to_string() == c.0 && c.1 == feature) + if let Some((_, lhs_ignore)) = ignore_missing_propagate + .iter() + .find(|(c, _)| pkg.name.to_string() == c.0 && c.1 == feature) { - if lhs_ignore.iter().any(|i| dep.pkg.name.to_string() == i.0 && i.1 == feature) { + if lhs_ignore.iter().any(|i| dep.pkg.name.to_string() == i.0 && i.1 == feature) + { continue } } diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs index f3f3642..4582c65 100644 --- a/src/cmd/mod.rs +++ b/src/cmd/mod.rs @@ -299,7 +299,8 @@ pub(crate) fn resolve_dep_from_graph( ) -> Option { let dep_name = dep.rename.clone().unwrap_or(dep.name.clone()).replace('-', "_"); let resolved_pkg = resolve.nodes.iter().find(|node| node.id == pkg.id)?; - let resolved_dep_id = resolved_pkg.deps.iter().find(|node| node.name.to_string() == dep_name)?; + let resolved_dep_id = + resolved_pkg.deps.iter().find(|node| node.name.to_string() == dep_name)?; let resolve_dep = meta.packages.iter().find(|pkg| pkg.id == resolved_dep_id.pkg)?; Some(RenamedPackage::new(resolve_dep.clone(), dep.rename.clone(), dep.optional))