Update clap dependency

Author: qzed

Cargo.lock

@@ -13,7 +13,7 @@ build = "build.rs"
 [dependencies]
 anyhow = "1.0.57"
 atty = "0.2.14"
-clap = "2.33.3"
+clap = { version = "3.1.12", features = ["cargo"] }
 dbus = "0.9.5"
 dbus-tokio = "0.7.5"
 dbus-crossroads = "0.5.0"
@@ -30,4 +30,5 @@ tracing = "0.1.34"
 tracing-subscriber = { version = "0.3.11", features = ["std", "env-filter"] }
 
 [build-dependencies]
-clap = "2.33.3"
+clap = "3.1.12"
+clap_complete = "3.1.2"

surface-dtx-daemon/Cargo.toml

@@ -1,5 +1,5 @@
 use std::env;
-use clap::Shell;
+use clap_complete::shells;
 
 include!("src/cli.rs");
 
@@ -10,7 +10,7 @@ fn main() {
         .unwrap();
 
     let mut app = app();
-    app.gen_completions("surface-dtx-daemon", Shell::Bash, &outdir);
-    app.gen_completions("surface-dtx-daemon", Shell::Zsh,  &outdir);
-    app.gen_completions("surface-dtx-daemon", Shell::Fish, &outdir);
+    clap_complete::generate_to(shells::Bash, &mut app, "surface-dtx-daemon", &outdir).unwrap();
+    clap_complete::generate_to(shells::Zsh,  &mut app, "surface-dtx-daemon", &outdir).unwrap();
+    clap_complete::generate_to(shells::Fish, &mut app, "surface-dtx-daemon", &outdir).unwrap();
 }

surface-dtx-daemon/build.rs

@@ -1,17 +1,17 @@
-use clap::{App, Arg};
+use clap::{Arg, Command};
 
-pub fn app() -> App<'static, 'static> {
-    App::new("Surface DTX Daemon")
+pub fn app() -> Command<'static> {
+    Command::new("Surface DTX Daemon")
         .about(clap::crate_description!())
         .version(clap::crate_version!())
         .author(clap::crate_authors!())
-        .arg(Arg::with_name("config")
-            .short("c")
+        .arg(Arg::new("config")
+            .short('c')
             .long("config")
             .value_name("FILE")
             .help("Use the specified config file")
             .takes_value(true))
-        .arg(Arg::with_name("no-log-time")
+        .arg(Arg::new("no-log-time")
             .long("no-log-time")
             .help("Do not emit timestamps in log"))
 }

surface-dtx-daemon/src/cli.rs

@@ -13,7 +13,7 @@ build = "build.rs"
 [dependencies]
 anyhow = "1.0.57"
 atty = "0.2.14"
-clap = "2.33.3"
+clap = { version = "3.1.12", features = ["cargo"] }
 dbus = "0.9.5"
 dbus-tokio = "0.7.5"
 futures = "0.3.21"
@@ -25,4 +25,5 @@ tracing = "0.1.34"
 tracing-subscriber = { version = "0.3.11", features = ["std", "env-filter"] }
 
 [build-dependencies]
-clap = "2.33.3"
+clap = "3.1.12"
+clap_complete = "3.1.2"

surface-dtx-userd/Cargo.toml

@@ -1,5 +1,5 @@
 use std::env;
-use clap::Shell;
+use clap_complete::shells;
 
 include!("src/cli.rs");
 
@@ -10,7 +10,7 @@ fn main() {
         .unwrap();
 
     let mut app = app();
-    app.gen_completions("surface-dtx-userd", Shell::Bash, &outdir);
-    app.gen_completions("surface-dtx-userd", Shell::Zsh,  &outdir);
-    app.gen_completions("surface-dtx-userd", Shell::Fish, &outdir);
+    clap_complete::generate_to(shells::Bash, &mut app, "surface-dtx-userd", &outdir).unwrap();
+    clap_complete::generate_to(shells::Zsh,  &mut app, "surface-dtx-userd", &outdir).unwrap();
+    clap_complete::generate_to(shells::Fish, &mut app, "surface-dtx-userd", &outdir).unwrap();
 }

surface-dtx-userd/build.rs

@@ -1,17 +1,17 @@
-use clap::{App, Arg};
+use clap::{Arg, Command};
 
-pub fn app() -> App<'static, 'static> {
-    App::new("Surface DTX User Daemon")
+pub fn app() -> Command<'static> {
+    Command::new("Surface DTX User Daemon")
         .about(clap::crate_description!())
         .version(clap::crate_version!())
         .author(clap::crate_authors!())
-        .arg(Arg::with_name("config")
-            .short("c")
+        .arg(Arg::new("config")
+            .short('c')
             .long("config")
             .value_name("FILE")
             .help("Use the specified config file")
             .takes_value(true))
-        .arg(Arg::with_name("no-log-time")
+        .arg(Arg::new("no-log-time")
             .long("no-log-time")
             .help("Do not emit timestamps in log"))
 }