mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 21:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename some local variables

Browse source
This commit is contained in:
Charlie Marsh 2023-02-07 16:24:53 -05:00
parent 67e9ff7cc8
commit 2f7f4943e3
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/ruff_macros/src/define_rule_mapping.rs
View file

@ -7,16 +7,16 @@ use syn::{Attribute, Ident, LitStr, Path, Token};
pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream { pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
let mut rule_variants = quote!(); let mut rule_variants = quote!();
let mut diagkind_variants = quote!(); let mut diagnostic_kind_variants = quote!();
let mut rule_message_formats_match_arms = quote!(); let mut rule_message_formats_match_arms = quote!();
let mut rule_autofixable_match_arms = quote!(); let mut rule_autofixable_match_arms = quote!();
let mut rule_code_match_arms = quote!(); let mut rule_code_match_arms = quote!();
let mut rule_from_code_match_arms = quote!(); let mut rule_from_code_match_arms = quote!();
let mut diagkind_code_match_arms = quote!(); let mut diagnostic_kind_code_match_arms = quote!();
let mut diagkind_body_match_arms = quote!(); let mut diagnostic_kind_body_match_arms = quote!();
let mut diagkind_fixable_match_arms = quote!(); let mut diagnostic_kind_fixable_match_arms = quote!();
let mut diagkind_commit_match_arms = quote!(); let mut diagnostic_kind_commit_match_arms = quote!();
let mut from_impls_for_diagkind = quote!(); let mut from_impls_for_diagnostic_kind = quote!();
for (code, path, name, attr) in &mapping.entries { for (code, path, name, attr) in &mapping.entries {
let code_str = LitStr::new(&code.to_string(), Span::call_site()); let code_str = LitStr::new(&code.to_string(), Span::call_site());
@ -25,7 +25,7 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
#(#attr)* #(#attr)*
#name, #name,
}); });
diagkind_variants.extend(quote! {#(#attr)* #name(#path),}); diagnostic_kind_variants.extend(quote! {#(#attr)* #name(#path),});
// Apply the `attrs` to each arm, like `[cfg(feature = "foo")]`. // Apply the `attrs` to each arm, like `[cfg(feature = "foo")]`.
rule_message_formats_match_arms rule_message_formats_match_arms
@ -34,15 +34,16 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
.extend(quote! {#(#attr)* Self::#name => <#path as Violation>::AUTOFIX,}); .extend(quote! {#(#attr)* Self::#name => <#path as Violation>::AUTOFIX,});
rule_code_match_arms.extend(quote! {#(#attr)* Self::#name => #code_str,}); rule_code_match_arms.extend(quote! {#(#attr)* Self::#name => #code_str,});
rule_from_code_match_arms.extend(quote! {#(#attr)* #code_str => Ok(Rule::#name), }); rule_from_code_match_arms.extend(quote! {#(#attr)* #code_str => Ok(Rule::#name), });
diagkind_code_match_arms.extend(quote! {#(#attr)* Self::#name(..) => &Rule::#name, }); diagnostic_kind_code_match_arms
diagkind_body_match_arms .extend(quote! {#(#attr)* Self::#name(..) => &Rule::#name, });
diagnostic_kind_body_match_arms
.extend(quote! {#(#attr)* Self::#name(x) => Violation::message(x), }); .extend(quote! {#(#attr)* Self::#name(x) => Violation::message(x), });
diagkind_fixable_match_arms diagnostic_kind_fixable_match_arms
.extend(quote! {#(#attr)* Self::#name(x) => x.autofix_title_formatter().is_some(),}); .extend(quote! {#(#attr)* Self::#name(x) => x.autofix_title_formatter().is_some(),});
diagkind_commit_match_arms.extend( diagnostic_kind_commit_match_arms.extend(
quote! {#(#attr)* Self::#name(x) => x.autofix_title_formatter().map(|f| f(x)), }, quote! {#(#attr)* Self::#name(x) => x.autofix_title_formatter().map(|f| f(x)), },
); );
from_impls_for_diagkind.extend(quote! { from_impls_for_diagnostic_kind.extend(quote! {
#(#attr)* #(#attr)*
impl From<#path> for DiagnosticKind { impl From<#path> for DiagnosticKind {
fn from(x: #path) -> Self { fn from(x: #path) -> Self {
@ -58,7 +59,7 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
.map(|(code, _, name, _)| (code.to_string(), name)) .map(|(code, _, name, _)| (code.to_string(), name))
.collect(); .collect();
let rulecodeprefix = super::rule_code_prefix::expand( let rule_code_prefix = super::rule_code_prefix::expand(
&Ident::new("Rule", Span::call_site()), &Ident::new("Rule", Span::call_site()),
&Ident::new("RuleCodePrefix", Span::call_site()), &Ident::new("RuleCodePrefix", Span::call_site()),
mapping.entries.iter().map(|(code, ..)| code), mapping.entries.iter().map(|(code, ..)| code),
@ -82,7 +83,7 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
pub enum Rule { #rule_variants } pub enum Rule { #rule_variants }
#[derive(AsRefStr, Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(AsRefStr, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub enum DiagnosticKind { #diagkind_variants } pub enum DiagnosticKind { #diagnostic_kind_variants }
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
pub enum FromCodeError { pub enum FromCodeError {
@ -115,28 +116,28 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
impl DiagnosticKind { impl DiagnosticKind {
/// The rule of the diagnostic. /// The rule of the diagnostic.
pub fn rule(&self) -> &'static Rule { pub fn rule(&self) -> &'static Rule {
match self { #diagkind_code_match_arms } match self { #diagnostic_kind_code_match_arms }
} }
/// The body text for the diagnostic. /// The body text for the diagnostic.
pub fn body(&self) -> String { pub fn body(&self) -> String {
match self { #diagkind_body_match_arms } match self { #diagnostic_kind_body_match_arms }
} }
/// Whether the diagnostic is (potentially) fixable. /// Whether the diagnostic is (potentially) fixable.
pub fn fixable(&self) -> bool { pub fn fixable(&self) -> bool {
match self { #diagkind_fixable_match_arms } match self { #diagnostic_kind_fixable_match_arms }
} }
/// The message used to describe the fix action for a given `DiagnosticKind`. /// The message used to describe the fix action for a given `DiagnosticKind`.
pub fn commit(&self) -> Option<String> { pub fn commit(&self) -> Option<String> {
match self { #diagkind_commit_match_arms } match self { #diagnostic_kind_commit_match_arms }
} }
} }
#from_impls_for_diagkind #from_impls_for_diagnostic_kind
#rulecodeprefix #rule_code_prefix
} }
} }

4
crates/ruff_macros/src/rule_namespace.rs
View file

@ -27,7 +27,7 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
let prefixes: Result<Vec<_>, _> = variant let prefixes: Result<Vec<_>, _> = variant
.attrs .attrs
.iter() .iter()
.filter(|a| a.path.is_ident("prefix")) .filter(|attr| attr.path.is_ident("prefix"))
.map(|attr| { .map(|attr| {
let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else { 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 = "..."]"#)); return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#));
@ -54,7 +54,7 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
)); ));
} }
let Some(doc_attr) = variant.attrs.iter().find(|a| a.path.is_ident("doc")) else { let Some(doc_attr) = variant.attrs.iter().find(|attr| attr.path.is_ident("doc")) else {
return Err(Error::new(variant.span(), r#"expected a doc comment"#)) return Err(Error::new(variant.span(), r#"expected a doc comment"#))
}; };