Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-13 22:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(derive): Use variants help_heading

Browse source 
Due to a copy/paste bug, we were reading the `help_heading` for
Subcommands from the enum's attribute and not the variant's attribute.

It doesn't make sense for the outer command's help_heading to control
the subcommands help_heading.

This does raise an interesting question on inheriting / propagating help_heading,
which I originally wrote the tests for.  We'd first need to answer
whether it should be built-in to the builder or derive-specific.
This commit is contained in:
Ed Page 2021-10-26 12:40:50 -05:00
parent b77b4e43a6
commit 69a7b7133a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clap_derive/src/derives/subcommand.rs
View file

@ -224,7 +224,7 @@ fn gen_augment(
};
let name = attrs.cased_name();
let initial_app_methods = parent_attribute.initial_top_level_methods();
let initial_app_methods = attrs.initial_top_level_methods();
let final_from_attrs = attrs.final_top_level_methods();
let subcommand = quote! {
let #app_var = #app_var.subcommand({
@ -267,7 +267,7 @@ fn gen_augment(
};
let name = attrs.cased_name();
let initial_app_methods = parent_attribute.initial_top_level_methods();
let initial_app_methods = attrs.initial_top_level_methods();
let final_from_attrs = attrs.final_top_level_methods();
let subcommand = quote! {
let #app_var = #app_var.subcommand({

6
clap_derive/tests/help.rs
View file

@ -90,27 +90,27 @@ fn app_help_heading_flattened() {
}
#[derive(Debug, Clone, Subcommand)]
#[clap(help_heading = "SUB A")]
enum SubA {
#[clap(flatten)]
SubB(SubB),
#[clap(subcommand)]
SubC(SubC),
SubAOne,
#[clap(help_heading = "SUB A")]
SubATwo {
should_be_in_sub_a: Option<u32>,
},
}
#[derive(Debug, Clone, Subcommand)]
#[clap(help_heading = "SUB B")]
enum SubB {
#[clap(help_heading = "SUB B")]
SubBOne { should_be_in_sub_b: Option<u32> },
}
#[derive(Debug, Clone, Subcommand)]
#[clap(help_heading = "SUB C")]
enum SubC {
#[clap(help_heading = "SUB C")]
SubCOne { should_be_in_sub_c: Option<u32> },
}