Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump clap from 4.4.6 to 4.4.10 #82

Merged
merged 6 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .rtx.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
rust = '1.71.0'
rust = "1.74.0"
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
1 change: 0 additions & 1 deletion src/cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/completion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
Expand All @@ -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(())
Expand All @@ -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(())
Expand All @@ -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(())
Expand Down
2 changes: 1 addition & 1 deletion tests/yadayada-template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down