Update clap to v3

Cargo.toml

@@ -8,35 +8,52 @@ keywords = ["dnscrypt", "encryption", "dns", "doh", "proxy"]
 license = "MIT"
 homepage = "https://github.com/jedisct1/encrypted-dns-server"
 repository = "https://github.com/jedisct1/encrypted-dns-server"
-categories = ["asynchronous", "network-programming","command-line-utilities"]
+categories = ["asynchronous", "network-programming", "command-line-utilities"]
 readme = "README.md"
 
 [dependencies]
-anyhow = "1.0.45"
+anyhow = "1.0.52"
 byteorder = "1.4.3"
-clap = { version = "2.33.3", default-features = false, features = ["wrap_help"] }
+clap = { version = "3.0.0", default-features = false, features = [
+  "std",
+  "cargo",
+  "wrap_help",
+] }
 clockpro-cache = "0.1.10"
 coarsetime = "0.1.20"
 daemonize-simple = "0.1.5"
 derivative = "2.2.0"
 dnsstamps = "0.1.9"
-env_logger = { version = "0.9.0", default-features = false, features = ["humantime"] }
-futures = { version = "0.3.17", features = ["async-await"] }
-hyper = { version = "0.14.15", default_features = false, features = ["server", "http1"], optional = true }
+env_logger = { version = "0.9.0", default-features = false, features = [
+  "humantime",
+] }
+futures = { version = "0.3.19", features = ["async-await"] }
+hyper = { version = "0.14.16", default_features = false, features = [
+  "server",
+  "http1",
+], optional = true }
 ipext = "0.1.0"
 jemallocator = "0.3.2"
-libsodium-sys-stable= "1.19.19"
+libsodium-sys-stable = "1.19.19"
 log = { version = "0.4.14", features = ["std", "release_max_level_debug"] }
 socket2 = "0.4.2"
 parking_lot = "0.11.2"
 privdrop = "0.5.1"
 rand = "0.8.4"
 rustc-hash = "1.1.0"
-serde = "1.0.130"
-serde_derive = "1.0.130"
+serde = "1.0.132"
+serde_derive = "1.0.132"
 serde-big-array = "0.3.2"
 siphasher = "0.3.7"
-tokio = { version = "1.14.0", features = ["net", "io-std", "io-util", "fs", "time", "rt-multi-thread", "parking_lot"] }
+tokio = { version = "1.15.0", features = [
+  "net",
+  "io-std",
+  "io-util",
+  "fs",
+  "time",
+  "rt-multi-thread",
+  "parking_lot",
+] }
 toml = "0.5.8"
 
 [dependencies.prometheus]
@@ -54,9 +71,21 @@ extended-description = """\
 An easy to install, high-performance, zero maintenance proxy to run an \
 encrypted DNS server."""
 assets = [
-  ["target/release/encrypted-dns", "usr/bin/", "755"],
-  ["README.md", "usr/share/doc/encrypted-dns/README.md", "644"],
-  ["example-encrypted-dns.toml", "usr/share/doc/encrypted-dns/example-encrypted-dns.toml", "644"]
+  [
+    "target/release/encrypted-dns",
+    "usr/bin/",
+    "755",
+  ],
+  [
+    "README.md",
+    "usr/share/doc/encrypted-dns/README.md",
+    "644",
+  ],
+  [
+    "example-encrypted-dns.toml",
+    "usr/share/doc/encrypted-dns/example-encrypted-dns.toml",
+    "644",
+  ],
 ]
 section = "network"
 depends = "$auto"

src/main.rs

@@ -511,23 +511,23 @@ fn main() -> Result<(), Error> {
     let time_updater = coarsetime::Updater::new(1000).start()?;
     let matches = app_from_crate!()
         .arg(
-            Arg::with_name("config")
+            Arg::new("config")
                 .long("config")
-                .short("c")
+                .short('c')
                 .value_name("file")
                 .takes_value(true)
                 .default_value("encrypted-dns.toml")
                 .help("Path to the configuration file"),
         )
         .arg(
-            Arg::with_name("import-from-dnscrypt-wrapper")
+            Arg::new("import-from-dnscrypt-wrapper")
                 .long("import-from-dnscrypt-wrapper")
                 .value_name("secret.key file")
                 .takes_value(true)
                 .help("Path to the dnscrypt-wrapper secret key"),
         )
         .arg(
-            Arg::with_name("dry-run")
+            Arg::new("dry-run")
                 .long("dry-run")
                 .takes_value(false)
                 .help("Only print the connection information and quit"),
@@ -551,7 +551,6 @@ fn main() -> Result<(), Error> {
         })
         .unwrap();
 
-
     let mut runtime_builder = tokio::runtime::Builder::new_multi_thread();
     runtime_builder.enable_all();
     runtime_builder.thread_name("encrypted-dns-");