From e9a2b38e1526b7ed0781b2ad2f19c73b8595f289 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 2 Jul 2026 12:18:12 +0000 Subject: [PATCH] build(cargo): Update cargo dependencies --- Cargo.lock | 289 ++--------------------------------------------------- Cargo.toml | 4 +- src/lib.rs | 49 +++++---- 3 files changed, 36 insertions(+), 306 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10e380b..469948b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,17 +285,6 @@ dependencies = [ "crypto-common", ] -[[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 = "encode_unicode" version = "1.0.0" @@ -342,15 +331,6 @@ 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" @@ -455,15 +435,14 @@ dependencies = [ [[package]] name = "git2" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" +checksum = "ddddbf932745a6be37109b6112d3ee09696106f848449069d3a57bba937ab82e" dependencies = [ "bitflags", "libc", "libgit2-sys", "log", - "url", ] [[package]] @@ -518,113 +497,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" -dependencies = [ - "displaydoc", - "potential_utf", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" -dependencies = [ - "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.14.0" @@ -661,9 +533,9 @@ dependencies = [ [[package]] name = "insta-cmd" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffeeefa927925cced49ccb01bf3e57c9d4cd132df21e576eb9415baeab2d3de6" +checksum = "bffdf4af1db390cf0401535d7c1303cd079a074d28d8473b026fdb6559c41403" dependencies = [ "insta", "serde", @@ -716,9 +588,9 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libgit2-sys" -version = "0.18.2+1.9.1" +version = "0.18.5+1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222" +checksum = "005d6ae6eac1912906073e069f7db60b1fa98e052a68227824afe3e3a1c59ca2" dependencies = [ "cc", "libc", @@ -744,12 +616,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" -[[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" @@ -789,12 +655,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pest" version = "2.8.1" @@ -857,15 +717,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[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" @@ -1158,12 +1009,6 @@ 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 = "stringcase" version = "0.4.0" @@ -1187,17 +1032,6 @@ 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.20.0" @@ -1231,16 +1065,6 @@ 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 = "toml" version = "1.1.2+spec-1.1.0" @@ -1325,23 +1149,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[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" @@ -1662,36 +1469,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "writeable" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" - -[[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 = "zerocopy" version = "0.8.30" @@ -1712,60 +1489,6 @@ dependencies = [ "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", -] - [[package]] name = "zmij" version = "1.0.21" diff --git a/Cargo.toml b/Cargo.toml index 951fdb0..74c1c77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["git", "versioning", "semver", "conventional-commits"] categories = ["development-tools", "command-line-utilities"] [dependencies] -git2 = { version = "0.20.2", default-features = false, features = ["vendored-libgit2"] } +git2 = { version = "0.21.0", default-features = false, features = ["vendored-libgit2"] } semver = "1.0.20" clap = { version = "4.4.11", features = ["derive"] } regex = "1.10.2" @@ -30,4 +30,4 @@ tempfile = "3.8.1" rstest = "0.26.1" rstest_reuse = "0.7.0" insta = { version = "1.43.1", features = ["filters"] } -insta-cmd = "0.6.0" +insta-cmd = "0.7.0" diff --git a/src/lib.rs b/src/lib.rs index 50585bb..04ff73f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -177,8 +177,8 @@ impl GitVersioner { } match reference.shorthand() { - None => Err(anyhow!("Name for branch could not be determined")), - Some(name) => Ok(name.to_string()), + Err(_) => Err(anyhow!("Name for branch could not be determined")), + Ok(name) => Ok(name.to_string()), } } @@ -216,7 +216,8 @@ impl GitVersioner { let mut version_tags = HashSet::new(); let tag_names = self.repo.tag_names(None)?; for tag_name in tag_names.iter().flatten() { - if let Some(version) = self.version_matching_in(tag_name, condition) + if let Some(tag_name) = tag_name + && let Some(version) = self.version_matching_in(tag_name, condition) && let Some(commit_id) = self.tag_id_for(tag_name) { version_tags.insert(VersionSource { @@ -252,12 +253,14 @@ impl GitVersioner { let mut matching_tags = Vec::new(); let tag_names = self.repo.tag_names(None)?; for tag_name in tag_names.iter().flatten() { - if let Some(tag_version) = self.version_matching_in(tag_name, &|tag_version| { - tag_version.major == version.major - && tag_version.minor == version.minor - && tag_version.patch == version.patch - && !tag_version.pre.is_empty() - }) { + if let Some(tag_name) = tag_name + && let Some(tag_version) = self.version_matching_in(tag_name, &|tag_version| { + tag_version.major == version.major + && tag_version.minor == version.minor + && tag_version.patch == version.patch + && !tag_version.pre.is_empty() + }) + { matching_tags.push((tag_version, tag_name.to_string())); } } @@ -311,7 +314,8 @@ impl GitVersioner { let tag_names = self.repo.tag_names(None)?; for tag_name in tag_names.iter().flatten() { - if let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) + if let Some(tag_name) = tag_name + && let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) && let Some(commit_id) = self.tag_id_for(tag_name) && let Ok(commit) = self.repo.find_commit(commit_id) && Self::commit_year_for(&commit) == year @@ -365,7 +369,8 @@ impl GitVersioner { let tag_names = self.repo.tag_names(None)?; for tag_name in tag_names.iter().flatten() { - if let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) + if let Some(tag_name) = tag_name + && let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) && tag_version.major == version.major && tag_version.minor == version.minor && tag_version.patch == 0 @@ -388,7 +393,8 @@ impl GitVersioner { let mut line_releases = Vec::new(); for tag_name in tag_names.iter().flatten() { - if let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) + if let Some(tag_name) = tag_name + && let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) && tag_version.major == major && tag_version.minor == minor && let Some(commit_id) = self.tag_id_for(tag_name) @@ -407,7 +413,8 @@ impl GitVersioner { let mut earlier_releases_in_line_year = HashSet::new(); for tag_name in tag_names.iter().flatten() { - if let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) + if let Some(tag_name) = tag_name + && let Some(tag_version) = self.version_matching_in(tag_name, &IS_STABLE_VERSION) && (tag_version.major, tag_version.minor) < (major, minor) && let Some(commit_id) = self.tag_id_for(tag_name) && let Ok(commit) = self.repo.find_commit(commit_id) @@ -437,7 +444,7 @@ impl GitVersioner { continue; } - if let Some(message) = commit.message() + if let Ok(message) = commit.message() && let Ok(version) = Version::parse(message.trim()) && version.major == major && version.minor == minor @@ -483,7 +490,7 @@ impl GitVersioner { fn remote_version_branches(&self) -> Result> { let mut version_branches = HashSet::new(); - for remote in self.repo.remotes()?.iter().flatten() { + for remote in self.repo.remotes()?.iter().flatten().flatten() { let branches = self.repo.branches(Some(git2::BranchType::Remote))?; for branch in branches { let (branch, _) = branch?; @@ -695,7 +702,7 @@ impl GitVersioner { let version = release_version.clone(); let source = VersionSource { version, - commit_id: Oid::zero(), + commit_id: Oid::ZERO_SHA1, is_tag: false, }; let major_minor_patch_source = source.clone(); @@ -752,12 +759,12 @@ impl GitVersioner { Version::new(0, 1, 0), VersionSource { version: Version::new(0, 1, 0), - commit_id: Oid::zero(), + commit_id: Oid::ZERO_SHA1, is_tag: false, }, VersionSource { version: Version::new(0, 1, 0), - commit_id: Oid::zero(), + commit_id: Oid::ZERO_SHA1, is_tag: false, }, 0, @@ -774,7 +781,7 @@ impl GitVersioner { .unwrap_or(fallback); let distance = match closest_branch { - None => self.count_commits_between(head_id, Oid::zero())?, + None => self.count_commits_between(head_id, Oid::ZERO_SHA1)?, Some(branch) => branch.distance, }; @@ -856,7 +863,7 @@ impl GitVersioner { } if let CommitBump::Patch = commit_bump && let Ok(commit) = self.repo.find_commit(oid) - && let Some(message) = commit.message() + && let Ok(message) = commit.message() && let Ok(conventional_commit) = parse(message.trim()) { if conventional_commit.is_breaking_change { @@ -925,7 +932,7 @@ impl GitVersioner { fn no_source() -> VersionSource { VersionSource { version: Version::parse("0.0.0").unwrap(), - commit_id: Oid::zero(), + commit_id: Oid::ZERO_SHA1, is_tag: false, } }