topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2025-02-23 17:40:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Parse remaining derives after the first unsupported

Browse Source
This commit is contained in:
David Tolnay 2020-11-27 13:59:42 -08:00
parent 990eb3cf82
commit f4b9334258
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
syntax/attrs.rs
View File

@ -29,7 +29,7 @@ pub(super) fn parse(cx: &mut Errors, attrs: &[Attribute], mut parser: Parser) {
Err(err) => return cx.push(err),
}
} else if attr.path.is_ident("derive") {
match attr.parse_args_with(parse_derive_attribute) {
match attr.parse_args_with(|attr: ParseStream| parse_derive_attribute(cx, attr)) {
Ok(attr) => {
if let Some(derives) = &mut parser.derives {
derives.extend(attr);
@ -89,19 +89,20 @@ fn parse_doc_attribute(input: ParseStream) -> Result<LitStr> {
Ok(lit)
}
fn parse_derive_attribute(input: ParseStream) -> Result<Vec<Derive>> {
input
.parse_terminated::<Path, Token![,]>(Path::parse_mod_style)?
.into_iter()
.map(|path| {
if let Some(ident) = path.get_ident() {
if let Some(derive) = Derive::from(ident) {
return Ok(derive);
}
fn parse_derive_attribute(cx: &mut Errors, input: ParseStream) -> Result<Vec<Derive>> {
let paths = input.parse_terminated::<Path, Token![,]>(Path::parse_mod_style)?;
let mut derives = Vec::new();
for path in paths {
if let Some(ident) = path.get_ident() {
if let Some(derive) = Derive::from(ident) {
derives.push(derive);
continue;
}
Err(Error::new_spanned(path, "unsupported derive"))
})
.collect()
}
cx.error(path, "unsupported derive");
}
Ok(derives)
}
fn parse_repr_attribute(input: ParseStream) -> Result<Atom> {