Update clap to 4.0.0

This commit is contained in:
Andrey Golovizin 2022-09-28 11:34:42 +02:00
parent 97215faa9c
commit 0ecb11ea7b
3 changed files with 14 additions and 44 deletions

42
Cargo.lock generated
View file

@ -34,12 +34,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]] [[package]]
name = "azirevpn" name = "azirevpn"
version = "0.1.0" version = "0.1.0"
@ -93,26 +87,24 @@ checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.22" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" checksum = "422592638015fe46332afb8fbf9361d9fa2d498d05c0c384e28710b4639e33a5"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
"clap_derive", "clap_derive",
"clap_lex", "clap_lex",
"indexmap",
"once_cell", "once_cell",
"strsim", "strsim",
"termcolor", "termcolor",
"textwrap",
] ]
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "3.2.18" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" checksum = "677ca5a153ca1804d4bf3e9d45f0f6b5ba4f950de155e373d457cd5f154cca9c"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro-error", "proc-macro-error",
@ -123,9 +115,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.2.4" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
dependencies = [ dependencies = [
"os_str_bytes", "os_str_bytes",
] ]
@ -171,12 +163,6 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.4.0" version = "0.4.0"
@ -208,16 +194,6 @@ dependencies = [
"unicode-normalization", "unicode-normalization",
] ]
[[package]]
name = "indexmap"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
"autocfg",
"hashbrown",
]
[[package]] [[package]]
name = "ipnet" name = "ipnet"
version = "2.5.0" version = "2.5.0"
@ -458,12 +434,6 @@ dependencies = [
"winapi-util", "winapi-util",
] ]
[[package]]
name = "textwrap"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
[[package]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.6.0" version = "1.6.0"

View file

@ -9,7 +9,7 @@ license = "MIT"
[dependencies] [dependencies]
anyhow = "1.0.65" anyhow = "1.0.65"
clap = { version = "3.2.22", features = ["derive"] } clap = { version = "4.0.0", features = ["derive"] }
env_logger = "0.9.1" env_logger = "0.9.1"
ipnet = "2.5.0" ipnet = "2.5.0"
log = "0.4.17" log = "0.4.17"

View file

@ -4,20 +4,20 @@ use std::process;
use log::debug; use log::debug;
use clap::Parser; use clap::{Parser, Subcommand};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
const BASE_URL: &str = "https://api.azirevpn.com/v1"; const BASE_URL: &str = "https://api.azirevpn.com/v1";
/// AzireVPN client /// AzireVPN client
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[clap(version)] #[command(version)]
struct Opts { struct Opts {
/// Enables JSON output /// Enables JSON output
#[clap(short, long)] #[arg(short, long)]
json: bool, json: bool,
#[clap(subcommand)] #[command(subcommand)]
command: Command, command: Command,
} }
@ -27,14 +27,14 @@ struct ConfigOpts {
username: String, username: String,
token: String, token: String,
#[clap(short, long)] #[arg(short, long)]
no_dns: bool, no_dns: bool,
#[clap(short = '4', long)] #[arg(short = '4', long)]
no_ipv6: bool, no_ipv6: bool,
} }
#[derive(Parser, Debug)] #[derive(Subcommand, Debug)]
enum Command { enum Command {
/// Prints the list of VPN endpoints /// Prints the list of VPN endpoints
Endpoints, Endpoints,