Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Collect into Result<Vec<_>, _>

This commit is contained in:
Martin Fischer 2023-01-23 06:00:01 +01:00 committed by Charlie Marsh
parent 90558609c3
commit 648191652d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ruff_macros/src/rule_namespace.rs
View File

@ -17,16 +17,23 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
let mut url_match_arms = quote!(Self::Ruff => None,); let mut url_match_arms = quote!(Self::Ruff => None,);
for variant in variants { for variant in variants {
let prefix_attrs: Vec<_> = variant let prefixes: Result<Vec<_>, _> = variant
.attrs .attrs
.iter() .iter()
.filter(|a| a.path.is_ident("prefix")) .filter(|a| a.path.is_ident("prefix"))
.map(|attr| {
let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else {
return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#));
};
Ok(lit.value())
})
.collect(); .collect();
let prefixes = prefixes?;
if prefix_attrs.is_empty() { if prefixes.is_empty() {
return Err(Error::new( return Err(Error::new(
variant.span(), variant.span(),
r#"Missing [#prefix = "..."] attribute"#, r#"Missing #[prefix = "..."] attribute"#,
)); ));
} }
@ -42,22 +49,16 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
url_match_arms.extend(quote! {Self::#variant_ident => Some(#url),}); url_match_arms.extend(quote! {Self::#variant_ident => Some(#url),});
} }
let mut prefix_literals = Vec::new(); for lit in &prefixes {
for attr in prefix_attrs {
let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else {
return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#))
};
parsed.push((lit.clone(), variant_ident.clone())); parsed.push((lit.clone(), variant_ident.clone()));
prefix_literals.push(lit);
} }
prefix_match_arms.extend(quote! { prefix_match_arms.extend(quote! {
Self::#variant_ident => &[#(#prefix_literals),*], Self::#variant_ident => &[#(#prefixes),*],
}); });
} }
parsed.sort_by_key(|(prefix, _)| prefix.value().len()); parsed.sort_by_key(|(prefix, _)| prefix.len());
let mut if_statements = quote!(); let mut if_statements = quote!();
let mut into_iter_match_arms = quote!(); let mut into_iter_match_arms = quote!();
@ -67,7 +68,7 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
return Some((#ident::#field, rest)); return Some((#ident::#field, rest));
}}); }});
let prefix_ident = Ident::new(&prefix.value(), Span::call_site()); let prefix_ident = Ident::new(&prefix, Span::call_site());
if field != "Pycodestyle" { if field != "Pycodestyle" {
into_iter_match_arms.extend(quote! { into_iter_match_arms.extend(quote! {