Update clap to 3.1 (#488)

googleforgames · Feb 22, 2022 · 44903d1 · 44903d1
1 parent 0fb0994
commit 44903d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,7 @@ quilkin-macros = { version = "0.3.0-dev", path = "./macros" }
 base64 = "0.13.0"
 base64-serde = "0.6.1"
 bytes = { version = "1.1.0", features = ["serde"] }
-clap = { version = "3", features = ["cargo"] }
+clap = { version = "3.1", features = ["cargo"] }
 dashmap = "4.0.2"
 either = "1.6.1"
 hyper = "0.14.15"

diff --git a/src/main.rs b/src/main.rs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-use clap::{App, AppSettings, Arg};
+use clap::{Arg, Command};
 use std::sync::Arc;
 use tracing::info;
 
@@ -37,12 +37,13 @@ async fn main() -> quilkin::Result<()> {
         .help("The YAML configuration file")
         .takes_value(true);
 
-    let cli = App::new(clap::crate_name!())
+    let cli = Command::new(clap::crate_name!())
         .version(&*version)
         .about(clap::crate_description!())
-        .setting(AppSettings::SubcommandRequiredElseHelp)
+        .subcommand_required(true)
+        .arg_required_else_help(true)
         .subcommand(
-            App::new("run")
+            Command::new("run")
                 .about("Start Quilkin process.")
                 .arg(config_arg.clone()),
         )