From 35ea23dad9071078ea302e52ff7c51482e657714 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Oct 2021 19:40:21 +0000 Subject: Bump clap from 3.0.0-beta.2 to 3.0.0-beta.5 Bumps [clap](https://github.com/clap-rs/clap) from 3.0.0-beta.2 to 3.0.0-beta.5. - [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/v3.0.0-beta.2...v3.0.0-beta.5) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 45 +++++++++++++++++++++++++-------------------- dotup_cli/Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da98040..4964acb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.0-beta.2" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142" +checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63" dependencies = [ "atty", "bitflags", @@ -107,15 +107,14 @@ dependencies = [ "strsim", "termcolor", "textwrap", - "unicode-width", - "vec_map", + "unicase", ] [[package]] name = "clap_derive" -version = "3.0.0-beta.2" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1" +checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3" dependencies = [ "heck", "proc-macro-error", @@ -292,9 +291,12 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "2.4.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85" +checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799" +dependencies = [ + "memchr", +] [[package]] name = "ppv-lite86" @@ -355,9 +357,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] @@ -495,9 +497,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.73" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -529,9 +531,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", ] @@ -571,6 +573,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-segmentation" version = "1.8.0" @@ -589,12 +600,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.3" diff --git a/dotup_cli/Cargo.toml b/dotup_cli/Cargo.toml index 9ae6beb..f82d36d 100644 --- a/dotup_cli/Cargo.toml +++ b/dotup_cli/Cargo.toml @@ -10,7 +10,7 @@ doc = false [dependencies] anyhow = "1.0" -clap = "3.0.0-beta.2" +clap = "3.0.0-beta.5" log = "0.4" [dependencies.dotup] -- cgit From 3b4b9aa6bc041f1e24761e94b1c052ad20f9ca66 Mon Sep 17 00:00:00 2001 From: diogo464 Date: Sat, 30 Oct 2021 20:55:22 +0100 Subject: update to compile with new clap version --- dotup_cli/src/commands/init.rs | 3 +-- dotup_cli/src/commands/install.rs | 5 ++--- dotup_cli/src/commands/link.rs | 3 +-- dotup_cli/src/commands/uninstall.rs | 5 ++--- dotup_cli/src/commands/unlink.rs | 3 +-- dotup_cli/src/main.rs | 9 ++++----- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dotup_cli/src/commands/init.rs b/dotup_cli/src/commands/init.rs index b894924..45129bf 100644 --- a/dotup_cli/src/commands/init.rs +++ b/dotup_cli/src/commands/init.rs @@ -4,8 +4,7 @@ use super::prelude::*; /// /// By default this will create the file in the current directory /// but the --depot flag can be used to change this path. -#[derive(Clap)] -#[clap(setting = AppSettings::ColoredHelp)] +#[derive(Parser)] pub struct Opts {} pub fn main(config: Config, opts: Opts) -> anyhow::Result<()> { diff --git a/dotup_cli/src/commands/install.rs b/dotup_cli/src/commands/install.rs index b56c5f7..e166a7b 100644 --- a/dotup_cli/src/commands/install.rs +++ b/dotup_cli/src/commands/install.rs @@ -6,8 +6,7 @@ use super::prelude::*; /// /// Installing a link will create the necessary directories. /// If a file or directory already exists at the location a link would be installed this command will fail. -#[derive(Clap)] -#[clap(setting = AppSettings::ColoredHelp)] +#[derive(Parser)] pub struct Opts { /// The location where links will be installed to. /// Defaults to the home directory. @@ -15,7 +14,7 @@ pub struct Opts { install_base: Option, /// The files/directories to install. - #[clap(required = true, min_values = 1, default_value = ".")] + #[clap(min_values = 1, default_value = ".")] paths: Vec, } diff --git a/dotup_cli/src/commands/link.rs b/dotup_cli/src/commands/link.rs index 66194e1..d1f61ea 100644 --- a/dotup_cli/src/commands/link.rs +++ b/dotup_cli/src/commands/link.rs @@ -10,8 +10,7 @@ use super::prelude::*; /// If a link is created for a file that already had a link then the old link will be overwritten. /// By default creating a link to a directory will recursively link all files under that /// directory, to actually link a directory use the --directory flag. -#[derive(Clap)] -#[clap(setting = AppSettings::ColoredHelp)] +#[derive(Parser)] pub struct Opts { /// Treats the paths as directories. This will create links to the actual directories instead /// of recursively linking all files under them. diff --git a/dotup_cli/src/commands/uninstall.rs b/dotup_cli/src/commands/uninstall.rs index a81d5e4..fdb1a0a 100644 --- a/dotup_cli/src/commands/uninstall.rs +++ b/dotup_cli/src/commands/uninstall.rs @@ -7,8 +7,7 @@ use super::prelude::*; /// Uninstalling a link for a file that didnt have a link will do nothing. /// Uninstalling a directory will recursively uninstall all files under it. /// Symlinks are only deleted if they were pointing to the correct file. -#[derive(Clap)] -#[clap(setting = AppSettings::ColoredHelp)] +#[derive(Parser)] pub struct Opts { /// The location where links will be uninstalled from. /// Defaults to home directory. @@ -16,7 +15,7 @@ pub struct Opts { install_base: Option, /// The files/directories to uninstall. - #[clap(required = true, min_values = 1, default_value = ".")] + #[clap(min_values = 1, default_value = ".")] paths: Vec, } diff --git a/dotup_cli/src/commands/unlink.rs b/dotup_cli/src/commands/unlink.rs index f33fe60..abe23e3 100644 --- a/dotup_cli/src/commands/unlink.rs +++ b/dotup_cli/src/commands/unlink.rs @@ -10,8 +10,7 @@ use super::prelude::*; /// This will recursively remove links. If a path is a directory then it will remove all links /// recursively. /// The links are not uninstall by default, see the --uninstall parameter. -#[derive(Clap)] -#[clap(setting = AppSettings::ColoredHelp)] +#[derive(Parser)] pub struct Opts { /// Specify the install base if the links are also to be uninstalled. #[clap(long)] diff --git a/dotup_cli/src/main.rs b/dotup_cli/src/main.rs index d500a7d..5f02e68 100644 --- a/dotup_cli/src/main.rs +++ b/dotup_cli/src/main.rs @@ -8,11 +8,11 @@ pub use config::Config; pub mod prelude { pub use super::{utils, Config}; - pub use clap::{AppSettings, Clap}; + pub use clap::{AppSettings, Parser}; pub use dotup::{Archive, Depot, DepotConfig, Link, LinkCreateParams, LinkID}; } -use clap::{AppSettings, Clap}; +use clap::{AppSettings, Parser}; use flexi_logger::Logger; use std::{ collections::HashMap, @@ -22,8 +22,7 @@ use std::{ use prelude::*; -#[derive(Clap)] -#[clap(setting = AppSettings::ColoredHelp)] +#[derive(Parser)] struct Opts { /// Path to the depot file. /// @@ -50,7 +49,7 @@ struct Opts { subcmd: SubCommand, } -#[derive(Clap)] +#[derive(Parser)] enum SubCommand { Init(commands::init::Opts), Link(commands::link::Opts), -- cgit