fix(derive): Don't enit warnings

We missed covering `Args` warnings when using struct variants. Fixes #3245
clap-rs · Jan 3, 2022 · 6b9ae54 · 6b9ae54
1 parent b0cb205
commit 6b9ae54
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/clap_derive/src/derives/args.rs b/clap_derive/src/derives/args.rs
@@ -117,7 +117,7 @@ pub fn gen_from_arg_matches_for_struct(
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
     quote! {
-        #[allow(dead_code, unreachable_code, unused_variables)]
+        #[allow(dead_code, unreachable_code, unused_variables, unused_braces)]
         #[allow(
             clippy::style,
             clippy::complexity,

diff --git a/clap_derive/src/derives/into_app.rs b/clap_derive/src/derives/into_app.rs
@@ -43,7 +43,7 @@ pub fn gen_for_struct(
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
     let tokens = quote! {
-        #[allow(dead_code, unreachable_code, unused_variables)]
+        #[allow(dead_code, unreachable_code, unused_variables, unused_braces)]
         #[allow(
             clippy::style,
             clippy::complexity,
@@ -88,7 +88,7 @@ pub fn gen_for_enum(enum_name: &Ident, generics: &Generics, attrs: &[Attribute])
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
     quote! {
-        #[allow(dead_code, unreachable_code, unused_variables)]
+        #[allow(dead_code, unreachable_code, unused_variables, unused_braces)]
         #[allow(
             clippy::style,
             clippy::complexity,

diff --git a/clap_derive/src/derives/subcommand.rs b/clap_derive/src/derives/subcommand.rs
@@ -61,7 +61,7 @@ pub fn gen_for_enum(
     quote! {
         #from_arg_matches
 
-        #[allow(dead_code, unreachable_code, unused_variables)]
+        #[allow(dead_code, unreachable_code, unused_variables, unused_braces)]
         #[allow(
             clippy::style,
             clippy::complexity,

diff --git a/tests/derive/deny_warnings.rs b/tests/derive/deny_warnings.rs
@@ -24,7 +24,7 @@ fn try_str(s: &str) -> Result<String, std::convert::Infallible> {
 fn warning_never_struct() {
     #[derive(Parser, Debug, PartialEq)]
     struct Opt {
-        #[clap(parse(try_from_str = try_str))]
+        #[clap(parse(try_from_str = try_str), default_value_t)]
         s: String,
     }
     assert_eq!(
@@ -40,7 +40,7 @@ fn warning_never_enum() {
     #[derive(Parser, Debug, PartialEq)]
     enum Opt {
         Foo {
-            #[clap(parse(try_from_str = try_str))]
+            #[clap(parse(try_from_str = try_str), default_value_t)]
             s: String,
         },
     }