mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-21 01:29:56 +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

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: [
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "a",
range: 9..10,
},
@ -31,9 +31,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "b",
range: 12..13,
},
@ -43,9 +43,9 @@ Ok(
},
ParameterWithDefault {
range: 15..16,
def: Parameter {
parameter: Parameter {
range: 15..16,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "a",
range: 9..10,
},
@ -31,9 +31,9 @@ Ok(
},
ParameterWithDefault {
range: 12..16,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "b",
range: 12..13,
},
@ -53,9 +53,9 @@ Ok(
},
ParameterWithDefault {
range: 18..22,
def: Parameter {
parameter: Parameter {
range: 18..19,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -41,9 +41,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "c",
range: 12..13,
},
@ -56,9 +56,9 @@ Ok(
kwonlyargs: [
ParameterWithDefault {
range: 18..19,
def: Parameter {
parameter: Parameter {
range: 18..19,
arg: Identifier {
name: Identifier {
id: "d",
range: 18..19,
},
@ -68,9 +68,9 @@ Ok(
},
ParameterWithDefault {
range: 21..22,
def: Parameter {
parameter: Parameter {
range: 21..22,
arg: Identifier {
name: Identifier {
id: "e",
range: 21..22,
},
@ -80,9 +80,9 @@ Ok(
},
ParameterWithDefault {
range: 24..25,
def: Parameter {
parameter: Parameter {
range: 24..25,
arg: Identifier {
name: Identifier {
id: "f",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -41,9 +41,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "c",
range: 12..13,
},
@ -56,9 +56,9 @@ Ok(
kwonlyargs: [
ParameterWithDefault {
range: 18..19,
def: Parameter {
parameter: Parameter {
range: 18..19,
arg: Identifier {
name: Identifier {
id: "d",
range: 18..19,
},
@ -68,9 +68,9 @@ Ok(
},
ParameterWithDefault {
range: 21..25,
def: Parameter {
parameter: Parameter {
range: 21..22,
arg: Identifier {
name: Identifier {
id: "e",
range: 21..22,
},
@ -90,9 +90,9 @@ Ok(
},
ParameterWithDefault {
range: 27..31,
def: Parameter {
parameter: Parameter {
range: 27..28,
arg: Identifier {
name: Identifier {
id: "f",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -41,9 +41,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "c",
range: 12..13,
},
@ -55,7 +55,7 @@ Ok(
vararg: Some(
Parameter {
range: 16..20,
arg: Identifier {
name: Identifier {
id: "args",
range: 16..20,
},
@ -65,9 +65,9 @@ Ok(
kwonlyargs: [
ParameterWithDefault {
range: 22..23,
def: Parameter {
parameter: Parameter {
range: 22..23,
arg: Identifier {
name: Identifier {
id: "d",
range: 22..23,
},
@ -77,9 +77,9 @@ Ok(
},
ParameterWithDefault {
range: 25..29,
def: Parameter {
parameter: Parameter {
range: 25..26,
arg: Identifier {
name: Identifier {
id: "e",
range: 25..26,
},
@ -99,9 +99,9 @@ Ok(
},
ParameterWithDefault {
range: 31..35,
def: Parameter {
parameter: Parameter {
range: 31..32,
arg: Identifier {
name: Identifier {
id: "f",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -41,9 +41,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "c",
range: 12..13,
},
@ -55,7 +55,7 @@ Ok(
vararg: Some(
Parameter {
range: 16..20,
arg: Identifier {
name: Identifier {
id: "args",
range: 16..20,
},
@ -65,9 +65,9 @@ Ok(
kwonlyargs: [
ParameterWithDefault {
range: 22..23,
def: Parameter {
parameter: Parameter {
range: 22..23,
arg: Identifier {
name: Identifier {
id: "d",
range: 22..23,
},
@ -77,9 +77,9 @@ Ok(
},
ParameterWithDefault {
range: 25..29,
def: Parameter {
parameter: Parameter {
range: 25..26,
arg: Identifier {
name: Identifier {
id: "e",
range: 25..26,
},
@ -99,9 +99,9 @@ Ok(
},
ParameterWithDefault {
range: 31..35,
def: Parameter {
parameter: Parameter {
range: 31..32,
arg: Identifier {
name: Identifier {
id: "f",
range: 31..32,
},
@ -123,7 +123,7 @@ Ok(
kwarg: Some(
Parameter {
range: 39..45,
arg: Identifier {
name: Identifier {
id: "kwargs",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -41,9 +41,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..13,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -51,9 +51,9 @@ Ok(
},
ParameterWithDefault {
range: 15..19,
def: Parameter {
parameter: Parameter {
range: 15..16,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 6..7,
def: Parameter {
parameter: Parameter {
range: 6..7,
arg: Identifier {
name: Identifier {
id: "a",
range: 6..7,
},
@ -29,9 +29,9 @@ Ok(
},
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "b",
range: 9..10,
},
@ -41,9 +41,9 @@ Ok(
},
ParameterWithDefault {
range: 12..13,
def: Parameter {
parameter: Parameter {
range: 12..13,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 10..11,
def: Parameter {
parameter: Parameter {
range: 10..11,
arg: Identifier {
name: Identifier {
id: "a",
range: 10..11,
},
@ -30,9 +30,9 @@ Ok(
},
ParameterWithDefault {
range: 13..14,
def: Parameter {
parameter: Parameter {
range: 13..14,
arg: Identifier {
name: Identifier {
id: "b",
range: 13..14,
},
@ -42,9 +42,9 @@ Ok(
},
ParameterWithDefault {
range: 16..17,
def: Parameter {
parameter: Parameter {
range: 16..17,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 10..11,
def: Parameter {
parameter: Parameter {
range: 10..11,
arg: Identifier {
name: Identifier {
id: "a",
range: 10..11,
},
@ -30,9 +30,9 @@ Ok(
},
ParameterWithDefault {
range: 13..17,
def: Parameter {
parameter: Parameter {
range: 13..14,
arg: Identifier {
name: Identifier {
id: "b",
range: 13..14,
},
@ -52,9 +52,9 @@ Ok(
},
ParameterWithDefault {
range: 19..23,
def: Parameter {
parameter: Parameter {
range: 19..20,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 7..8,
def: Parameter {
parameter: Parameter {
range: 7..8,
arg: Identifier {
name: Identifier {
id: "a",
range: 7..8,
},
@ -28,9 +28,9 @@ Ok(
},
ParameterWithDefault {
range: 10..11,
def: Parameter {
parameter: Parameter {
range: 10..11,
arg: Identifier {
name: Identifier {
id: "b",
range: 10..11,
},
@ -40,9 +40,9 @@ Ok(
},
ParameterWithDefault {
range: 13..14,
def: Parameter {
parameter: Parameter {
range: 13..14,
arg: Identifier {
name: Identifier {
id: "c",
range: 13..14,
},
@ -55,9 +55,9 @@ Ok(
kwonlyargs: [
ParameterWithDefault {
range: 19..20,
def: Parameter {
parameter: Parameter {
range: 19..20,
arg: Identifier {
name: Identifier {
id: "d",
range: 19..20,
},
@ -67,9 +67,9 @@ Ok(
},
ParameterWithDefault {
range: 22..23,
def: Parameter {
parameter: Parameter {
range: 22..23,
arg: Identifier {
name: Identifier {
id: "e",
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: [
ParameterWithDefault {
range: 7..8,
def: Parameter {
parameter: Parameter {
range: 7..8,
arg: Identifier {
name: Identifier {
id: "a",
range: 7..8,
},
@ -28,9 +28,9 @@ Ok(
},
ParameterWithDefault {
range: 10..11,
def: Parameter {
parameter: Parameter {
range: 10..11,
arg: Identifier {
name: Identifier {
id: "b",
range: 10..11,
},
@ -40,9 +40,9 @@ Ok(
},
ParameterWithDefault {
range: 13..14,
def: Parameter {
parameter: Parameter {
range: 13..14,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 7..8,
def: Parameter {
parameter: Parameter {
range: 7..8,
arg: Identifier {
name: Identifier {
id: "a",
range: 7..8,
},
@ -28,9 +28,9 @@ Ok(
},
ParameterWithDefault {
range: 10..14,
def: Parameter {
parameter: Parameter {
range: 10..11,
arg: Identifier {
name: Identifier {
id: "b",
range: 10..11,
},
@ -50,9 +50,9 @@ Ok(
},
ParameterWithDefault {
range: 16..20,
def: Parameter {
parameter: Parameter {
range: 16..17,
arg: Identifier {
name: Identifier {
id: "c",
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: [
ParameterWithDefault {
range: 598..603,
def: Parameter {
parameter: Parameter {
range: 598..603,
arg: Identifier {
name: Identifier {
id: "query",
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: [
ParameterWithDefault {
range: 31..35,
def: Parameter {
parameter: Parameter {
range: 31..35,
arg: Identifier {
name: Identifier {
id: "self",
range: 31..35,
},
@ -81,9 +81,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [
ParameterWithDefault {
range: 70..74,
def: Parameter {
parameter: Parameter {
range: 70..74,
arg: Identifier {
name: Identifier {
id: "self",
range: 70..74,
},
@ -93,9 +93,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
},
ParameterWithDefault {
range: 76..89,
def: Parameter {
parameter: Parameter {
range: 76..79,
arg: Identifier {
name: Identifier {
id: "arg",
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: [
ParameterWithDefault {
range: 9..10,
def: Parameter {
parameter: Parameter {
range: 9..10,
arg: Identifier {
name: Identifier {
id: "a",
range: 9..10,
},
@ -63,9 +63,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [
ParameterWithDefault {
range: 34..38,
def: Parameter {
parameter: Parameter {
range: 34..38,
arg: Identifier {
name: Identifier {
id: "a",
range: 34..35,
},
@ -137,9 +137,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [
ParameterWithDefault {
range: 72..76,
def: Parameter {
parameter: Parameter {
range: 72..76,
arg: Identifier {
name: Identifier {
id: "a",
range: 72..73,
},
@ -219,9 +219,9 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
args: [
ParameterWithDefault {
range: 119..123,
def: Parameter {
parameter: Parameter {
range: 119..123,
arg: Identifier {
name: Identifier {
id: "a",
range: 119..120,
},
@ -317,7 +317,7 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
vararg: Some(
Parameter {
range: 155..161,
arg: Identifier {
name: Identifier {
id: "a",
range: 155..156,
},
@ -384,7 +384,7 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
vararg: Some(
Parameter {
range: 188..200,
arg: Identifier {
name: Identifier {
id: "args",
range: 188..192,
},
@ -413,7 +413,7 @@ expression: "parse_suite(source, \"<test>\").unwrap()"
kwarg: Some(
Parameter {
range: 204..220,
arg: Identifier {
name: Identifier {
id: "kwargs",
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: [
ParameterWithDefault {
range: 7..8,
def: Parameter {
parameter: Parameter {
range: 7..8,
arg: Identifier {
name: Identifier {
id: "x",
range: 7..8,
},
@ -27,9 +27,9 @@ expression: parse_ast
},
ParameterWithDefault {
range: 10..11,
def: Parameter {
parameter: Parameter {
range: 10..11,
arg: Identifier {
name: Identifier {
id: "y",
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: [
ParameterWithDefault {
range: 514..519,
def: Parameter {
parameter: Parameter {
range: 514..519,
arg: Identifier {
name: Identifier {
id: "query",
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(
Parameter {
range: 20..29,
arg: Identifier {
name: Identifier {
id: "args",
range: 20..24,
},