From bf625694ef704317180e6323feac955a86b14919 Mon Sep 17 00:00:00 2001
From: Sam Lewis <sam.vr.lewis@gmail.com>
Date: Wed, 16 Feb 2022 20:18:55 +1100
Subject: [PATCH] Use master version of Clap

This gets https://github.com/clap-rs/clap/pull/3421 which enables the
help to show when no arguments are given and there are defaults.
---
 Cargo.lock                       | 18 +++++++++++-------
 console_backend/Cargo.toml       |  2 +-
 console_backend/src/bin/files.rs |  8 +++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 226dbb783..8193d0430 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -285,8 +285,7 @@ dependencies = [
 [[package]]
 name = "clap"
 version = "3.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
+source = "git+https://github.com/clap-rs/clap?rev=73847b32ff1245167a6d39ddd4fa90b93d1305ce#73847b32ff1245167a6d39ddd4fa90b93d1305ce"
 dependencies = [
  "atty",
  "bitflags",
@@ -301,11 +300,10 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b9752c030a14235a0bd5ef3ad60a1dcac8468c30921327fc8af36b20c790b9"
+version = "3.0.14"
+source = "git+https://github.com/clap-rs/clap?rev=73847b32ff1245167a6d39ddd4fa90b93d1305ce#73847b32ff1245167a6d39ddd4fa90b93d1305ce"
 dependencies = [
- "heck",
+ "heck 0.4.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -696,6 +694,12 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -1823,7 +1827,7 @@ version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
 dependencies = [
- "heck",
+ "heck 0.3.3",
  "proc-macro2",
  "quote",
  "rustversion",
diff --git a/console_backend/Cargo.toml b/console_backend/Cargo.toml
index 69fd5ef5f..41c5b277f 100644
--- 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
index 8fdcd141a..6dc91dd50 100644
--- 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 {