Refactor #133
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,56 @@ | ||
| use syn::{Attribute, DeriveInput, Meta, NestedMeta, Variant}; | ||
|
|
||
| /// Represents a type that can have strum metadata associated with it. | ||
| pub trait HasMetadata { | ||
| /// Get all the metadata associated with a specific "tag". | ||
| /// All of strum's metadata is nested inside a path such as | ||
| /// #[strum(...)] so this let's us quickly filter down to only our metadata. | ||
| fn get_metadata(&self, ident: &str) -> syn::Result<Vec<Meta>>; | ||
| } | ||
|
|
||
| fn get_metadata_inner<'a>( | ||
| ident: &str, | ||
| it: impl IntoIterator<Item = &'a Attribute>, | ||
| ) -> syn::Result<Vec<Meta>> { | ||
| let mut res = Vec::new(); | ||
|
|
||
| for attr in it { | ||
| if !attr.path.is_ident(ident) { | ||
| continue; | ||
| } | ||
|
|
||
| let meta = attr.parse_meta()?; | ||
| let nested = match meta { | ||
| Meta::List(syn::MetaList { nested, .. }) => nested, | ||
| _ => { | ||
| return Err(syn::Error::new_spanned( | ||
| meta, | ||
| "unrecognized strum attribute form", | ||
| )) | ||
| } | ||
| }; | ||
|
|
||
| for nested_meta in nested { | ||
| match nested_meta { | ||
| NestedMeta::Meta(meta) => res.push(meta), | ||
| NestedMeta::Lit(lit) => { | ||
| return Err(syn::Error::new_spanned(lit, "unexpected literal")) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Ok(res) | ||
| } | ||
|
|
||
| impl HasMetadata for Variant { | ||
| fn get_metadata(&self, ident: &str) -> syn::Result<Vec<Meta>> { | ||
| get_metadata_inner(ident, &self.attrs) | ||
| } | ||
| } | ||
|
|
||
| impl HasMetadata for DeriveInput { | ||
| fn get_metadata(&self, ident: &str) -> syn::Result<Vec<Meta>> { | ||
| get_metadata_inner(ident, &self.attrs) | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,63 @@ | ||
| use syn::{Lit, Meta, MetaList, MetaNameValue, NestedMeta, Path}; | ||
|
|
||
| pub trait MetaHelpers { | ||
| fn expect_metalist(&self, msg: &str) -> syn::Result<&MetaList>; | ||
| fn expect_path(&self, msg: &str) -> syn::Result<&Path>; | ||
| fn expect_namevalue(&self, msg: &str) -> syn::Result<&MetaNameValue>; | ||
| } | ||
|
|
||
| impl MetaHelpers for Meta { | ||
| fn expect_metalist(&self, msg: &str) -> syn::Result<&MetaList> { | ||
| match self { | ||
| Meta::List(list) => Ok(list), | ||
| _ => Err(syn::Error::new_spanned(self, msg)), | ||
| } | ||
| } | ||
|
|
||
| fn expect_path(&self, msg: &str) -> syn::Result<&Path> { | ||
| match self { | ||
| Meta::Path(path) => Ok(path), | ||
| _ => Err(syn::Error::new_spanned(self, msg)), | ||
| } | ||
| } | ||
|
|
||
| fn expect_namevalue(&self, msg: &str) -> syn::Result<&MetaNameValue> { | ||
| match self { | ||
| Meta::NameValue(pair) => Ok(pair), | ||
| _ => Err(syn::Error::new_spanned(self, msg)), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub trait NestedMetaHelpers { | ||
| fn expect_meta(&self, msg: &str) -> syn::Result<&Meta>; | ||
| fn expect_lit(&self, msg: &str) -> syn::Result<&Lit>; | ||
| } | ||
|
|
||
| impl NestedMetaHelpers for NestedMeta { | ||
| fn expect_meta(&self, msg: &str) -> syn::Result<&Meta> { | ||
| match self { | ||
| NestedMeta::Meta(m) => Ok(m), | ||
| _ => Err(syn::Error::new_spanned(self, msg)), | ||
| } | ||
| } | ||
| fn expect_lit(&self, msg: &str) -> syn::Result<&Lit> { | ||
| match self { | ||
| NestedMeta::Lit(l) => Ok(l), | ||
| _ => Err(syn::Error::new_spanned(self, msg)), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub trait LitHelpers { | ||
| fn expect_string(&self, msg: &str) -> syn::Result<String>; | ||
| } | ||
|
|
||
| impl LitHelpers for Lit { | ||
| fn expect_string(&self, msg: &str) -> syn::Result<String> { | ||
| match self { | ||
| Lit::Str(s) => Ok(s.value()), | ||
| _ => Err(syn::Error::new_spanned(self, msg)), | ||
| } | ||
| } | ||
| } |
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
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
Oops, something went wrong.
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.
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.
Can we return an Err here was well?