From b6b024c452635d672e3dc58707ef86cb944a52ab Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Mon, 3 Jan 2022 05:52:55 +0530
Subject: [PATCH] Upgrade to clap v3 stable

---
 Cargo.lock       | 80 ++++++++++++++++++++++++------------------------
 Cargo.toml       |  8 ++---
 build.rs         |  6 ++--
 xtask/Cargo.toml |  2 +-
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c204f13..38f2660 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -123,9 +123,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.0.0-rc.8"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "484f17839417b695a6f4a75c20e49820ba0a1d00aa41ebd8ba0e5dfe0fbc3b74"
+checksum = "d17bf219fcd37199b9a29e00ba65dfb8cd5b2688b7297ec14ff829c40ac50ca9"
 dependencies = [
  "atty",
  "bitflags",
@@ -139,10 +139,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "clap_derive"
-version = "3.0.0-rc.8"
+name = "clap_complete"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a86d4ec799f94ddc4a4a4edf652f89b360219905f86edcb8abe5974dfef135b8"
+checksum = "60d123fbea4c5d9799cffd44051e2125c880efd23b3b7c529baf3ea5508c8736"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_complete_fig"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a11b194eb73a60fc0c8af9a2164129c86a503a3290d99bea427cac5bf5f5aecd"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
+[[package]]
+name = "clap_derive"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b9752c030a14235a0bd5ef3ad60a1dcac8468c30921327fc8af36b20c790b9"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -151,25 +170,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "clap_generate"
-version = "3.0.0-rc.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46edf9e899ef90f3cefafb75dfae4c52746911cb905408bdf147a4bfe6fd72aa"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_generate_fig"
-version = "3.0.0-rc.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb18e26b66468ccfcbd787003403c1307dfe913c08c157c8d0f3b6e270015e2"
-dependencies = [
- "clap",
- "clap_generate",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.5"
@@ -400,9 +400,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "predicates"
@@ -457,18 +457,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.34"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
 dependencies = [
  "proc-macro2",
 ]
@@ -603,18 +603,18 @@ checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
 
 [[package]]
 name = "serde"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008"
+checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276"
+checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -635,9 +635,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.83"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1dfb999630e338648c83e91c59a4e9fb7620f520c3194b6b89e276f2f1959"
+checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -722,9 +722,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[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"
@@ -802,8 +802,8 @@ dependencies = [
  "assert_cmd",
  "bincode",
  "clap",
- "clap_generate",
- "clap_generate_fig",
+ "clap_complete",
+ "clap_complete_fig",
  "dirs",
  "dunce",
  "glob",
diff --git a/Cargo.toml b/Cargo.toml
index b509a59..d919da1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ members = ["xtask/"]
 anyhow = "1.0.32"
 askama = { version = "0.11.0", default-features = false }
 bincode = "1.3.1"
-clap = { version = "=3.0.0-rc.8", features = ["derive"] }
+clap = { version = "3.0.0", features = ["derive"] }
 dirs = "4.0.0"
 dunce = "1.0.1"
 glob = "0.3.0"
@@ -36,9 +36,9 @@ rand = { version = "0.8.4", features = [
 ], default-features = false }
 
 [build-dependencies]
-clap = { version = "=3.0.0-rc.8", features = ["derive"] }
-clap_generate = "=3.0.0-rc.8"
-clap_generate_fig = "=3.0.0-rc.8"
+clap = { version = "3.0.0", features = ["derive"] }
+clap_complete = "3.0.0"
+clap_complete_fig = "3.0.0"
 
 [dev-dependencies]
 assert_cmd = "2.0.0"
diff --git a/build.rs b/build.rs
index deeedc6..57df123 100644
--- a/build.rs
+++ b/build.rs
@@ -37,9 +37,9 @@ fn generate_completions() -> io::Result<()> {
 
     use app::App;
     use clap::IntoApp;
-    use clap_generate::generate_to;
-    use clap_generate::generators::{Bash, Elvish, Fish, PowerShell, Zsh};
-    use clap_generate_fig::Fig;
+    use clap_complete::generate_to;
+    use clap_complete::Shell::{Bash, Elvish, Fish, PowerShell, Zsh};
+    use clap_complete_fig::Fig;
 
     let app = &mut App::into_app();
     let bin_name = env!("CARGO_PKG_NAME");
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 094e4a7..5f48bcd 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -6,6 +6,6 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.32"
-clap = { version = "=3.0.0-rc.8", features = ["derive"] }
+clap = { version = "3.0.0", features = ["derive"] }
 ignore = "0.4.18"
 shell-words = "1.0.0"