mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-20 02:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove Expr postfix from ExprNamed, ExprIf, and ExprGenerator (#10229)

Browse source 
The expression types in our AST are called `ExprYield`, `ExprAwait`,
`ExprStringLiteral` etc, except `ExprNamedExpr`, `ExprIfExpr` and
`ExprGenratorExpr`. This seems to align with [Python AST's
naming](https://docs.python.org/3/library/ast.html) but feels
inconsistent and excessive.

This PR removes the `Expr` postfix from `ExprNamedExpr`, `ExprIfExpr`,
and `ExprGeneratorExpr`.
This commit is contained in:
Micha Reiser 2024-03-04 12:55:01 +01:00 • committed by GitHub
parent 8b749e1d4d
commit 184241f99a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
64 changed files with 418 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,8 @@ expression: parse_ast
If(
StmtIf {
range: 0..14,
test: NamedExpr(
ExprNamedExpr {
test: Named(
ExprNamed {
range: 3..8,
target: Name(
ExprName {

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

@ -7,8 +7,8 @@ Ok(
Expr(
StmtExpr {
range: 0..8,
value: NamedExpr(
ExprNamedExpr {
value: Named(
ExprNamed {
range: 1..7,
target: Name(
ExprName {

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

@ -32,8 +32,8 @@ Call(
arguments: Arguments {
range: 8..141,
args: [
GeneratorExp(
ExprGeneratorExp {
Generator(
ExprGenerator {
range: 14..139,
elt: Name(
ExprName {
@ -56,8 +56,8 @@ Call(
ExprTuple {
range: 33..139,
elts: [
IfExp(
ExprIfExp {
If(
ExprIf {
range: 43..80,
test: Name(
ExprName {
@ -100,8 +100,8 @@ Call(
),
},
),
IfExp(
ExprIfExp {
If(
ExprIf {
range: 90..132,
test: Name(
ExprName {

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

@ -623,8 +623,8 @@ expression: parse_suite(source).unwrap()
If(
StmtIf {
range: 508..527,
test: NamedExpr(
ExprNamedExpr {
test: Named(
ExprNamed {
range: 511..521,
target: Name(
ExprName {

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

@ -2,8 +2,8 @@
source: crates/ruff_python_parser/src/parser.rs
expression: parse_ast
---
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 1..15,
target: Name(
ExprName {

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

@ -311,8 +311,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 164..170,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 164..170,
target: Name(
ExprName {
@ -350,8 +350,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 183..196,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 184..190,
target: Name(
ExprName {
@ -423,8 +423,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 226..234,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 227..233,
target: Name(
ExprName {
@ -481,8 +481,8 @@ expression: parse_suite(source).unwrap()
},
WithItem {
range: 256..264,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 257..263,
target: Name(
ExprName {
@ -531,8 +531,8 @@ expression: parse_suite(source).unwrap()
},
WithItem {
range: 281..289,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 282..288,
target: Name(
ExprName {

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

@ -2,8 +2,8 @@
source: crates/ruff_python_parser/src/parser.rs
expression: parse_ast
---
GeneratorExp(
ExprGeneratorExp {
Generator(
ExprGenerator {
range: 0..14,
elt: Name(
ExprName {

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

@ -2,11 +2,11 @@
source: crates/ruff_python_parser/src/parser.rs
expression: parse_ast
---
GeneratorExp(
ExprGeneratorExp {
Generator(
ExprGenerator {
range: 0..26,
elt: IfExp(
ExprIfExp {
elt: If(
ExprIf {
range: 1..14,
test: Name(
ExprName {

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

@ -2,11 +2,11 @@
source: crates/ruff_python_parser/src/parser.rs
expression: parse_ast
---
GeneratorExp(
ExprGeneratorExp {
Generator(
ExprGenerator {
range: 0..23,
elt: NamedExpr(
ExprNamedExpr {
elt: Named(
ExprNamed {
range: 1..11,
target: Name(
ExprName {

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

@ -1846,8 +1846,8 @@ expression: parse_ast
},
),
guard: Some(
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 1472..1482,
target: Name(
ExprName {
@ -3620,8 +3620,8 @@ expression: parse_ast
ExprTuple {
range: 2789..2796,
elts: [
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 2789..2795,
target: Name(
ExprName {

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

@ -623,8 +623,8 @@ expression: parse_suite(source).unwrap()
If(
StmtIf {
range: 481..499,
test: NamedExpr(
ExprNamedExpr {
test: Named(
ExprNamed {
range: 484..493,
target: Name(
ExprName {

32
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__with_statement.snap
View file

@ -166,8 +166,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 78..91,
context_expr: IfExp(
ExprIfExp {
context_expr: If(
ExprIf {
range: 78..91,
test: NumberLiteral(
ExprNumberLiteral {
@ -214,8 +214,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 103..121,
context_expr: IfExp(
ExprIfExp {
context_expr: If(
ExprIf {
range: 103..116,
test: NumberLiteral(
ExprNumberLiteral {
@ -752,8 +752,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 362..368,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 362..368,
target: Name(
ExprName {
@ -791,8 +791,8 @@ expression: parse_suite(source).unwrap()
items: [
WithItem {
range: 381..394,
context_expr: NamedExpr(
ExprNamedExpr {
context_expr: Named(
ExprNamed {
range: 382..388,
target: Name(
ExprName {
@ -842,8 +842,8 @@ expression: parse_suite(source).unwrap()
ExprTuple {
range: 406..422,
elts: [
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 407..413,
target: Name(
ExprName {
@ -862,8 +862,8 @@ expression: parse_suite(source).unwrap()
),
},
),
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 415..421,
target: Name(
ExprName {
@ -910,8 +910,8 @@ expression: parse_suite(source).unwrap()
ExprTuple {
range: 434..450,
elts: [
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 435..441,
target: Name(
ExprName {
@ -930,8 +930,8 @@ expression: parse_suite(source).unwrap()
),
},
),
NamedExpr(
ExprNamedExpr {
Named(
ExprNamed {
range: 443..449,
target: Name(
ExprName {