update: Clap beta.4

This commit is contained in:
Arne Beer 2021-08-19 01:45:53 +02:00
parent 65987bd6e8
commit b020b2c362
No known key found for this signature in database
GPG key ID: CC9408F679023B65
4 changed files with 17 additions and 17 deletions

21
Cargo.lock generated
View file

@ -373,9 +373,9 @@ dependencies = [
[[package]]
name = "clap"
version = "3.0.0-beta.2"
version = "3.0.0-beta.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
dependencies = [
"atty",
"bitflags",
@ -386,15 +386,14 @@ dependencies = [
"strsim",
"termcolor",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "clap_derive"
version = "3.0.0-beta.2"
version = "3.0.0-beta.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
dependencies = [
"heck",
"proc-macro-error",
@ -405,9 +404,9 @@ dependencies = [
[[package]]
name = "clap_generate"
version = "3.0.0-beta.2"
version = "3.0.0-beta.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adf420f8b687b628d2915ccfd43a660c437a170432e3fbcb66944e8717a0d68f"
checksum = "2d9b1abef93569f290952eff3c4a0a92d6767bb5158db095b4dc9a512b1c3643"
dependencies = [
"clap",
]
@ -1030,9 +1029,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
[[package]]
name = "os_str_bytes"
version = "2.4.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
[[package]]
name = "output_vt100"
@ -1749,9 +1748,9 @@ dependencies = [
[[package]]
name = "textwrap"
version = "0.12.1"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
dependencies = [
"unicode-width",
]

View file

@ -49,8 +49,8 @@ serde_derive = "1"
log = "0.4"
simplelog = { version = "0.10", default-features = false }
clap = "3.0.0-beta.2"
clap_generate = "3.0.0-beta.2"
clap = "3.0.0-beta.4"
clap_generate = "3.0.0-beta.4"
crossterm = "0.20"
comfy-table= "4"

View file

@ -3,7 +3,7 @@ use std::path::PathBuf;
use chrono::prelude::*;
use chrono::Duration;
use chrono_english::*;
use clap::Clap;
use clap::{ArgEnum, Clap};
use pueue_lib::network::message::Signal;
@ -386,7 +386,7 @@ pub enum SubCommand {
},
}
#[derive(Clap, Debug, PartialEq)]
#[derive(Clap, Debug, PartialEq, ArgEnum)]
pub enum Shell {
Bash,
Elvish,

View file

@ -1,4 +1,4 @@
use anyhow::Result;
use anyhow::{Context, Result};
use clap::{Clap, IntoApp};
use clap_generate::generate_to;
use clap_generate::generators::*;
@ -26,7 +26,7 @@ async fn main() -> Result<()> {
{
let mut app = CliArguments::into_app();
app.set_bin_name("pueue");
match shell {
let completion_result = match shell {
Shell::Bash => generate_to::<Bash, _, _>(&mut app, "pueue", output_directory),
Shell::Elvish => generate_to::<Elvish, _, _>(&mut app, "pueue", output_directory),
Shell::Fish => generate_to::<Fish, _, _>(&mut app, "pueue", output_directory),
@ -35,6 +35,7 @@ async fn main() -> Result<()> {
}
Shell::Zsh => generate_to::<Zsh, _, _>(&mut app, "pueue", output_directory),
};
completion_result.context(format!("Failed to generate completions for {:?}", shell))?;
return Ok(());
}