From bf05f8a0437f5270e43007b213b3fe1ad52beb51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 01:24:50 +0000 Subject: [PATCH 1/6] Bump clap from 4.4.6 to 4.4.10 Bumps [clap](https://github.com/clap-rs/clap) from 4.4.6 to 4.4.10. - [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/v4.4.6...v4.4.10) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49fd081..b3c0b43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.6" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", "clap_derive", @@ -139,9 +139,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstream", "anstyle", @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" diff --git a/Cargo.toml b/Cargo.toml index 6609e04..e408350 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,14 +9,14 @@ default-run = "ya" build = "build.rs" [build-dependencies] -clap = { version = "4.4.6", features = ["derive", "cargo"], optional = true } +clap = { version = "4.4.10", features = ["derive", "cargo"], optional = true } clap_complete = { version = "4.4.3", optional = true } handlebars = { version = "4.3.7", optional = true } serde_json = { version = "1.0.107", optional = true } [dependencies] anyhow = "1.0.75" -clap = { version = "4.4.6", features = ["derive", "cargo"] } +clap = { version = "4.4.10", features = ["derive", "cargo"] } colored = "2.0.4" serde_yaml = "0.9.25" home = { version = "0.5.5", optional = true } From be6a689fb9599bf92d0bd1ffaf03569f5789039e Mon Sep 17 00:00:00 2001 From: Yousif Akbar <11247449+yhakbar@users.noreply.github.com> Date: Sun, 3 Dec 2023 21:38:43 -0500 Subject: [PATCH 2/6] Removing potentially unnecessary clones --- src/completion.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/completion.rs b/src/completion.rs index 41188ff..170ef42 100644 --- a/src/completion.rs +++ b/src/completion.rs @@ -36,7 +36,7 @@ pub fn build_bash_completion( bin_name: &str, ) -> Result<(), Error> { if let Some(outdir) = temp_dir().to_str() { - let path = generate_to(Bash, cmd, bin_name, outdir.clone())?; + let path = generate_to(Bash, cmd, bin_name, outdir)?; template_completion(path, release_dir, None)? } Ok(()) @@ -49,7 +49,7 @@ pub fn build_elvish_completion( bin_name: &str, ) -> Result<(), Error> { if let Some(outdir) = temp_dir().to_str() { - let path = generate_to(Elvish, cmd, bin_name, outdir.clone())?; + let path = generate_to(Elvish, cmd, bin_name, outdir)?; template_completion(path, release_dir, None)? } Ok(()) @@ -62,7 +62,7 @@ pub fn build_zsh_completion( bin_name: &str, ) -> Result<(), Error> { if let Some(outdir) = temp_dir().to_str() { - let path = generate_to(Zsh, cmd, bin_name, outdir.clone())?; + let path = generate_to(Zsh, cmd, bin_name, outdir)?; template_completion(path, release_dir, None)? } Ok(()) @@ -75,7 +75,7 @@ pub fn build_powershell_completion( bin_name: &str, ) -> Result<(), Error> { if let Some(outdir) = temp_dir().to_str() { - let path = generate_to(PowerShell, cmd, bin_name, outdir.clone())?; + let path = generate_to(PowerShell, cmd, bin_name, outdir)?; template_completion(path, release_dir, None)? } Ok(()) From 231bfd3d4fdc3a2a223f02f632d0a466e1a330f0 Mon Sep 17 00:00:00 2001 From: Yousif Akbar <11247449+yhakbar@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:28:00 -0500 Subject: [PATCH 3/6] Fixing `yadayada` install for docs workflow --- src/cmd.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cmd.rs b/src/cmd.rs index 0ee6063..5a35924 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -15,7 +15,6 @@ pub fn run_command_from_config( run_command_flags: &RunCommandFlags, extra_args: &[String], ) -> anyhow::Result<()> { - let command_name = command_name; let cmd = config.get(command_name).ok_or(anyhow::anyhow!( "Command {} not found in config", command_name From 4eaa17b7999f8d723b9b1fc23a44df09f414455b Mon Sep 17 00:00:00 2001 From: Yousif Akbar <11247449+yhakbar@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:28:08 -0500 Subject: [PATCH 4/6] Fixing `yadayada` install for docs workflow --- .github/workflows/docs.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 56500fa..af01ef5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,8 +29,11 @@ jobs: target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Install - run: cargo install --features yadayada --path . + - name: Install yadayada if not cached + run: | + if ! command -v yadayada > /dev/null; then + cargo install --features yadayada --path . + fi - name: Run docs stamp run: ya -c .config/ya/docs.yml stamp From 0ab84bcaeb227f8dfd123923cc5a4a0fbdad6c57 Mon Sep 17 00:00:00 2001 From: Yousif Akbar <11247449+yhakbar@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:31:21 -0500 Subject: [PATCH 5/6] Removing unnecessary reference --- tests/yadayada-template.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/yadayada-template.rs b/tests/yadayada-template.rs index 24ffb94..5f6e552 100644 --- a/tests/yadayada-template.rs +++ b/tests/yadayada-template.rs @@ -17,7 +17,7 @@ mod template { std::fs::create_dir(&templates_dir)?; let template_path = templates_dir.join("basic"); - std::fs::create_dir(&template_path)?; + std::fs::create_dir(template_path)?; for command in ["template", "t"] { yadayada().args([command, "ls"]) From fc9e8a342f27959dd3d712cae3e0d1f8920adb8e Mon Sep 17 00:00:00 2001 From: Yousif Akbar <11247449+yhakbar@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:31:36 -0500 Subject: [PATCH 6/6] Updating to latest rust version in `.rtx.toml` --- .rtx.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rtx.toml b/.rtx.toml index c1beff1..9eeb872 100644 --- a/.rtx.toml +++ b/.rtx.toml @@ -1,2 +1,2 @@ [tools] -rust = '1.71.0' +rust = "1.74.0"