Update clap to 3.0.0 final release

PyO3 · Jan 1, 2022 · f224aab · f224aab
1 parent 18fe15d
commit f224aab
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,9 +58,9 @@ console = "0.15.0"
 minijinja = "0.10.0"
 lddtree = "0.2.0"
 cc = "1.0.72"
-clap = { version = "3.0.0-rc.7", features = ["derive", "env", "wrap_help"] }
-clap_generate = "3.0.0-rc.7"
-clap_generate_fig = "3.0.0-rc.7"
+clap = { version = "3.0.0", features = ["derive", "env", "wrap_help"] }
+clap_complete = "3.0.0"
+clap_complete_fig = "3.0.0"
 
 [dev-dependencies]
 indoc = "1.0.3"

diff --git a/src/main.rs b/src/main.rs
@@ -5,7 +5,7 @@
 
 use anyhow::{bail, Context, Result};
 use clap::{ArgEnum, IntoApp, Parser};
-use clap_generate::Generator;
+use clap_complete::Generator;
 use maturin::{
     develop, init_project, new_project, write_dist_info, BridgeModel, BuildOptions,
     GenerateProjectOptions, PathWriter, PlatformTag, PythonInterpreter, Target,
@@ -428,19 +428,19 @@ fn run() -> Result<()> {
             match shell {
                 Shell::Fig => {
                     app.set_bin_name(env!("CARGO_BIN_NAME"));
-                    let fig = clap_generate_fig::Fig;
+                    let fig = clap_complete_fig::Fig;
                     fig.generate(&app, &mut io::stdout());
                 }
                 _ => {
                     let shell = match shell {
-                        Shell::Bash => clap_generate::Shell::Bash,
-                        Shell::Elvish => clap_generate::Shell::Elvish,
-                        Shell::Fish => clap_generate::Shell::Fish,
-                        Shell::PowerShell => clap_generate::Shell::PowerShell,
-                        Shell::Zsh => clap_generate::Shell::Zsh,
+                        Shell::Bash => clap_complete::Shell::Bash,
+                        Shell::Elvish => clap_complete::Shell::Elvish,
+                        Shell::Fish => clap_complete::Shell::Fish,
+                        Shell::PowerShell => clap_complete::Shell::PowerShell,
+                        Shell::Zsh => clap_complete::Shell::Zsh,
                         Shell::Fig => unreachable!(),
                     };
-                    clap_generate::generate(
+                    clap_complete::generate(
                         shell,
                         &mut app,
                         env!("CARGO_BIN_NAME"),