mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-04 18:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Upgrade to Rust 1.82 (#13816)

Browse source
This commit is contained in:
Micha Reiser 2024-10-19 16:05:50 +02:00 • committed by GitHub
parent bd33b4972d
commit 2ff36530c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 58 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ruff_macros/src/cache_key.rs
View file

@ -75,12 +75,11 @@ pub(crate) fn derive_cache_key(item: &DeriveInput) -> syn::Result<TokenStream> {
}
}
let field_attr = match &field.ident {
Some(ident) => quote!(self.#ident),
None => {
let index = syn::Index::from(i);
quote!(self.#index)
}
let field_attr = if let Some(ident) = &field.ident {
quote!(self.#ident)
} else {
let index = syn::Index::from(i);
quote!(self.#index)
};
fields.push(quote!(#field_attr.cache_key(key);));

14
crates/ruff_macros/src/map_codes.rs
View file

@ -143,9 +143,10 @@ pub(crate) fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
for (prefix, rules) in &rules_by_prefix {
let prefix_ident = get_prefix_ident(prefix);
let attrs = intersection_all(rules.iter().map(|(.., attrs)| attrs.as_slice()));
let attrs = match attrs.as_slice() {
[] => quote!(),
[..] => quote!(#(#attrs)*),
let attrs = if attrs.is_empty() {
quote!()
} else {
quote!(#(#attrs)*)
};
all_codes.push(quote! {
#attrs Self::#linter(#linter::#prefix_ident)
@ -161,9 +162,10 @@ pub(crate) fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
});
let prefix_ident = get_prefix_ident(&prefix);
let attrs = intersection_all(rules.iter().map(|(.., attrs)| attrs.as_slice()));
let attrs = match attrs.as_slice() {
[] => quote!(),
[..] => quote!(#(#attrs)*),
let attrs = if attrs.is_empty() {
quote!()
} else {
quote!(#(#attrs)*)
};
prefix_into_iter_match_arms.extend(quote! {
#attrs #linter::#prefix_ident => vec![#(#rule_paths,)*].into_iter(),

7
crates/ruff_macros/src/rule_code_prefix.rs
View file

@ -90,9 +90,10 @@ fn attributes_for_prefix(
attributes: &BTreeMap<String, &[Attribute]>,
) -> proc_macro2::TokenStream {
let attrs = intersection_all(codes.iter().map(|code| attributes[code]));
match attrs.as_slice() {
[] => quote!(),
[..] => quote!(#(#attrs)*),
if attrs.is_empty() {
quote!()
} else {
quote!(#(#attrs)*)
}
}