From a3bb1def61385118be6791623b81eb825a11ac5b Mon Sep 17 00:00:00 2001
From: Crypto-Spartan <accounts@cryptospartan.net>
Date: Wed, 5 Jan 2022 21:53:05 +0000
Subject: [PATCH] update clap to v3.0.4, replace clap_generate with
 clap_complete

---
 Cargo.lock | 68 ++++++++++++++++--------------------------------------
 Cargo.toml |  6 ++---
 build.rs   |  2 +-
 3 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b72af88..4992a1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,9 +134,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
+checksum = "d01c9347757e131122b19cd19a05c85805b68c2352a97b623efdc3c295290299"
 dependencies = [
  "atty",
  "bitflags",
@@ -147,14 +147,22 @@ dependencies = [
  "strsim",
  "termcolor",
  "textwrap",
- "unicase",
+]
+
+[[package]]
+name = "clap_complete"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a394f7ec0715b42a4e52b294984c27c9a61f77c8d82f7774c5198350be143f19"
+dependencies = [
+ "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.5"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
+checksum = "448c8b00367288ad41804ac7a9e0fe58f2324a36901cb5d6b6db58be86d1db8f"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -163,15 +171,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "clap_generate"
-version = "3.0.0-beta.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "097ab5db1c3417442270cd57c8dd39f6c3114d3ce09d595f9efddbb1fcfaa799"
-dependencies = [
- "clap",
-]
-
 [[package]]
 name = "console"
 version = "0.15.0"
@@ -274,12 +273,9 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -427,9 +423,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "os_str_bytes"
-version = "4.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
 dependencies = [
  "memchr",
 ]
@@ -442,7 +438,7 @@ dependencies = [
  "atty",
  "bzip2",
  "clap",
- "clap_generate",
+ "clap_complete",
  "flate2",
  "fs-err",
  "indicatif",
@@ -827,9 +823,6 @@ name = "textwrap"
 version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
-dependencies = [
- "unicode-width",
-]
 
 [[package]]
 name = "thiserror"
@@ -851,27 +844,6 @@ dependencies = [
  "syn",
 ]
 
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.2"
@@ -892,9 +864,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "wait-timeout"
diff --git a/Cargo.toml b/Cargo.toml
index 47f764a..f2d9a6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ description = "A command-line utility for easily compressing and decompressing f
 [dependencies]
 atty = "0.2.14"
 bzip2 = "0.4.3"
-clap = "=3.0.0-beta.5" # Keep it pinned while in beta!
+clap = { version = "3.0.4", features = ["derive", "env"] }
 flate2 = { version = "1.0.22", default-features = false }
 fs-err = "2.6.0"
 libc = "0.2.103"
@@ -32,8 +32,8 @@ tempfile = "3.2.0"
 indicatif = "0.16.2"
 
 [build-dependencies]
-clap = "=3.0.0-beta.5"
-clap_generate = "=3.0.0-beta.5"
+clap = { version = "3.0.4", features = ["derive", "env"] }
+clap_complete = "3.0.2"
 
 [dev-dependencies]
 assert_cmd = "2.0.2"
diff --git a/build.rs b/build.rs
index 1c1a0e9..a8b0677 100644
--- a/build.rs
+++ b/build.rs
@@ -1,7 +1,7 @@
 use std::{env, fs::create_dir_all, path::Path};
 
 use clap::{ArgEnum, IntoApp};
-use clap_generate::{generate_to, Shell};
+use clap_complete::{generate_to, Shell};
 
 include!("src/opts.rs");