Skip to content

Commit

Permalink
Rename some attributes; rename other nodes
Browse files Browse the repository at this point in the history
  • Loading branch information
@charliermarsh
charliermarsh committed Aug 1, 2023
1 parent 744cfbb commit 0cbd6de
Show file tree
Hide file tree
Showing 48 changed files with 11,854 additions and 4,530 deletions.
2 changes: 1 addition & 1 deletion crates/ruff/src/checkers/ast/analyze/expression.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
}
Expr::Lambda(
lambda @ ast::ExprLambda {
args: _,
parameters: _,
body: _,
range: _,
},
Expand Down
32 changes: 16 additions & 16 deletions crates/ruff/src/checkers/ast/analyze/statement.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
name,
decorator_list,
returns,
args,
parameters,
body,
..
})
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
name,
decorator_list,
returns,
args,
parameters,
body,
..
}) => {
Expand Down Expand Up @@ -114,7 +114,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
checker.semantic.scope(),
name,
decorator_list,
args,
parameters,
)
{
checker.diagnostics.push(diagnostic);
Expand All @@ -126,7 +126,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
checker.semantic.scope(),
name,
decorator_list,
args,
parameters,
) {
checker.diagnostics.push(diagnostic);
}
Expand All @@ -142,7 +142,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
flake8_pyi::rules::stub_body_multiple_statements(checker, stmt, body);
}
if checker.enabled(Rule::AnyEqNeAnnotation) {
flake8_pyi::rules::any_eq_ne_annotation(checker, name, args);
flake8_pyi::rules::any_eq_ne_annotation(checker, name, parameters);
}
if checker.enabled(Rule::NonSelfReturnType) {
flake8_pyi::rules::non_self_return_type(
Expand All @@ -151,26 +151,26 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
name,
decorator_list,
returns.as_ref().map(AsRef::as_ref),
args,
parameters,
stmt.is_async_function_def_stmt(),
);
}
if checker.enabled(Rule::StrOrReprDefinedInStub) {
flake8_pyi::rules::str_or_repr_defined_in_stub(checker, stmt);
}
if checker.enabled(Rule::NoReturnArgumentAnnotationInStub) {
flake8_pyi::rules::no_return_argument_annotation(checker, args);
flake8_pyi::rules::no_return_argument_annotation(checker, parameters);
}
if checker.enabled(Rule::BadExitAnnotation) {
flake8_pyi::rules::bad_exit_annotation(
checker,
stmt.is_async_function_def_stmt(),
name,
args,
parameters,
);
}
if checker.enabled(Rule::RedundantNumericUnion) {
flake8_pyi::rules::redundant_numeric_union(checker, args);
flake8_pyi::rules::redundant_numeric_union(checker, parameters);
}
}
if checker.enabled(Rule::DunderFunctionName) {
Expand Down Expand Up @@ -230,13 +230,13 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
}
}
if checker.enabled(Rule::HardcodedPasswordDefault) {
flake8_bandit::rules::hardcoded_password_default(checker, args);
flake8_bandit::rules::hardcoded_password_default(checker, parameters);
}
if checker.enabled(Rule::PropertyWithParameters) {
pylint::rules::property_with_parameters(checker, stmt, decorator_list, args);
pylint::rules::property_with_parameters(checker, stmt, decorator_list, parameters);
}
if checker.enabled(Rule::TooManyArguments) {
pylint::rules::too_many_arguments(checker, args, stmt);
pylint::rules::too_many_arguments(checker, parameters, stmt);
}
if checker.enabled(Rule::TooManyReturnStatements) {
if let Some(diagnostic) = pylint::rules::too_many_return_statements(
Expand Down Expand Up @@ -282,7 +282,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
checker,
stmt,
name,
args,
parameters,
decorator_list,
body,
);
Expand All @@ -304,15 +304,15 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
checker,
name,
decorator_list,
args,
parameters,
);
}
if checker.enabled(Rule::BooleanDefaultValueInFunctionDefinition) {
flake8_boolean_trap::rules::check_boolean_default_value_in_function_definition(
checker,
name,
decorator_list,
args,
parameters,
);
}
if checker.enabled(Rule::UnexpectedSpecialMethodSignature) {
Expand All @@ -321,7 +321,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
stmt,
name,
decorator_list,
args,
parameters,
);
}
if checker.enabled(Rule::FStringDocstring) {
Expand Down
58 changes: 31 additions & 27 deletions crates/ruff/src/checkers/ast/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,15 +455,15 @@ where
match stmt {
Stmt::FunctionDef(ast::StmtFunctionDef {
body,
args,
parameters,
decorator_list,
returns,
type_params,
..
})
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
body,
args,
parameters,
decorator_list,
type_params,
returns,
Expand All @@ -485,11 +485,11 @@ where
self.visit_type_param(type_param);
}

for parameter_with_default in args
for parameter_with_default in parameters
.posonlyargs
.iter()
.chain(&args.args)
.chain(&args.kwonlyargs)
.chain(&parameters.args)
.chain(&parameters.kwonlyargs)
{
if let Some(expr) = &parameter_with_default.def.annotation {
if runtime_annotation {
Expand All @@ -502,7 +502,7 @@ where
self.visit_expr(expr);
}
}
if let Some(arg) = &args.vararg {
if let Some(arg) = &parameters.vararg {
if let Some(expr) = &arg.annotation {
if runtime_annotation {
self.visit_runtime_annotation(expr);
Expand All @@ -511,7 +511,7 @@ where
};
}
}
if let Some(arg) = &args.kwarg {
if let Some(arg) = &parameters.kwarg {
if let Some(expr) = &arg.annotation {
if runtime_annotation {
self.visit_runtime_annotation(expr);
Expand Down Expand Up @@ -888,7 +888,7 @@ where
}
Expr::Lambda(
lambda @ ast::ExprLambda {
args,
parameters,
body: _,
range: _,
},
Expand All @@ -898,11 +898,11 @@ where
default,
def: _,
range: _,
} in args
} in parameters
.posonlyargs
.iter()
.chain(&args.args)
.chain(&args.kwonlyargs)
.chain(&parameters.args)
.chain(&parameters.kwonlyargs)
{
if let Some(expr) = &default {
self.visit_expr(expr);
Expand Down Expand Up @@ -1293,43 +1293,43 @@ where
}
}

fn visit_parameters(&mut self, arguments: &'b Parameters) {
fn visit_parameters(&mut self, parameters: &'b Parameters) {
// Step 1: Binding.
// Bind, but intentionally avoid walking default expressions, as we handle them
// upstream.
for parameter_with_default in &arguments.posonlyargs {
for parameter_with_default in &parameters.posonlyargs {
self.visit_parameter(&parameter_with_default.def);
}
for parameter_with_default in &arguments.args {
for parameter_with_default in &parameters.args {
self.visit_parameter(&parameter_with_default.def);
}
if let Some(arg) = &arguments.vararg {
if let Some(arg) = &parameters.vararg {
self.visit_parameter(arg);
}
for parameter_with_default in &arguments.kwonlyargs {
for parameter_with_default in &parameters.kwonlyargs {
self.visit_parameter(&parameter_with_default.def);
}
if let Some(arg) = &arguments.kwarg {
if let Some(arg) = &parameters.kwarg {
self.visit_parameter(arg);
}

// Step 4: Analysis
analyze::parameters(arguments, self);
analyze::parameters(parameters, self);
}

fn visit_parameter(&mut self, arg: &'b Parameter) {
fn visit_parameter(&mut self, parameter: &'b Parameter) {
// Step 1: Binding.
// Bind, but intentionally avoid walking the annotation, as we handle it
// upstream.
self.add_binding(
&arg.arg,
arg.identifier(),
&parameter.arg,
parameter.identifier(),
BindingKind::Argument,
BindingFlags::empty(),
);

// Step 4: Analysis
analyze::parameter(arg, self);
analyze::parameter(parameter, self);
}

fn visit_pattern(&mut self, pattern: &'b Pattern) {
Expand Down Expand Up @@ -1824,9 +1824,13 @@ impl<'a> Checker<'a> {
self.semantic.restore(snapshot);

match &self.semantic.stmt() {
Stmt::FunctionDef(ast::StmtFunctionDef { body, args, .. })
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, args, .. }) => {
self.visit_parameters(args);
Stmt::FunctionDef(ast::StmtFunctionDef {
body, parameters, ..
})
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
body, parameters, ..
}) => {
self.visit_parameters(parameters);
self.visit_body(body);
}
_ => {
Expand All @@ -1846,12 +1850,12 @@ impl<'a> Checker<'a> {
self.semantic.restore(snapshot);

if let Expr::Lambda(ast::ExprLambda {
args,
parameters,
body,
range: _,
}) = expr
{
self.visit_parameters(args);
self.visit_parameters(parameters);
self.visit_expr(body);
} else {
unreachable!("Expected Expr::Lambda");
Expand Down
6 changes: 3 additions & 3 deletions crates/ruff/src/rules/flake8_annotations/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ pub(super) fn match_function_def(
match stmt {
Stmt::FunctionDef(ast::StmtFunctionDef {
name,
args,
parameters,
returns,
body,
decorator_list,
..
})
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
name,
args,
parameters,
returns,
body,
decorator_list,
..
}) => (
name,
args,
parameters,
returns.as_ref().map(AsRef::as_ref),
body,
decorator_list,
Expand Down
14 changes: 9 additions & 5 deletions crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,12 @@ struct SuspiciousVariablesVisitor<'a> {
impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
fn visit_stmt(&mut self, stmt: &'a Stmt) {
match stmt {
Stmt::FunctionDef(ast::StmtFunctionDef { args, body, .. })
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { args, body, .. }) => {
Stmt::FunctionDef(ast::StmtFunctionDef {
parameters, body, ..
})
| Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
parameters, body, ..
}) => {
// Collect all loaded variable names.
let mut visitor = LoadedNamesVisitor::default();
visitor.visit_body(body);
Expand All @@ -99,7 +103,7 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
return false;
}

if includes_arg_name(&loaded.id, args) {
if includes_arg_name(&loaded.id, parameters) {
return false;
}

Expand Down Expand Up @@ -165,7 +169,7 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
}
}
Expr::Lambda(ast::ExprLambda {
args,
parameters,
body,
range: _,
}) => {
Expand All @@ -181,7 +185,7 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
return false;
}

if includes_arg_name(&loaded.id, args) {
if includes_arg_name(&loaded.id, parameters) {
return false;
}

Expand Down
8 changes: 4 additions & 4 deletions crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ where
}
}
Expr::Lambda(ast::ExprLambda {
args,
parameters,
body,
range: _,
}) => {
Expand All @@ -80,11 +80,11 @@ where
def,
default: _,
range: _,
} in args
} in parameters
.posonlyargs
.iter()
.chain(&args.args)
.chain(&args.kwonlyargs)
.chain(&parameters.args)
.chain(&parameters.kwonlyargs)
{
self.names.remove(def.arg.as_str());
}
Expand Down
Loading

0 comments on commit 0cbd6de

Please sign in to comment.