From 14de3b34c130b576633569d4a2eaa668bd024e29 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sun, 18 Dec 2022 14:18:37 +0100 Subject: [PATCH 1/4] chore: fix clippy warnings in gradle module (#4736) --- src/modules/gradle.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/gradle.rs b/src/modules/gradle.rs index e19c9a4c9..cae79e5e4 100644 --- a/src/modules/gradle.rs +++ b/src/modules/gradle.rs @@ -89,7 +89,7 @@ fn get_wrapper_properties_file(context: &Context, recursive: bool) -> Option Option Date: Sun, 18 Dec 2022 13:24:46 +0000 Subject: [PATCH 2/4] build(deps): update rust crate process_control to 4.0.1 --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1bd12c06f..9f1871a0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2253,14 +2253,14 @@ dependencies = [ [[package]] name = "process_control" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5c066e788f2eca1f84fbb2da941dfa255f220d57205350e60c3d8e60c6a735" +checksum = "e1c4e268b11b4a74bd165fc416575cfc5d5d9bf97e647c354be6802987f9724a" dependencies = [ "crossbeam-channel", "libc", "signal-hook 0.3.14", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b7ec6870b..a58e79860 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ versions = "4.1.0" which = "4.3.0" yaml-rust = "0.4.5" -process_control = { version = "4.0.0", features = ["crossbeam-channel"] } +process_control = { version = "4.0.1", features = ["crossbeam-channel"] } guess_host_triple = "0.1.3" home = "0.5.4" From eb5a01b773e0fb1860034a93fcf0dbe25d2a0aad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 Dec 2022 13:46:33 +0000 Subject: [PATCH 3/4] build(deps): update rust crate semver to 1.0.15 --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f1871a0b..141b0df97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2548,9 +2548,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "3bfa246f936730408c0abee392cc1a50b118ece708c7f630516defd64480c7d8" [[package]] name = "semver-parser" @@ -2775,7 +2775,7 @@ dependencies = [ "regex", "rust-ini", "schemars", - "semver 1.0.14", + "semver 1.0.15", "serde", "serde_json", "sha1", diff --git a/Cargo.toml b/Cargo.toml index a58e79860..cfca7afba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ rand = "0.8.5" rayon = "1.6.1" regex = "1.7.0" rust-ini = "0.18.0" -semver = "1.0.14" +semver = "1.0.15" serde = { version = "1.0.150", features = ["derive"] } serde_json = "1.0.89" sha1 = "0.10.5" From 27d167b7a202cd1da39a731813df155dacb4c81b Mon Sep 17 00:00:00 2001 From: Foster Z <72973015+Foster0123@users.noreply.github.com> Date: Mon, 19 Dec 2022 00:03:01 +0530 Subject: [PATCH 4/4] fix(git_commit): fix potential test failure (#4734) Changes git command used in tests to avoid potential failures with lightweight tags. --- src/modules/git_commit.rs | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/modules/git_commit.rs b/src/modules/git_commit.rs index bb49dc89e..122c27b58 100644 --- a/src/modules/git_commit.rs +++ b/src/modules/git_commit.rs @@ -373,16 +373,7 @@ mod tests { .output()?; let git_tag = create_command("git")? - .args([ - "for-each-ref", - "--contains", - "HEAD", - "--sort=-taggerdate", - "--count=1", - "--format", - "%(refname:short)", - "refs/tags", - ]) + .args(["describe", "--tags"]) .current_dir(repo_dir.path()) .output()? .stdout; @@ -443,16 +434,7 @@ mod tests { .output()?; let git_tag = create_command("git")? - .args([ - "for-each-ref", - "--contains", - "HEAD", - "--sort=-taggerdate", - "--count=1", - "--format", - "%(refname:short)", - "refs/tags", - ]) + .args(["describe", "--tags"]) .current_dir(repo_dir.path()) .output()? .stdout;