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

Rename Parameter#arg and ParameterWithDefault#def fields (#6255)

Browse source 
## Summary

This PR renames...

- `Parameter#arg` to `Parameter#name`
- `ParameterWithDefault#def` to `ParameterWithDefault#parameter` (such
that `ParameterWithDefault` has a `default` and a `parameter`)

## Test Plan

`cargo test`
This commit is contained in:
Charlie Marsh 2023-08-01 14:28:34 -04:00 • committed by GitHub
parent adc8bb7821
commit 9c708d8fc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 268 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff/src/checkers/ast/analyze/parameter.rs
View file

@ -8,14 +8,14 @@ use crate::rules::{flake8_builtins, pep8_naming, pycodestyle};
pub(crate) fn parameter(parameter: &Parameter, checker: &mut Checker) { pub(crate) fn parameter(parameter: &Parameter, checker: &mut Checker) {
if checker.enabled(Rule::AmbiguousVariableName) { if checker.enabled(Rule::AmbiguousVariableName) {
if let Some(diagnostic) = if let Some(diagnostic) =
pycodestyle::rules::ambiguous_variable_name(&parameter.arg, parameter.range()) pycodestyle::rules::ambiguous_variable_name(&parameter.name, parameter.range())
{ {
checker.diagnostics.push(diagnostic); checker.diagnostics.push(diagnostic);
} }
} }
if checker.enabled(Rule::InvalidArgumentName) { if checker.enabled(Rule::InvalidArgumentName) {
if let Some(diagnostic) = pep8_naming::rules::invalid_argument_name( if let Some(diagnostic) = pep8_naming::rules::invalid_argument_name(
&parameter.arg, &parameter.name,
parameter, parameter,
&checker.settings.pep8_naming.ignore_names, &checker.settings.pep8_naming.ignore_names,
) { ) {

12
crates/ruff/src/checkers/ast/mod.rs
View file

@ -491,7 +491,7 @@ where
.chain(&parameters.args) .chain(&parameters.args)
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
{ {
if let Some(expr) = &parameter_with_default.def.annotation { if let Some(expr) = &parameter_with_default.parameter.annotation {
if runtime_annotation { if runtime_annotation {
self.visit_runtime_annotation(expr); self.visit_runtime_annotation(expr);
} else { } else {
@ -896,7 +896,7 @@ where
// Visit the default arguments, but avoid the body, which will be deferred. // Visit the default arguments, but avoid the body, which will be deferred.
for ParameterWithDefault { for ParameterWithDefault {
default, default,
def: _, parameter: _,
range: _, range: _,
} in parameters } in parameters
.posonlyargs .posonlyargs
@ -1298,16 +1298,16 @@ where
// Bind, but intentionally avoid walking default expressions, as we handle them // Bind, but intentionally avoid walking default expressions, as we handle them
// upstream. // upstream.
for parameter_with_default in &parameters.posonlyargs { for parameter_with_default in &parameters.posonlyargs {
self.visit_parameter(&parameter_with_default.def); self.visit_parameter(&parameter_with_default.parameter);
} }
for parameter_with_default in &parameters.args { for parameter_with_default in &parameters.args {
self.visit_parameter(&parameter_with_default.def); self.visit_parameter(&parameter_with_default.parameter);
} }
if let Some(arg) = &parameters.vararg { if let Some(arg) = &parameters.vararg {
self.visit_parameter(arg); self.visit_parameter(arg);
} }
for parameter_with_default in &parameters.kwonlyargs { for parameter_with_default in &parameters.kwonlyargs {
self.visit_parameter(&parameter_with_default.def); self.visit_parameter(&parameter_with_default.parameter);
} }
if let Some(arg) = &parameters.kwarg { if let Some(arg) = &parameters.kwarg {
self.visit_parameter(arg); self.visit_parameter(arg);
@ -1322,7 +1322,7 @@ where
// Bind, but intentionally avoid walking the annotation, as we handle it // Bind, but intentionally avoid walking the annotation, as we handle it
// upstream. // upstream.
self.add_binding( self.add_binding(
&parameter.arg, &parameter.name,
parameter.identifier(), parameter.identifier(),
BindingKind::Argument, BindingKind::Argument,
BindingFlags::empty(), BindingFlags::empty(),

39
crates/ruff/src/rules/flake8_annotations/rules/definition.rs
View file

@ -525,7 +525,7 @@ pub(crate) fn definition(
// ANN001, ANN401 // ANN001, ANN401
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
} in arguments } in arguments
@ -542,26 +542,29 @@ pub(crate) fn definition(
) )
{ {
// ANN401 for dynamically typed arguments // ANN401 for dynamically typed arguments
if let Some(annotation) = &def.annotation { if let Some(annotation) = &parameter.annotation {
has_any_typed_arg = true; has_any_typed_arg = true;
if checker.enabled(Rule::AnyType) && !is_overridden { if checker.enabled(Rule::AnyType) && !is_overridden {
check_dynamically_typed( check_dynamically_typed(
checker, checker,
annotation, annotation,
|| def.arg.to_string(), || parameter.name.to_string(),
&mut diagnostics, &mut diagnostics,
); );
} }
} else { } else {
if !(checker.settings.flake8_annotations.suppress_dummy_args if !(checker.settings.flake8_annotations.suppress_dummy_args
&& checker.settings.dummy_variable_rgx.is_match(&def.arg)) && checker
.settings
.dummy_variable_rgx
.is_match(&parameter.name))
{ {
if checker.enabled(Rule::MissingTypeFunctionArgument) { if checker.enabled(Rule::MissingTypeFunctionArgument) {
diagnostics.push(Diagnostic::new( diagnostics.push(Diagnostic::new(
MissingTypeFunctionArgument { MissingTypeFunctionArgument {
name: def.arg.to_string(), name: parameter.name.to_string(),
}, },
def.range(), parameter.range(),
)); ));
} }
} }
@ -574,18 +577,18 @@ pub(crate) fn definition(
has_any_typed_arg = true; has_any_typed_arg = true;
if !checker.settings.flake8_annotations.allow_star_arg_any { if !checker.settings.flake8_annotations.allow_star_arg_any {
if checker.enabled(Rule::AnyType) && !is_overridden { if checker.enabled(Rule::AnyType) && !is_overridden {
let name = &arg.arg; let name = &arg.name;
check_dynamically_typed(checker, expr, || format!("*{name}"), &mut diagnostics); check_dynamically_typed(checker, expr, || format!("*{name}"), &mut diagnostics);
} }
} }
} else { } else {
if !(checker.settings.flake8_annotations.suppress_dummy_args if !(checker.settings.flake8_annotations.suppress_dummy_args
&& checker.settings.dummy_variable_rgx.is_match(&arg.arg)) && checker.settings.dummy_variable_rgx.is_match(&arg.name))
{ {
if checker.enabled(Rule::MissingTypeArgs) { if checker.enabled(Rule::MissingTypeArgs) {
diagnostics.push(Diagnostic::new( diagnostics.push(Diagnostic::new(
MissingTypeArgs { MissingTypeArgs {
name: arg.arg.to_string(), name: arg.name.to_string(),
}, },
arg.range(), arg.range(),
)); ));
@ -600,7 +603,7 @@ pub(crate) fn definition(
has_any_typed_arg = true; has_any_typed_arg = true;
if !checker.settings.flake8_annotations.allow_star_arg_any { if !checker.settings.flake8_annotations.allow_star_arg_any {
if checker.enabled(Rule::AnyType) && !is_overridden { if checker.enabled(Rule::AnyType) && !is_overridden {
let name = &arg.arg; let name = &arg.name;
check_dynamically_typed( check_dynamically_typed(
checker, checker,
expr, expr,
@ -611,12 +614,12 @@ pub(crate) fn definition(
} }
} else { } else {
if !(checker.settings.flake8_annotations.suppress_dummy_args if !(checker.settings.flake8_annotations.suppress_dummy_args
&& checker.settings.dummy_variable_rgx.is_match(&arg.arg)) && checker.settings.dummy_variable_rgx.is_match(&arg.name))
{ {
if checker.enabled(Rule::MissingTypeKwargs) { if checker.enabled(Rule::MissingTypeKwargs) {
diagnostics.push(Diagnostic::new( diagnostics.push(Diagnostic::new(
MissingTypeKwargs { MissingTypeKwargs {
name: arg.arg.to_string(), name: arg.name.to_string(),
}, },
arg.range(), arg.range(),
)); ));
@ -628,7 +631,7 @@ pub(crate) fn definition(
// ANN101, ANN102 // ANN101, ANN102
if is_method && !visibility::is_staticmethod(cast::decorator_list(stmt), checker.semantic()) { if is_method && !visibility::is_staticmethod(cast::decorator_list(stmt), checker.semantic()) {
if let Some(ParameterWithDefault { if let Some(ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
}) = arguments }) = arguments
@ -636,23 +639,23 @@ pub(crate) fn definition(
.first() .first()
.or_else(|| arguments.args.first()) .or_else(|| arguments.args.first())
{ {
if def.annotation.is_none() { if parameter.annotation.is_none() {
if visibility::is_classmethod(cast::decorator_list(stmt), checker.semantic()) { if visibility::is_classmethod(cast::decorator_list(stmt), checker.semantic()) {
if checker.enabled(Rule::MissingTypeCls) { if checker.enabled(Rule::MissingTypeCls) {
diagnostics.push(Diagnostic::new( diagnostics.push(Diagnostic::new(
MissingTypeCls { MissingTypeCls {
name: def.arg.to_string(), name: parameter.name.to_string(),
}, },
def.range(), parameter.range(),
)); ));
} }
} else { } else {
if checker.enabled(Rule::MissingTypeSelf) { if checker.enabled(Rule::MissingTypeSelf) {
diagnostics.push(Diagnostic::new( diagnostics.push(Diagnostic::new(
MissingTypeSelf { MissingTypeSelf {
name: def.arg.to_string(), name: parameter.name.to_string(),
}, },
def.range(), parameter.range(),
)); ));
} }
} }

6
crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
View file

@ -55,7 +55,7 @@ impl Violation for HardcodedPasswordDefault {
fn check_password_kwarg(parameter: &Parameter, default: &Expr) -> Option<Diagnostic> { fn check_password_kwarg(parameter: &Parameter, default: &Expr) -> Option<Diagnostic> {
string_literal(default).filter(|string| !string.is_empty())?; string_literal(default).filter(|string| !string.is_empty())?;
let kwarg_name = &parameter.arg; let kwarg_name = &parameter.name;
if !matches_password_name(kwarg_name) { if !matches_password_name(kwarg_name) {
return None; return None;
} }
@ -70,7 +70,7 @@ fn check_password_kwarg(parameter: &Parameter, default: &Expr) -> Option<Diagnos
/// S107 /// S107
pub(crate) fn hardcoded_password_default(checker: &mut Checker, parameters: &Parameters) { pub(crate) fn hardcoded_password_default(checker: &mut Checker, parameters: &Parameters) {
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default, default,
range: _, range: _,
} in parameters } in parameters
@ -82,7 +82,7 @@ pub(crate) fn hardcoded_password_default(checker: &mut Checker, parameters: &Par
let Some(default) = default else { let Some(default) = default else {
continue; continue;
}; };
if let Some(diagnostic) = check_password_kwarg(def, default) { if let Some(diagnostic) = check_password_kwarg(parameter, default) {
checker.diagnostics.push(diagnostic); checker.diagnostics.push(diagnostic);
} }
} }

2
crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_default_value_in_function_definition.rs
View file

@ -73,7 +73,7 @@ pub(crate) fn check_boolean_default_value_in_function_definition(
} }
for ParameterWithDefault { for ParameterWithDefault {
def: _, parameter: _,
default, default,
range: _, range: _,
} in parameters.args.iter().chain(&parameters.posonlyargs) } in parameters.args.iter().chain(&parameters.posonlyargs)

8
crates/ruff/src/rules/flake8_boolean_trap/rules/check_positional_boolean_in_def.rs
View file

@ -96,15 +96,15 @@ pub(crate) fn check_positional_boolean_in_def(
} }
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
} in parameters.posonlyargs.iter().chain(&parameters.args) } in parameters.posonlyargs.iter().chain(&parameters.args)
{ {
if def.annotation.is_none() { if parameter.annotation.is_none() {
continue; continue;
} }
let Some(expr) = &def.annotation else { let Some(expr) = &parameter.annotation else {
continue; continue;
}; };
@ -122,7 +122,7 @@ pub(crate) fn check_positional_boolean_in_def(
} }
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(
BooleanPositionalArgInFunctionDefinition, BooleanPositionalArgInFunctionDefinition,
def.range(), parameter.range(),
)); ));
} }
} }

2
crates/ruff/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs
View file

@ -118,7 +118,7 @@ pub(crate) fn function_call_in_argument_default(checker: &mut Checker, parameter
let mut visitor = ArgumentDefaultVisitor::new(checker.semantic(), extend_immutable_calls); let mut visitor = ArgumentDefaultVisitor::new(checker.semantic(), extend_immutable_calls);
for ParameterWithDefault { for ParameterWithDefault {
default, default,
def: _, parameter: _,
range: _, range: _,
} in parameters } in parameters
.posonlyargs .posonlyargs

4
crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
View file

@ -77,7 +77,7 @@ where
}) => { }) => {
visitor::walk_expr(self, body); visitor::walk_expr(self, body);
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
} in parameters } in parameters
@ -86,7 +86,7 @@ where
.chain(&parameters.args) .chain(&parameters.args)
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
{ {
self.names.remove(def.arg.as_str()); self.names.remove(parameter.name.as_str());
} }
} }
_ => visitor::walk_expr(self, expr), _ => visitor::walk_expr(self, expr),

4
crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
View file

@ -60,7 +60,7 @@ impl Violation for MutableArgumentDefault {
pub(crate) fn mutable_argument_default(checker: &mut Checker, parameters: &Parameters) { pub(crate) fn mutable_argument_default(checker: &mut Checker, parameters: &Parameters) {
// Scan in reverse order to right-align zip(). // Scan in reverse order to right-align zip().
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default, default,
range: _, range: _,
} in parameters } in parameters
@ -74,7 +74,7 @@ pub(crate) fn mutable_argument_default(checker: &mut Checker, parameters: &Param
}; };
if is_mutable_expr(default, checker.semantic()) if is_mutable_expr(default, checker.semantic())
&& !def && !parameter
.annotation .annotation
.as_ref() .as_ref()
.is_some_and(|expr| is_immutable_annotation(expr, checker.semantic())) .is_some_and(|expr| is_immutable_annotation(expr, checker.semantic()))

4
crates/ruff/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs
View file

@ -64,12 +64,12 @@ impl Violation for BuiltinArgumentShadowing {
/// A002 /// A002
pub(crate) fn builtin_argument_shadowing(checker: &mut Checker, parameter: &Parameter) { pub(crate) fn builtin_argument_shadowing(checker: &mut Checker, parameter: &Parameter) {
if shadows_builtin( if shadows_builtin(
parameter.arg.as_str(), parameter.name.as_str(),
&checker.settings.flake8_builtins.builtins_ignorelist, &checker.settings.flake8_builtins.builtins_ignorelist,
) { ) {
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(
BuiltinArgumentShadowing { BuiltinArgumentShadowing {
name: parameter.arg.to_string(), name: parameter.name.to_string(),
}, },
parameter.range(), parameter.range(),
)); ));

2
crates/ruff/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs
View file

@ -62,7 +62,7 @@ pub(crate) fn any_eq_ne_annotation(checker: &mut Checker, name: &str, parameters
return; return;
} }
let Some(annotation) = &parameters.args[1].def.annotation else { let Some(annotation) = &parameters.args[1].parameter.annotation else {
return; return;
}; };

2
crates/ruff/src/rules/flake8_pyi/rules/exit_annotations.rs
View file

@ -213,7 +213,7 @@ fn check_positional_args(
]; ];
for (arg, (error_info, predicate)) in positional_args.iter().skip(1).take(3).zip(validations) { for (arg, (error_info, predicate)) in positional_args.iter().skip(1).take(3).zip(validations) {
let Some(annotation) = arg.def.annotation.as_ref() else { let Some(annotation) = arg.parameter.annotation.as_ref() else {
continue; continue;
}; };

2
crates/ruff/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs
View file

@ -53,7 +53,7 @@ pub(crate) fn no_return_argument_annotation(checker: &mut Checker, parameters: &
.iter() .iter()
.chain(&parameters.args) .chain(&parameters.args)
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
.filter_map(|arg| arg.def.annotation.as_ref()) .filter_map(|arg| arg.parameter.annotation.as_ref())
{ {
if checker.semantic().match_typing_expr(annotation, "NoReturn") { if checker.semantic().match_typing_expr(annotation, "NoReturn") {
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(

2
crates/ruff/src/rules/flake8_pyi/rules/redundant_numeric_union.rs
View file

@ -59,7 +59,7 @@ pub(crate) fn redundant_numeric_union(checker: &mut Checker, parameters: &Parame
.iter() .iter()
.chain(parameters.posonlyargs.iter()) .chain(parameters.posonlyargs.iter())
.chain(parameters.kwonlyargs.iter()) .chain(parameters.kwonlyargs.iter())
.filter_map(|arg| arg.def.annotation.as_ref()) .filter_map(|arg| arg.parameter.annotation.as_ref())
{ {
check_annotation(checker, annotation); check_annotation(checker, annotation);
} }

8
crates/ruff/src/rules/flake8_pyi/rules/simple_defaults.rs
View file

@ -402,7 +402,7 @@ fn is_annotatable_type_alias(value: &Expr, semantic: &SemanticModel) -> bool {
/// PYI011 /// PYI011
pub(crate) fn typed_argument_simple_defaults(checker: &mut Checker, parameters: &Parameters) { pub(crate) fn typed_argument_simple_defaults(checker: &mut Checker, parameters: &Parameters) {
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default, default,
range: _, range: _,
} in parameters } in parameters
@ -414,7 +414,7 @@ pub(crate) fn typed_argument_simple_defaults(checker: &mut Checker, parameters:
let Some(default) = default else { let Some(default) = default else {
continue; continue;
}; };
if def.annotation.is_some() { if parameter.annotation.is_some() {
if !is_valid_default_value_with_annotation( if !is_valid_default_value_with_annotation(
default, default,
true, true,
@ -439,7 +439,7 @@ pub(crate) fn typed_argument_simple_defaults(checker: &mut Checker, parameters:
/// PYI014 /// PYI014
pub(crate) fn argument_simple_defaults(checker: &mut Checker, parameters: &Parameters) { pub(crate) fn argument_simple_defaults(checker: &mut Checker, parameters: &Parameters) {
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default, default,
range: _, range: _,
} in parameters } in parameters
@ -451,7 +451,7 @@ pub(crate) fn argument_simple_defaults(checker: &mut Checker, parameters: &Param
let Some(default) = default else { let Some(default) = default else {
continue; continue;
}; };
if def.annotation.is_none() { if parameter.annotation.is_none() {
if !is_valid_default_value_with_annotation( if !is_valid_default_value_with_annotation(
default, default,
true, true,

6
crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs
View file

@ -615,17 +615,17 @@ fn check_test_function_args(checker: &mut Checker, parameters: &Parameters) {
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
.for_each( .for_each(
|ParameterWithDefault { |ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
}| { }| {
let name = &def.arg; let name = &parameter.name;
if name.starts_with('_') { if name.starts_with('_') {
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(
PytestFixtureParamWithoutValue { PytestFixtureParamWithoutValue {
name: name.to_string(), name: name.to_string(),
}, },
def.range(), parameter.range(),
)); ));
} }
}, },

10
crates/ruff/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
View file

@ -227,7 +227,7 @@ fn function(
.iter() .iter()
.chain(&parameters.args) .chain(&parameters.args)
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
.map(|parameter_with_default| &parameter_with_default.def) .map(|parameter_with_default| &parameter_with_default.parameter)
.chain( .chain(
iter::once::<Option<&Parameter>>(parameters.vararg.as_deref()) iter::once::<Option<&Parameter>>(parameters.vararg.as_deref())
.flatten() .flatten()
@ -264,7 +264,7 @@ fn method(
.chain(&parameters.args) .chain(&parameters.args)
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
.skip(1) .skip(1)
.map(|parameter_with_default| &parameter_with_default.def) .map(|parameter_with_default| &parameter_with_default.parameter)
.chain( .chain(
iter::once::<Option<&Parameter>>(parameters.vararg.as_deref()) iter::once::<Option<&Parameter>>(parameters.vararg.as_deref())
.flatten() .flatten()
@ -295,14 +295,14 @@ fn call<'a>(
) { ) {
diagnostics.extend(parameters.filter_map(|arg| { diagnostics.extend(parameters.filter_map(|arg| {
let binding = values let binding = values
.get(arg.arg.as_str()) .get(arg.name.as_str())
.map(|binding_id| semantic.binding(binding_id))?; .map(|binding_id| semantic.binding(binding_id))?;
if binding.kind.is_argument() if binding.kind.is_argument()
&& !binding.is_used() && !binding.is_used()
&& !dummy_variable_rgx.is_match(arg.arg.as_str()) && !dummy_variable_rgx.is_match(arg.name.as_str())
{ {
Some(Diagnostic::new( Some(Diagnostic::new(
argumentable.check_for(arg.arg.to_string()), argumentable.check_for(arg.name.to_string()),
binding.range, binding.range,
)) ))
} else { } else {

6
crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_class_method.rs
View file

@ -75,7 +75,7 @@ pub(crate) fn invalid_first_argument_name_for_class_method(
return None; return None;
} }
if let Some(ParameterWithDefault { if let Some(ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
}) = parameters }) = parameters
@ -83,7 +83,7 @@ pub(crate) fn invalid_first_argument_name_for_class_method(
.first() .first()
.or_else(|| parameters.args.first()) .or_else(|| parameters.args.first())
{ {
if &def.arg != "cls" { if &parameter.name != "cls" {
if checker if checker
.settings .settings
.pep8_naming .pep8_naming
@ -95,7 +95,7 @@ pub(crate) fn invalid_first_argument_name_for_class_method(
} }
return Some(Diagnostic::new( return Some(Diagnostic::new(
InvalidFirstArgumentNameForClassMethod, InvalidFirstArgumentNameForClassMethod,
def.range(), parameter.range(),
)); ));
} }
} }

4
crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_method.rs
View file

@ -76,7 +76,7 @@ pub(crate) fn invalid_first_argument_name_for_method(
.posonlyargs .posonlyargs
.first() .first()
.or_else(|| parameters.args.first())?; .or_else(|| parameters.args.first())?;
if &arg.def.arg == "self" { if &arg.parameter.name == "self" {
return None; return None;
} }
if checker if checker
@ -90,6 +90,6 @@ pub(crate) fn invalid_first_argument_name_for_method(
} }
Some(Diagnostic::new( Some(Diagnostic::new(
InvalidFirstArgumentNameForMethod, InvalidFirstArgumentNameForMethod,
arg.def.range(), arg.parameter.range(),
)) ))
} }

8
crates/ruff/src/rules/pycodestyle/rules/lambda_assignment.rs
View file

@ -196,11 +196,11 @@ fn function(
.iter() .iter()
.enumerate() .enumerate()
.map(|(idx, parameter)| ParameterWithDefault { .map(|(idx, parameter)| ParameterWithDefault {
def: Parameter { parameter: Parameter {
annotation: arg_types annotation: arg_types
.get(idx) .get(idx)
.map(|arg_type| Box::new(arg_type.clone())), .map(|arg_type| Box::new(arg_type.clone())),
..parameter.def.clone() ..parameter.parameter.clone()
}, },
..parameter.clone() ..parameter.clone()
}) })
@ -210,11 +210,11 @@ fn function(
.iter() .iter()
.enumerate() .enumerate()
.map(|(idx, parameter)| ParameterWithDefault { .map(|(idx, parameter)| ParameterWithDefault {
def: Parameter { parameter: Parameter {
annotation: arg_types annotation: arg_types
.get(idx + new_posonlyargs.len()) .get(idx + new_posonlyargs.len())
.map(|arg_type| Box::new(arg_type.clone())), .map(|arg_type| Box::new(arg_type.clone())),
..parameter.def.clone() ..parameter.parameter.clone()
}, },
..parameter.clone() ..parameter.clone()
}) })

8
crates/ruff/src/rules/pydocstyle/rules/sections.rs
View file

@ -1735,7 +1735,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
// Look for arguments that weren't included in the docstring. // Look for arguments that weren't included in the docstring.
let mut missing_arg_names: FxHashSet<String> = FxHashSet::default(); let mut missing_arg_names: FxHashSet<String> = FxHashSet::default();
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default: _, default: _,
range: _, range: _,
} in parameters } in parameters
@ -1751,7 +1751,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
), ),
) )
{ {
let arg_name = def.arg.as_str(); let arg_name = parameter.name.as_str();
if !arg_name.starts_with('_') && !docstrings_args.contains(arg_name) { if !arg_name.starts_with('_') && !docstrings_args.contains(arg_name) {
missing_arg_names.insert(arg_name.to_string()); missing_arg_names.insert(arg_name.to_string());
} }
@ -1760,7 +1760,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
// Check specifically for `vararg` and `kwarg`, which can be prefixed with a // Check specifically for `vararg` and `kwarg`, which can be prefixed with a
// single or double star, respectively. // single or double star, respectively.
if let Some(arg) = &parameters.vararg { if let Some(arg) = &parameters.vararg {
let arg_name = arg.arg.as_str(); let arg_name = arg.name.as_str();
let starred_arg_name = format!("*{arg_name}"); let starred_arg_name = format!("*{arg_name}");
if !arg_name.starts_with('_') if !arg_name.starts_with('_')
&& !docstrings_args.contains(arg_name) && !docstrings_args.contains(arg_name)
@ -1770,7 +1770,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
} }
} }
if let Some(arg) = &parameters.kwarg { if let Some(arg) = &parameters.kwarg {
let arg_name = arg.arg.as_str(); let arg_name = arg.name.as_str();
let starred_arg_name = format!("**{arg_name}"); let starred_arg_name = format!("**{arg_name}");
if !arg_name.starts_with('_') if !arg_name.starts_with('_')
&& !docstrings_args.contains(arg_name) && !docstrings_args.contains(arg_name)

7
crates/ruff/src/rules/pylint/rules/too_many_arguments.rs
View file

@ -64,7 +64,12 @@ pub(crate) fn too_many_arguments(checker: &mut Checker, parameters: &Parameters,
.iter() .iter()
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
.chain(&parameters.posonlyargs) .chain(&parameters.posonlyargs)
.filter(|arg| !checker.settings.dummy_variable_rgx.is_match(&arg.def.arg)) .filter(|arg| {
!checker
.settings
.dummy_variable_rgx
.is_match(&arg.parameter.name)
})
.count(); .count();
if num_arguments > checker.settings.pylint.max_args { if num_arguments > checker.settings.pylint.max_args {
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(

4
crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs
View file

@ -107,8 +107,8 @@ pub(crate) fn super_call_with_parameters(
// Extract the name of the first argument to the enclosing function. // Extract the name of the first argument to the enclosing function.
let Some(ParameterWithDefault { let Some(ParameterWithDefault {
def: Parameter { parameter: Parameter {
arg: parent_arg, .. name: parent_arg, ..
}, },
.. ..
}) = parent_parameters.args.first() }) = parent_parameters.args.first()

4
crates/ruff/src/rules/ruff/rules/implicit_optional.rs
View file

@ -169,7 +169,7 @@ fn generate_fix(checker: &Checker, conversion_type: ConversionType, expr: &Expr)
/// RUF013 /// RUF013
pub(crate) fn implicit_optional(checker: &mut Checker, parameters: &Parameters) { pub(crate) fn implicit_optional(checker: &mut Checker, parameters: &Parameters) {
for ParameterWithDefault { for ParameterWithDefault {
def, parameter,
default, default,
range: _, range: _,
} in parameters } in parameters
@ -182,7 +182,7 @@ pub(crate) fn implicit_optional(checker: &mut Checker, parameters: &Parameters)
if !is_const_none(default) { if !is_const_none(default) {
continue; continue;
} }
let Some(annotation) = &def.annotation else { let Some(annotation) = &parameter.annotation else {
continue; continue;
}; };

4
crates/ruff_python_ast/src/comparable.rs
View file

@ -381,7 +381,7 @@ pub struct ComparableParameter<'a> {
impl<'a> From<&'a ast::Parameter> for ComparableParameter<'a> { impl<'a> From<&'a ast::Parameter> for ComparableParameter<'a> {
fn from(arg: &'a ast::Parameter) -> Self { fn from(arg: &'a ast::Parameter) -> Self {
Self { Self {
arg: arg.arg.as_str(), arg: arg.name.as_str(),
annotation: arg.annotation.as_ref().map(Into::into), annotation: arg.annotation.as_ref().map(Into::into),
} }
} }
@ -396,7 +396,7 @@ pub struct ComparableParameterWithDefault<'a> {
impl<'a> From<&'a ast::ParameterWithDefault> for ComparableParameterWithDefault<'a> { impl<'a> From<&'a ast::ParameterWithDefault> for ComparableParameterWithDefault<'a> {
fn from(arg: &'a ast::ParameterWithDefault) -> Self { fn from(arg: &'a ast::ParameterWithDefault) -> Self {
Self { Self {
def: (&arg.def).into(), def: (&arg.parameter).into(),
default: arg.default.as_ref().map(Into::into), default: arg.default.as_ref().map(Into::into),
} }
} }

8
crates/ruff_python_ast/src/helpers.rs
View file

@ -370,7 +370,7 @@ where
.as_ref() .as_ref()
.is_some_and(|expr| any_over_expr(expr, func)) .is_some_and(|expr| any_over_expr(expr, func))
|| parameter || parameter
.def .parameter
.annotation .annotation
.as_ref() .as_ref()
.is_some_and(|expr| any_over_expr(expr, func)) .is_some_and(|expr| any_over_expr(expr, func))
@ -719,17 +719,17 @@ pub fn includes_arg_name(name: &str, parameters: &Parameters) -> bool {
.iter() .iter()
.chain(&parameters.args) .chain(&parameters.args)
.chain(&parameters.kwonlyargs) .chain(&parameters.kwonlyargs)
.any(|arg| arg.def.arg.as_str() == name) .any(|arg| arg.parameter.name.as_str() == name)
{ {
return true; return true;
} }
if let Some(arg) = &parameters.vararg { if let Some(arg) = &parameters.vararg {
if arg.arg.as_str() == name { if arg.name.as_str() == name {
return true; return true;
} }
} }
if let Some(arg) = &parameters.kwarg { if let Some(arg) = &parameters.kwarg {
if arg.arg.as_str() == name { if arg.name.as_str() == name {
return true; return true;
} }
} }

4
crates/ruff_python_ast/src/identifier.rs
View file

@ -47,7 +47,7 @@ impl Identifier for Parameter {
/// ... /// ...
/// ``` /// ```
fn identifier(&self) -> TextRange { fn identifier(&self) -> TextRange {
self.arg.range() self.name.range()
} }
} }
@ -60,7 +60,7 @@ impl Identifier for ParameterWithDefault {
/// ... /// ...
/// ``` /// ```
fn identifier(&self) -> TextRange { fn identifier(&self) -> TextRange {
self.def.identifier() self.parameter.identifier()
} }
} }

14
crates/ruff_python_ast/src/nodes.rs
View file

@ -1826,7 +1826,7 @@ impl From<ExceptHandlerExceptHandler> for ExceptHandler {
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct Parameter { pub struct Parameter {
pub range: TextRange, pub range: TextRange,
pub arg: Identifier, pub name: Identifier,
pub annotation: Option<Box<Expr>>, pub annotation: Option<Box<Expr>>,
} }
@ -2069,7 +2069,7 @@ pub struct Parameters {
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct ParameterWithDefault { pub struct ParameterWithDefault {
pub range: TextRange, pub range: TextRange,
pub def: Parameter, pub parameter: Parameter,
pub default: Option<Box<Expr>>, pub default: Option<Box<Expr>>,
} }
@ -2113,24 +2113,24 @@ fn clone_boxed_expr(expr: &Box<Expr>) -> Box<Expr> {
impl ParameterWithDefault { impl ParameterWithDefault {
pub fn as_parameter(&self) -> &Parameter { pub fn as_parameter(&self) -> &Parameter {
&self.def &self.parameter
} }
pub fn to_parameter(&self) -> (Parameter, Option<Box<Expr>>) { pub fn to_parameter(&self) -> (Parameter, Option<Box<Expr>>) {
let ParameterWithDefault { let ParameterWithDefault {
range: _, range: _,
def, parameter,
default, default,
} = self; } = self;
(def.clone(), default.as_ref().map(clone_boxed_expr)) (parameter.clone(), default.as_ref().map(clone_boxed_expr))
} }
pub fn into_parameter(self) -> (Parameter, Option<Box<Expr>>) { pub fn into_parameter(self) -> (Parameter, Option<Box<Expr>>) {
let ParameterWithDefault { let ParameterWithDefault {
range: _, range: _,
def, parameter,
default, default,
} = self; } = self;
(def, default) (parameter, default)
} }
} }

6
crates/ruff_python_ast/src/visitor.rs
View file

@ -664,16 +664,16 @@ pub fn walk_parameters<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, parameters:
} }
for arg in &parameters.posonlyargs { for arg in &parameters.posonlyargs {
visitor.visit_parameter(&arg.def); visitor.visit_parameter(&arg.parameter);
} }
for arg in &parameters.args { for arg in &parameters.args {
visitor.visit_parameter(&arg.def); visitor.visit_parameter(&arg.parameter);
} }
if let Some(arg) = &parameters.vararg { if let Some(arg) = &parameters.vararg {
visitor.visit_parameter(arg); visitor.visit_parameter(arg);
} }
for arg in &parameters.kwonlyargs { for arg in &parameters.kwonlyargs {
visitor.visit_parameter(&arg.def); visitor.visit_parameter(&arg.parameter);
} }
if let Some(arg) = &parameters.kwarg { if let Some(arg) = &parameters.kwarg {
visitor.visit_parameter(arg); visitor.visit_parameter(arg);

2
crates/ruff_python_ast/src/visitor/preorder.rs
View file

@ -785,7 +785,7 @@ pub fn walk_parameter_with_default<'a, V>(
) where ) where
V: PreorderVisitor<'a> + ?Sized, V: PreorderVisitor<'a> + ?Sized,
{ {
visitor.visit_parameter(&parameter_with_default.def); visitor.visit_parameter(&parameter_with_default.parameter);
if let Some(expr) = &parameter_with_default.default { if let Some(expr) = &parameter_with_default.default {
visitor.visit_expr(expr); visitor.visit_expr(expr);
} }

4
crates/ruff_python_codegen/src/generator.rs
View file

@ -1355,7 +1355,7 @@ impl<'a> Generator<'a> {
} }
fn unparse_parameter(&mut self, parameter: &Parameter) { fn unparse_parameter(&mut self, parameter: &Parameter) {
self.p_id(&parameter.arg); self.p_id(&parameter.name);
if let Some(ann) = &parameter.annotation { if let Some(ann) = &parameter.annotation {
self.p(": "); self.p(": ");
self.unparse_expr(ann, precedence::COMMA); self.unparse_expr(ann, precedence::COMMA);
@ -1363,7 +1363,7 @@ impl<'a> Generator<'a> {
} }
fn unparse_parameter_with_default(&mut self, parameter_with_default: &ParameterWithDefault) { fn unparse_parameter_with_default(&mut self, parameter_with_default: &ParameterWithDefault) {
self.unparse_parameter(&parameter_with_default.def); self.unparse_parameter(&parameter_with_default.parameter);
if let Some(default) = &parameter_with_default.default { if let Some(default) = &parameter_with_default.default {
self.p("="); self.p("=");
self.unparse_expr(default, precedence::COMMA); self.unparse_expr(default, precedence::COMMA);

4
crates/ruff_python_formatter/src/other/parameter.rs
View file

@ -10,11 +10,11 @@ impl FormatNodeRule<Parameter> for FormatParameter {
fn fmt_fields(&self, item: &Parameter, f: &mut PyFormatter) -> FormatResult<()> { fn fmt_fields(&self, item: &Parameter, f: &mut PyFormatter) -> FormatResult<()> {
let Parameter { let Parameter {
range: _, range: _,
arg, name,
annotation, annotation,
} = item; } = item;
arg.format().fmt(f)?; name.format().fmt(f)?;
if let Some(annotation) = annotation { if let Some(annotation) = annotation {
write!(f, [text(":"), space(), annotation.format()])?; write!(f, [text(":"), space(), annotation.format()])?;

6
crates/ruff_python_formatter/src/other/parameter_with_default.rs
View file

@ -11,14 +11,14 @@ impl FormatNodeRule<ParameterWithDefault> for FormatParameterWithDefault {
fn fmt_fields(&self, item: &ParameterWithDefault, f: &mut PyFormatter) -> FormatResult<()> { fn fmt_fields(&self, item: &ParameterWithDefault, f: &mut PyFormatter) -> FormatResult<()> {
let ParameterWithDefault { let ParameterWithDefault {
range: _, range: _,
def, parameter,
default, default,
} = item; } = item;
write!(f, [def.format()])?; write!(f, [parameter.format()])?;
if let Some(default) = default { if let Some(default) = default {
let space = def.annotation.is_some().then_some(space()); let space = parameter.annotation.is_some().then_some(space());
write!(f, [space, text("="), space, group(&default.format())])?; write!(f, [space, text("="), space, group(&default.format())])?;
} }

6
crates/ruff_python_parser/src/function.rs
View file

@ -32,12 +32,12 @@ pub(crate) fn validate_arguments(arguments: &ast::Parameters) -> Result<(), Lexi
for arg in posonlyargs for arg in posonlyargs
.chain(args) .chain(args)
.chain(kwonlyargs) .chain(kwonlyargs)
.map(|arg| &arg.def) .map(|arg| &arg.parameter)
.chain(vararg) .chain(vararg)
.chain(kwarg) .chain(kwarg)
{ {
let range = arg.range; let range = arg.range;
let arg_name = arg.arg.as_str(); let arg_name = arg.name.as_str();
if !all_arg_names.insert(arg_name) { if !all_arg_names.insert(arg_name) {
return Err(LexicalError { return Err(LexicalError {
error: LexicalErrorType::DuplicateArgumentError(arg_name.to_string()), error: LexicalErrorType::DuplicateArgumentError(arg_name.to_string()),
@ -66,7 +66,7 @@ pub(crate) fn validate_pos_params(
if let Some(invalid) = first_invalid { if let Some(invalid) = first_invalid {
return Err(LexicalError { return Err(LexicalError {
error: LexicalErrorType::DefaultArgumentError, error: LexicalErrorType::DefaultArgumentError,
location: invalid.def.range.start(), location: invalid.parameter.range.start(),
}); });
} }
Ok(()) Ok(())

14
crates/ruff_python_parser/src/python.lalrpop
View file

@ -1138,33 +1138,33 @@ ParameterDef<ParameterType>: ast::ParameterWithDefault = {
UntypedParameter: ast::ParameterWithDefault = { UntypedParameter: ast::ParameterWithDefault = {
<location:@L> <arg:Identifier> <end_location:@R> => { <location:@L> <arg:Identifier> <end_location:@R> => {
let def = ast::Parameter { arg, annotation: None, range: (location..end_location).into() }; let def = ast::Parameter { name:arg, annotation: None, range: (location..end_location).into() };
ast::ParameterWithDefault { def, default: None, range: (location..end_location).into() } ast::ParameterWithDefault { parameter:def, default: None, range: (location..end_location).into() }
}, },
}; };
StarUntypedParameter: ast::Parameter = { StarUntypedParameter: ast::Parameter = {
<location:@L> <arg:Identifier> <end_location:@R> => ast::Parameter { arg, annotation: None, range: (location..end_location).into() }, <location:@L> <arg:Identifier> <end_location:@R> => ast::Parameter { name:arg, annotation: None, range: (location..end_location).into() },
}; };
TypedParameter: ast::ParameterWithDefault = { TypedParameter: ast::ParameterWithDefault = {
<location:@L> <arg:Identifier> <a:(":" <Test<"all">>)?> <end_location:@R> => { <location:@L> <arg:Identifier> <a:(":" <Test<"all">>)?> <end_location:@R> => {
let annotation = a.map(Box::new); let annotation = a.map(Box::new);
let def = ast::Parameter { arg, annotation, range: (location..end_location).into() }; let def = ast::Parameter { name:arg, annotation, range: (location..end_location).into() };
ast::ParameterWithDefault { def, default: None, range: (location..end_location).into() } ast::ParameterWithDefault { parameter:def, default: None, range: (location..end_location).into() }
}, },
}; };
StarTypedParameter: ast::Parameter = { StarTypedParameter: ast::Parameter = {
<location:@L> <arg:Identifier> <a:(":" <TestOrStarExpr>)?> <end_location:@R> => { <location:@L> <arg:Identifier> <a:(":" <TestOrStarExpr>)?> <end_location:@R> => {
let annotation = a.map(Box::new); let annotation = a.map(Box::new);
ast::Parameter { arg, annotation, range: (location..end_location).into() } ast::Parameter { name:arg, annotation, range: (location..end_location).into() }
}, },
}; };
DoubleStarTypedParameter: ast::Parameter = { DoubleStarTypedParameter: ast::Parameter = {
<location:@L> <arg:Identifier> <a:(":" <Test<"all">>)?> <end_location:@R> => { <location:@L> <arg:Identifier> <a:(":" <Test<"all">>)?> <end_location:@R> => {
let annotation = a.map(Box::new); let annotation = a.map(Box::new);
ast::Parameter { arg, annotation, range: (location..end_location).into() } ast::Parameter { name:arg, annotation, range: (location..end_location).into() }
}, },
}; };

16
crates/ruff_python_parser/src/python.rs
View file

@ -1,5 +1,5 @@
// auto-generated: "lalrpop 0.20.0" // auto-generated: "lalrpop 0.20.0"
// sha3: 9d48ea8f9d9a0a466240b3334066323fb9659fd9efe31f8748e4b940cd71b5e1 // sha3: c7811af123576ce856886b56b55a0ac5e2f03c8b7458080b2b83fb3bec3d52ef
use num_bigint::BigInt; use num_bigint::BigInt;
use ruff_text_size::TextSize; use ruff_text_size::TextSize;
use ruff_python_ast::{self as ast, Ranged, MagicKind}; use ruff_python_ast::{self as ast, Ranged, MagicKind};
@ -33553,8 +33553,8 @@ fn __action165<
) -> ast::ParameterWithDefault ) -> ast::ParameterWithDefault
{ {
{ {
let def = ast::Parameter { arg, annotation: None, range: (location..end_location).into() }; let def = ast::Parameter { name:arg, annotation: None, range: (location..end_location).into() };
ast::ParameterWithDefault { def, default: None, range: (location..end_location).into() } ast::ParameterWithDefault { parameter:def, default: None, range: (location..end_location).into() }
} }
} }
@ -33568,7 +33568,7 @@ fn __action166<
(_, end_location, _): (TextSize, TextSize, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize),
) -> ast::Parameter ) -> ast::Parameter
{ {
ast::Parameter { arg, annotation: None, range: (location..end_location).into() } ast::Parameter { name:arg, annotation: None, range: (location..end_location).into() }
} }
#[allow(unused_variables)] #[allow(unused_variables)]
@ -33584,8 +33584,8 @@ fn __action167<
{ {
{ {
let annotation = a.map(Box::new); let annotation = a.map(Box::new);
let def = ast::Parameter { arg, annotation, range: (location..end_location).into() }; let def = ast::Parameter { name:arg, annotation, range: (location..end_location).into() };
ast::ParameterWithDefault { def, default: None, range: (location..end_location).into() } ast::ParameterWithDefault { parameter:def, default: None, range: (location..end_location).into() }
} }
} }
@ -33602,7 +33602,7 @@ fn __action168<
{ {
{ {
let annotation = a.map(Box::new); let annotation = a.map(Box::new);
ast::Parameter { arg, annotation, range: (location..end_location).into() } ast::Parameter { name:arg, annotation, range: (location..end_location).into() }
} }
} }
@ -33619,7 +33619,7 @@ fn __action169<
{ {
{ {
let annotation = a.map(Box::new); let annotation = a.map(Box::new);
ast::Parameter { arg, annotation, range: (location..end_location).into() } ast::Parameter { name:arg, annotation, range: (location..end_location).into() }
} }
} }

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_kw_only_args.snap
View file

@ -19,9 +19,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 9..10, range: 9..10,
}, },
@ -31,9 +31,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 12..13, range: 12..13,
}, },
@ -43,9 +43,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 15..16, range: 15..16,
def: Parameter { parameter: Parameter {
range: 15..16, range: 15..16,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 15..16, range: 15..16,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_kw_only_args_with_defaults.snap
View file

@ -19,9 +19,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 9..10, range: 9..10,
}, },
@ -31,9 +31,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..16, range: 12..16,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 12..13, range: 12..13,
}, },
@ -53,9 +53,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 18..22, range: 18..22,
def: Parameter { parameter: Parameter {
range: 18..19, range: 18..19,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 18..19, range: 18..19,
}, },

24
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_and_kw_only_args.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -41,9 +41,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 12..13, range: 12..13,
}, },
@ -56,9 +56,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 18..19, range: 18..19,
def: Parameter { parameter: Parameter {
range: 18..19, range: 18..19,
arg: Identifier { name: Identifier {
id: "d", id: "d",
range: 18..19, range: 18..19,
}, },
@ -68,9 +68,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 21..22, range: 21..22,
def: Parameter { parameter: Parameter {
range: 21..22, range: 21..22,
arg: Identifier { name: Identifier {
id: "e", id: "e",
range: 21..22, range: 21..22,
}, },
@ -80,9 +80,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 24..25, range: 24..25,
def: Parameter { parameter: Parameter {
range: 24..25, range: 24..25,
arg: Identifier { name: Identifier {
id: "f", id: "f",
range: 24..25, range: 24..25,
}, },

24
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -41,9 +41,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 12..13, range: 12..13,
}, },
@ -56,9 +56,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 18..19, range: 18..19,
def: Parameter { parameter: Parameter {
range: 18..19, range: 18..19,
arg: Identifier { name: Identifier {
id: "d", id: "d",
range: 18..19, range: 18..19,
}, },
@ -68,9 +68,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 21..25, range: 21..25,
def: Parameter { parameter: Parameter {
range: 21..22, range: 21..22,
arg: Identifier { name: Identifier {
id: "e", id: "e",
range: 21..22, range: 21..22,
}, },
@ -90,9 +90,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 27..31, range: 27..31,
def: Parameter { parameter: Parameter {
range: 27..28, range: 27..28,
arg: Identifier { name: Identifier {
id: "f", id: "f",
range: 27..28, range: 27..28,
}, },

26
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -41,9 +41,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 12..13, range: 12..13,
}, },
@ -55,7 +55,7 @@ Ok(
vararg: Some( vararg: Some(
Parameter { Parameter {
range: 16..20, range: 16..20,
arg: Identifier { name: Identifier {
id: "args", id: "args",
range: 16..20, range: 16..20,
}, },
@ -65,9 +65,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 22..23, range: 22..23,
def: Parameter { parameter: Parameter {
range: 22..23, range: 22..23,
arg: Identifier { name: Identifier {
id: "d", id: "d",
range: 22..23, range: 22..23,
}, },
@ -77,9 +77,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 25..29, range: 25..29,
def: Parameter { parameter: Parameter {
range: 25..26, range: 25..26,
arg: Identifier { name: Identifier {
id: "e", id: "e",
range: 25..26, range: 25..26,
}, },
@ -99,9 +99,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 31..35, range: 31..35,
def: Parameter { parameter: Parameter {
range: 31..32, range: 31..32,
arg: Identifier { name: Identifier {
id: "f", id: "f",
range: 31..32, range: 31..32,
}, },

28
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -41,9 +41,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 12..13, range: 12..13,
}, },
@ -55,7 +55,7 @@ Ok(
vararg: Some( vararg: Some(
Parameter { Parameter {
range: 16..20, range: 16..20,
arg: Identifier { name: Identifier {
id: "args", id: "args",
range: 16..20, range: 16..20,
}, },
@ -65,9 +65,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 22..23, range: 22..23,
def: Parameter { parameter: Parameter {
range: 22..23, range: 22..23,
arg: Identifier { name: Identifier {
id: "d", id: "d",
range: 22..23, range: 22..23,
}, },
@ -77,9 +77,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 25..29, range: 25..29,
def: Parameter { parameter: Parameter {
range: 25..26, range: 25..26,
arg: Identifier { name: Identifier {
id: "e", id: "e",
range: 25..26, range: 25..26,
}, },
@ -99,9 +99,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 31..35, range: 31..35,
def: Parameter { parameter: Parameter {
range: 31..32, range: 31..32,
arg: Identifier { name: Identifier {
id: "f", id: "f",
range: 31..32, range: 31..32,
}, },
@ -123,7 +123,7 @@ Ok(
kwarg: Some( kwarg: Some(
Parameter { Parameter {
range: 39..45, range: 39..45,
arg: Identifier { name: Identifier {
id: "kwargs", id: "kwargs",
range: 39..45, range: 39..45,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_args.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -41,9 +41,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 12..13, range: 12..13,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_args_with_defaults.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..13, range: 9..13,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -51,9 +51,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 15..19, range: 15..19,
def: Parameter { parameter: Parameter {
range: 15..16, range: 15..16,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 15..16, range: 15..16,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__function_pos_args_with_ranges.snap
View file

@ -17,9 +17,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 6..7, range: 6..7,
def: Parameter { parameter: Parameter {
range: 6..7, range: 6..7,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 6..7, range: 6..7,
}, },
@ -29,9 +29,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 9..10, range: 9..10,
}, },
@ -41,9 +41,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 12..13, range: 12..13,
def: Parameter { parameter: Parameter {
range: 12..13, range: 12..13,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 12..13, range: 12..13,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__lambda_kw_only_args.snap
View file

@ -18,9 +18,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 10..11, range: 10..11,
def: Parameter { parameter: Parameter {
range: 10..11, range: 10..11,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 10..11, range: 10..11,
}, },
@ -30,9 +30,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 13..14, range: 13..14,
def: Parameter { parameter: Parameter {
range: 13..14, range: 13..14,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 13..14, range: 13..14,
}, },
@ -42,9 +42,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 16..17, range: 16..17,
def: Parameter { parameter: Parameter {
range: 16..17, range: 16..17,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 16..17, range: 16..17,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__lambda_kw_only_args_with_defaults.snap
View file

@ -18,9 +18,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 10..11, range: 10..11,
def: Parameter { parameter: Parameter {
range: 10..11, range: 10..11,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 10..11, range: 10..11,
}, },
@ -30,9 +30,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 13..17, range: 13..17,
def: Parameter { parameter: Parameter {
range: 13..14, range: 13..14,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 13..14, range: 13..14,
}, },
@ -52,9 +52,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 19..23, range: 19..23,
def: Parameter { parameter: Parameter {
range: 19..20, range: 19..20,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 19..20, range: 19..20,
}, },

20
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__lambda_pos_and_kw_only_args.snap
View file

@ -16,9 +16,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 7..8, range: 7..8,
def: Parameter { parameter: Parameter {
range: 7..8, range: 7..8,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 7..8, range: 7..8,
}, },
@ -28,9 +28,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 10..11, range: 10..11,
def: Parameter { parameter: Parameter {
range: 10..11, range: 10..11,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 10..11, range: 10..11,
}, },
@ -40,9 +40,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 13..14, range: 13..14,
def: Parameter { parameter: Parameter {
range: 13..14, range: 13..14,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 13..14, range: 13..14,
}, },
@ -55,9 +55,9 @@ Ok(
kwonlyargs: [ kwonlyargs: [
ParameterWithDefault { ParameterWithDefault {
range: 19..20, range: 19..20,
def: Parameter { parameter: Parameter {
range: 19..20, range: 19..20,
arg: Identifier { name: Identifier {
id: "d", id: "d",
range: 19..20, range: 19..20,
}, },
@ -67,9 +67,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 22..23, range: 22..23,
def: Parameter { parameter: Parameter {
range: 22..23, range: 22..23,
arg: Identifier { name: Identifier {
id: "e", id: "e",
range: 22..23, range: 22..23,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__lambda_pos_args.snap
View file

@ -16,9 +16,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 7..8, range: 7..8,
def: Parameter { parameter: Parameter {
range: 7..8, range: 7..8,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 7..8, range: 7..8,
}, },
@ -28,9 +28,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 10..11, range: 10..11,
def: Parameter { parameter: Parameter {
range: 10..11, range: 10..11,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 10..11, range: 10..11,
}, },
@ -40,9 +40,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 13..14, range: 13..14,
def: Parameter { parameter: Parameter {
range: 13..14, range: 13..14,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 13..14, range: 13..14,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__function__tests__lambda_pos_args_with_defaults.snap
View file

@ -16,9 +16,9 @@ Ok(
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 7..8, range: 7..8,
def: Parameter { parameter: Parameter {
range: 7..8, range: 7..8,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 7..8, range: 7..8,
}, },
@ -28,9 +28,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 10..14, range: 10..14,
def: Parameter { parameter: Parameter {
range: 10..11, range: 10..11,
arg: Identifier { name: Identifier {
id: "b", id: "b",
range: 10..11, range: 10..11,
}, },
@ -50,9 +50,9 @@ Ok(
}, },
ParameterWithDefault { ParameterWithDefault {
range: 16..20, range: 16..20,
def: Parameter { parameter: Parameter {
range: 16..17, range: 16..17,
arg: Identifier { name: Identifier {
id: "c", id: "c",
range: 16..17, range: 16..17,
}, },

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__match_as_identifier.snap
View file

@ -715,9 +715,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 598..603, range: 598..603,
def: Parameter { parameter: Parameter {
range: 598..603, range: 598..603,
arg: Identifier { name: Identifier {
id: "query", id: "query",
range: 598..603, range: 598..603,
}, },

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__parse_class.snap
View file

@ -41,9 +41,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 31..35, range: 31..35,
def: Parameter { parameter: Parameter {
range: 31..35, range: 31..35,
arg: Identifier { name: Identifier {
id: "self", id: "self",
range: 31..35, range: 31..35,
}, },
@ -81,9 +81,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 70..74, range: 70..74,
def: Parameter { parameter: Parameter {
range: 70..74, range: 70..74,
arg: Identifier { name: Identifier {
id: "self", id: "self",
range: 70..74, range: 70..74,
}, },
@ -93,9 +93,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
}, },
ParameterWithDefault { ParameterWithDefault {
range: 76..89, range: 76..89,
def: Parameter { parameter: Parameter {
range: 76..79, range: 76..79,
arg: Identifier { name: Identifier {
id: "arg", id: "arg",
range: 76..79, range: 76..79,
}, },

22
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__parse_function_definition.snap
View file

@ -16,9 +16,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 9..10, range: 9..10,
def: Parameter { parameter: Parameter {
range: 9..10, range: 9..10,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 9..10, range: 9..10,
}, },
@ -63,9 +63,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 34..38, range: 34..38,
def: Parameter { parameter: Parameter {
range: 34..38, range: 34..38,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 34..35, range: 34..35,
}, },
@ -137,9 +137,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 72..76, range: 72..76,
def: Parameter { parameter: Parameter {
range: 72..76, range: 72..76,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 72..73, range: 72..73,
}, },
@ -219,9 +219,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 119..123, range: 119..123,
def: Parameter { parameter: Parameter {
range: 119..123, range: 119..123,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 119..120, range: 119..120,
}, },
@ -317,7 +317,7 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
vararg: Some( vararg: Some(
Parameter { Parameter {
range: 155..161, range: 155..161,
arg: Identifier { name: Identifier {
id: "a", id: "a",
range: 155..156, range: 155..156,
}, },
@ -384,7 +384,7 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
vararg: Some( vararg: Some(
Parameter { Parameter {
range: 188..200, range: 188..200,
arg: Identifier { name: Identifier {
id: "args", id: "args",
range: 188..192, range: 188..192,
}, },
@ -413,7 +413,7 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
kwarg: Some( kwarg: Some(
Parameter { Parameter {
range: 204..220, range: 204..220,
arg: Identifier { name: Identifier {
id: "kwargs", id: "kwargs",
range: 204..210, range: 204..210,
}, },

8
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__parse_lambda.snap
View file

@ -15,9 +15,9 @@ expression: parse_ast
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 7..8, range: 7..8,
def: Parameter { parameter: Parameter {
range: 7..8, range: 7..8,
arg: Identifier { name: Identifier {
id: "x", id: "x",
range: 7..8, range: 7..8,
}, },
@ -27,9 +27,9 @@ expression: parse_ast
}, },
ParameterWithDefault { ParameterWithDefault {
range: 10..11, range: 10..11,
def: Parameter { parameter: Parameter {
range: 10..11, range: 10..11,
arg: Identifier { name: Identifier {
id: "y", id: "y",
range: 10..11, range: 10..11,
}, },

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__type_as_identifier.snap
View file

@ -651,9 +651,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [ args: [
ParameterWithDefault { ParameterWithDefault {
range: 514..519, range: 514..519,
def: Parameter { parameter: Parameter {
range: 514..519, range: 514..519,
arg: Identifier { name: Identifier {
id: "query", id: "query",
range: 514..519, range: 514..519,
}, },

2
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__variadic_generics.snap
View file

@ -17,7 +17,7 @@ expression: parse_ast
vararg: Some( vararg: Some(
Parameter { Parameter {
range: 20..29, range: 20..29,
arg: Identifier { name: Identifier {
id: "args", id: "args",
range: 20..24, range: 20..24,
}, },