Use master version of Clap

This gets clap-rs/clap#3421 which enables the help to show when no arguments are given and there are defaults.
swift-nav · Feb 16, 2022 · bf62569 · bf62569
1 parent d6212dd
commit bf62569
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/console_backend/Cargo.toml b/console_backend/Cargo.toml
@@ -31,7 +31,7 @@ serialport = { git = "https://github.com/swift-nav/serialport-rs.git", default-f
 directories = "4"
 anyhow = { version = "1", features = ["backtrace"] }
 serde_yaml = "0.8.23"
-clap = { version = "3.0.14", features = ["derive"] }
+clap = { git = "https://github.com/clap-rs/clap", rev="73847b32ff1245167a6d39ddd4fa90b93d1305ce", features = ["derive"] }
 indexmap = { version = "1.8.0", features = ["serde"] }
 serde_json = { version = "1" }
 crossbeam = "0.8"

diff --git a/console_backend/src/bin/files.rs b/console_backend/src/bin/files.rs
@@ -8,10 +8,7 @@ use std::{
 };
 
 use anyhow::{anyhow, Context};
-use clap::{
-    AppSettings::{ArgRequiredElseHelp, DeriveDisplayOrder},
-    Args, Parser,
-};
+use clap::{AppSettings::DeriveDisplayOrder, Args, Parser};
 use indicatif::{ProgressBar, ProgressStyle};
 use lazy_static::lazy_static;
 use sbp::{link::LinkSource, SbpIterExt};
@@ -96,7 +93,8 @@ lazy_static! {
 #[clap(
     name = "swift-files",
     version = include_str!("../version.txt"),
-    setting = ArgRequiredElseHelp | DeriveDisplayOrder,
+    arg_required_else_help = true,
+    setting = DeriveDisplayOrder,
     override_usage = &**FILEIO_USAGE
 )]
 struct Opts {