mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Produce errors on attr that fails to parse as Meta

Browse Source
This commit is contained in:
David Tolnay 2019-09-07 22:46:50 -07:00
parent 0d4722680a
commit a3157c9572
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
serde_derive/src/internals/attr.rs
View File

@ -305,7 +305,12 @@ impl Container {
let mut variant_identifier = BoolAttr::none(cx, VARIANT_IDENTIFIER);
let mut serde_path = Attr::none(cx, CRATE);
for meta_item in item.attrs.iter().filter_map(get_serde_meta_items).flatten() {
for meta_item in item
.attrs
.iter()
.flat_map(|attr| get_serde_meta_items(cx, attr))
.flatten()
{
match meta_item {
// Parse `#[serde(rename = "foo")]`
Meta(NameValue(ref m)) if m.path == RENAME => {
@ -891,7 +896,7 @@ impl Variant {
for meta_item in variant
.attrs
.iter()
.filter_map(get_serde_meta_items)
.flat_map(|attr| get_serde_meta_items(cx, attr))
.flatten()
{
match meta_item {
@ -1210,7 +1215,7 @@ impl Field {
for meta_item in field
.attrs
.iter()
.filter_map(get_serde_meta_items)
.flat_map(|attr| get_serde_meta_items(cx, attr))
.flatten()
.chain(variant_borrow)
{
@ -1599,17 +1604,21 @@ fn get_where_predicates(
Ok((ser.at_most_one()?, de.at_most_one()?))
}
pub fn get_serde_meta_items(attr: &syn::Attribute) -> Option<Vec<syn::NestedMeta>> {
if attr.path == SERDE {
match attr.parse_meta() {
Ok(List(ref meta)) => Some(meta.nested.iter().cloned().collect()),
_ => {
// TODO: produce an error
None
}
pub fn get_serde_meta_items(cx: &Ctxt, attr: &syn::Attribute) -> Result<Vec<syn::NestedMeta>, ()> {
if attr.path != SERDE {
return Ok(Vec::new());
}
match attr.parse_meta() {
Ok(List(ref meta)) => Ok(meta.nested.iter().cloned().collect()),
Ok(other) => {
cx.error_spanned_by(other, "expected #[serde(...)]");
Err(())
}
Err(err) => {
cx.syn_error(err);
Err(())
}
} else {
None
}
}

5
serde_derive/src/internals/ctxt.rs
View File

@ -38,6 +38,11 @@ impl Ctxt {
.push(syn::Error::new_spanned(obj.into_token_stream(), msg));
}
/// Add one of Syn's parse errors.
pub fn syn_error(&self, err: syn::Error) {
self.errors.borrow_mut().as_mut().unwrap().push(err);
}
/// Consume this object, producing a formatted error string if there are errors.
pub fn check(self) -> Result<(), Vec<syn::Error>> {
let errors = self.errors.borrow_mut().take().unwrap();