Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Handle validation of empty enum correctly #178

Merged
merged 2 commits into from Apr 13, 2022
Merged

Handle validation of empty enum correctly #178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b06dabd
Handle validation of empty enum correctly
sreenathkrishnan Apr 12, 2022
1ddecc1
If the receiver doesn't support any enum shapes, surface one diagnostic
sreenathkrishnan Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions core/src/options/shape.rs
View file
Open in desktop
Expand Up @@ -72,13 +72,25 @@ impl ToTokens for Shape {
} else {
let en = &self.enum_values;
let st = &self.struct_values;

let check_empty_enum = if en.supports_none() {
let ty = en.prefix.trim_end_matches('_');
quote!(return ::darling::export::Err(::darling::Error::unsupported_shape(#ty));)
} else {
quote!()
};

quote! {
match *__body {
::syn::Data::Enum(ref data) => {
fn validate_variant(data: &::syn::Fields) -> ::darling::Result<()> {
#en
}

if data.variants.is_empty() {
#check_empty_enum
}

TedDriggs marked this conversation as resolved.
Show resolved Hide resolved
for variant in &data.variants {
validate_variant(&variant.fields)?;
}
Expand Down
7 changes: 7 additions & 0 deletions tests/supports.rs
View file
Open in desktop
Expand Up @@ -46,6 +46,12 @@ mod source {
}
}

pub fn empty_enum() -> DeriveInput {
parse_quote! {
enum Hello {}
}
}

pub fn named_struct() -> DeriveInput {
parse_quote! {
struct Hello {
Expand Down Expand Up @@ -80,4 +86,5 @@ fn struct_named() {
StructContainer::from_derive_input(&source::tuple_struct()).unwrap_err();
StructContainer::from_derive_input(&source::named_field_enum()).unwrap_err();
StructContainer::from_derive_input(&source::newtype_enum()).unwrap_err();
StructContainer::from_derive_input(&source::empty_enum()).unwrap_err();
}