Merge pull request #2819 from epage/consistent

refactor(derive): Always do app_methods last
clap-rs · Oct 7, 2021 · 8eb4377 · 8eb4377
2 parents 6594e28 + 74799ea
commit 8eb4377
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/clap_derive/src/attrs.rs b/clap_derive/src/attrs.rs
@@ -764,11 +764,12 @@ impl Attrs {
 
     /// generate methods from attributes on top of struct or enum
     pub fn top_level_methods(&self) -> TokenStream {
+        let version = &self.version;
         let author = &self.author;
         let methods = &self.methods;
         let doc_comment = &self.doc_comment;
 
-        quote!( #(#doc_comment)* #author #(#methods)*)
+        quote!( #(#doc_comment)* #author #version #(#methods)*)
     }
 
     /// generate methods on top of a field
@@ -778,13 +779,6 @@ impl Attrs {
         quote!( #(#doc_comment)* #(#methods)* )
     }
 
-    pub fn version(&self) -> TokenStream {
-        self.version
-            .clone()
-            .map(|m| m.to_token_stream())
-            .unwrap_or_default()
-    }
-
     pub fn cased_name(&self) -> TokenStream {
         self.name.clone().translate(*self.casing)
     }

diff --git a/clap_derive/src/derives/args.rs b/clap_derive/src/derives/args.rs
@@ -350,12 +350,10 @@ pub fn gen_augment(
     });
 
     let app_methods = parent_attribute.top_level_methods();
-    let version = parent_attribute.version();
     quote! {{
         #( #args )*
-        let #app_var = #app_var#app_methods;
         #subcmd
-        #app_var#version
+        #app_var#app_methods
     }}
 }
 

diff --git a/clap_derive/src/derives/subcommand.rs b/clap_derive/src/derives/subcommand.rs
@@ -215,13 +215,12 @@ fn gen_augment(
 
                     let name = attrs.cased_name();
                     let from_attrs = attrs.top_level_methods();
-                    let version = attrs.version();
                     let subcommand = quote! {
                         let app = app.subcommand({
                             let #app_var = clap::App::new(#name);
                             let #app_var = #arg_block;
                             let #app_var = #app_var.setting(::clap::AppSettings::SubcommandRequiredElseHelp);
-                            #app_var#from_attrs#version
+                            #app_var#from_attrs
                         });
                     };
                     Some(subcommand)
@@ -257,12 +256,11 @@ fn gen_augment(
 
                     let name = attrs.cased_name();
                     let from_attrs = attrs.top_level_methods();
-                    let version = attrs.version();
                     let subcommand = quote! {
                         let app = app.subcommand({
                             let #app_var = clap::App::new(#name);
                             let #app_var = #arg_block;
-                            #app_var#from_attrs#version
+                            #app_var#from_attrs
                         });
                     };
                     Some(subcommand)
@@ -272,11 +270,9 @@ fn gen_augment(
         .collect();
 
     let app_methods = parent_attribute.top_level_methods();
-    let version = parent_attribute.version();
     quote! {
-            let app = app #app_methods;
             #( #subcommands )*;
-            app #version
+            app #app_methods
     }
 }