From 3a6c654dc2939b5979c47d8fbd14932741f8d1d1 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 16 Aug 2021 19:51:33 +0800 Subject: [PATCH] Fix #102, bump patch level --- CHANGELOG.md | 4 ++++ Cargo.lock | 19 +++++++++---------- Cargo.toml | 4 ++-- src/options.rs | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d049f7de..2602a47d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +#### v2.14.5 + +* Fix installation via `cargo install dua-cli`. Please note that it might break again as it still depends on the unsable `clap-3 beta 4`. Even when pinning it breakage is possible as its dependencies itself aren't pinned. + #### v2.14.4 * upgrade depencies diff --git a/Cargo.lock b/Cargo.lock index 604f1955..b75ef5a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,9 +76,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", @@ -89,15 +89,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", @@ -252,7 +251,7 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "dua-cli" -version = "2.14.4" +version = "2.14.5" dependencies = [ "anyhow", "atty", @@ -532,9 +531,9 @@ dependencies = [ [[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" @@ -785,9 +784,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", ] diff --git a/Cargo.toml b/Cargo.toml index ff50c422..e8d751d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dua-cli" -version = "2.14.4" +version = "2.14.5" authors = ["Sebastian Thiel "] edition = "2018" repository = "https://github.com/Byron/dua-cli" @@ -19,7 +19,7 @@ trash-move = ["trash"] aggregate-scan-progress = [] [dependencies] -clap = "3.0.0-beta.2" +clap = "3.0.0-beta.4" jwalk = "0.6.0" byte-unit = "4" atty = "0.2.11" diff --git a/src/options.rs b/src/options.rs index 30cf8651..12354f15 100644 --- a/src/options.rs +++ b/src/options.rs @@ -53,7 +53,7 @@ impl From for LibraryByteFormat { #[derive(Debug, Clap)] #[clap(name = "dua", about = "A tool to learn about disk usage, fast!", version = clap::crate_version!())] #[clap(setting = clap::AppSettings::ColoredHelp)] -#[clap(setting = clap::AppSettings::GlobalVersion)] +#[clap(setting = clap::AppSettings::DisableVersionForSubcommands)] #[clap(override_usage = "dua [FLAGS] [OPTIONS] [SUBCOMMAND] [input]...")] pub struct Args { #[clap(subcommand)]