Merge pull request #130 from dtolnay/clap

Update to clap 3.1.0
dtolnay · Feb 17, 2022 · 0371afb · 0371afb
2 parents a5bdc99 + 05311bf
commit 0371afb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ autotests = false
 
 [dependencies]
 atty = "0.2"
-clap = { version = "3.0", default-features = false, features = ["derive", "std", "suggestions"] }
+clap = { version = "3.1", default-features = false, features = ["derive", "std", "suggestions"] }
 prettyplease = { version = "0.1", optional = true }
 proc-macro2 = "1.0"
 quote = { version = "1.0", default-features = false }

diff --git a/src/opts.rs b/src/opts.rs
@@ -13,7 +13,7 @@ pub enum Opts {
         version,
         author,
         setting = AppSettings::DeriveDisplayOrder,
-        setting = AppSettings::DontCollapseArgsInUsage
+        dont_collapse_args_in_usage = true
     )]
     Expand(Args),
 }
@@ -165,5 +165,5 @@ fn parse_selector(s: &str) -> Result<Selector, <Selector as FromStr>::Err> {
 
 #[test]
 fn test_cli() {
-    <Opts as clap::IntoApp>::into_app().debug_assert();
+    <Opts as clap::CommandFactory>::command().debug_assert();
 }