-
Notifications
You must be signed in to change notification settings - Fork 86
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow to disable requirement for uncapitalized descriptions #155
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -285,6 +285,21 @@ struct DescriptionStartsWithInitialism { | |
x: u8, | ||
} | ||
|
||
/// Test that descriptions can start with any case when | ||
/// the type attribute `lax_descriptions` is specified. | ||
#[derive(FromArgs)] | ||
#[argh(lax_descriptions)] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure I like the name "lax_descriptions". Seems a bit generic. |
||
#[allow(unused)] | ||
struct LaxDescription { | ||
/// Don't be so strict. | ||
#[argh(option)] | ||
x: u8, | ||
|
||
/// don't be so strict. | ||
#[argh(option)] | ||
y: u8, | ||
} | ||
|
||
#[test] | ||
fn default_number() { | ||
#[derive(FromArgs)] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,7 +61,7 @@ pub struct Description { | |
} | ||
|
||
impl FieldAttrs { | ||
pub fn parse(errors: &Errors, field: &syn::Field) -> Self { | ||
pub fn parse(errors: &Errors, field: &syn::Field, type_attrs: &TypeAttrs) -> Self { | ||
let mut this = Self::default(); | ||
|
||
for attr in &field.attrs { | ||
|
@@ -160,8 +160,10 @@ impl FieldAttrs { | |
_ => {} | ||
} | ||
|
||
if let Some(d) = &this.description { | ||
check_option_description(errors, d.content.value().trim(), d.content.span()); | ||
if !type_attrs.lax_descriptions { | ||
if let Some(d) = &this.description { | ||
check_option_description(errors, d.content.value().trim(), d.content.span()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we should change the behavior of check_option_description rather than skipping it entirely when the option is set. |
||
} | ||
} | ||
|
||
this | ||
|
@@ -298,6 +300,7 @@ pub struct TypeAttrs { | |
pub examples: Vec<syn::LitStr>, | ||
pub notes: Vec<syn::LitStr>, | ||
pub error_codes: Vec<(syn::LitInt, syn::LitStr)>, | ||
pub lax_descriptions: bool, | ||
} | ||
|
||
impl TypeAttrs { | ||
|
@@ -345,13 +348,15 @@ impl TypeAttrs { | |
if let Some(ident) = errors.expect_meta_word(meta).and_then(|p| p.get_ident()) { | ||
this.parse_attr_subcommand(errors, ident); | ||
} | ||
} else if name.is_ident("lax_descriptions") { | ||
this.lax_descriptions = true; | ||
} else { | ||
errors.err( | ||
&meta, | ||
concat!( | ||
"Invalid type-level `argh` attribute\n", | ||
"Expected one of: `description`, `error_code`, `example`, `name`, ", | ||
"`note`, `subcommand`", | ||
"`note`, `subcommand`, `lax_descriptions`", | ||
), | ||
); | ||
} | ||
|
@@ -566,7 +571,15 @@ fn parse_attr_description(errors: &Errors, m: &syn::MetaNameValue, slot: &mut Op | |
/// Checks that a `#![derive(FromArgs)]` enum has an `#[argh(subcommand)]` | ||
/// attribute and that it does not have any other type-level `#[argh(...)]` attributes. | ||
pub fn check_enum_type_attrs(errors: &Errors, type_attrs: &TypeAttrs, type_span: &Span) { | ||
let TypeAttrs { is_subcommand, name, description, examples, notes, error_codes } = type_attrs; | ||
let TypeAttrs { | ||
is_subcommand, | ||
name, | ||
description, | ||
examples, | ||
notes, | ||
error_codes, | ||
lax_descriptions: _, | ||
} = type_attrs; | ||
|
||
// Ensure that `#[argh(subcommand)]` is present. | ||
if is_subcommand.is_none() { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like a weird place to add this to the example.