allow deriving of FromVariant for uninhabitable enums
#962
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks a lot for this PR! 👍 [Edit]: discussion about usefulness is starting from here. bors try |
Bromeon
added
feature
tryBuild succeeded: |
chitoyuu
added a commit
to chitoyuu/godot-rust
that referenced
this pull request
Oct 18, 2022
Adds the `#[variant(enum = "repr")]` and `#[variant(enum = "str")]` item-level attribute to the Variant conversion derive macros for fieldless enums. - `#[variant(enum = "repr")]` - convert through the numeric type specified using `#[repr]`. - `#[variant(enum = "str")]` - convert through string representations of the variant names. WIP - do not merge! FromVariant implementations would conflict with godot-rust#962. Close godot-rust#546.
chitoyuu
added a commit
to chitoyuu/godot-rust
that referenced
this pull request
Oct 18, 2022
Adds the `#[variant(enum = "repr")]` and `#[variant(enum = "str")]` item-level attribute to the Variant conversion derive macros for fieldless enums. - `#[variant(enum = "repr")]` - convert through the numeric type specified using `#[repr]`. - `#[variant(enum = "str")]` - convert through string representations of the variant names. WIP - do not merge! FromVariant implementations would conflict with godot-rust#962. Close godot-rust#546.
chitoyuu
added a commit
to chitoyuu/godot-rust
that referenced
this pull request
Oct 18, 2022
Adds the `#[variant(enum = "repr")]` and `#[variant(enum = "str")]` item-level attribute to the Variant conversion derive macros for fieldless enums. - `#[variant(enum = "repr")]` - convert through the numeric type specified using `#[repr]`. - `#[variant(enum = "str")]` - convert through string representations of the variant names. WIP - do not merge! FromVariant implementations would conflict with godot-rust#962. Close godot-rust#546.
Bromeon
reviewed
Oct 18, 2022
Comment on lines
-65
to
-103
| { | ||
| let __dict = ::gdnative::core_types::Dictionary::from_variant(#input_ident) | ||
| .map_err(|__err| FVE::InvalidEnumRepr { | ||
| expected: VariantEnumRepr::ExternallyTagged, | ||
| error: std::boxed::Box::new(__err), | ||
| })?; | ||
|
|
||
| let __keys = __dict.keys(); | ||
| if __keys.len() != 1 { | ||
| Err(FVE::InvalidEnumRepr { | ||
| expected: VariantEnumRepr::ExternallyTagged, | ||
| error: std::boxed::Box::new(FVE::InvalidLength { | ||
| expected: 1, | ||
| len: __keys.len() as usize, | ||
| }), | ||
| }) | ||
| } | ||
| else { | ||
| let __key = String::from_variant(&__keys.get(0)) | ||
| .map_err(|__err| FVE::InvalidEnumRepr { | ||
| expected: VariantEnumRepr::ExternallyTagged, | ||
| error: std::boxed::Box::new(__err), | ||
| })?; | ||
| match __key.as_str() { | ||
| #( | ||
| #ref_var_ident_string_literals => { | ||
| let #var_input_ident_iter = &__dict.get_or_nil(&__keys.get(0)); | ||
| (#var_from_variants).map_err(|err| FVE::InvalidEnumVariant { | ||
| variant: #ref_var_ident_string_literals, | ||
| error: std::boxed::Box::new(err), | ||
| }) | ||
| }, | ||
| )* | ||
| variant => Err(FVE::UnknownEnumVariant { | ||
| variant: variant.to_string(), | ||
| expected: &[#(#ref_var_ident_string_literals),*], | ||
| }), | ||
| } | ||
| } |
There was a problem hiding this comment.
This {} block is no longer needed?
There was a problem hiding this comment.
Yeah, it's almost identical to L68 ~ L105. (expected the early_return statement)
There are so many lines of change due to indentation. The outermost {} pair is removed because return_expr is the only expression used inside generated from_variant implementation. Should I keep it?
There was a problem hiding this comment.
I see, thanks. No it's fine, you can leave your changes like this 🙂
Bogay
changed the title
FromVariant for uninhabitable enumsFromVariant for uninhabitable enums
|
Thanks! 🚀 bors r+ |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixs #444
What type of error should be returned might need further discussion.