mirror of
https://github.com/astral-sh/ruff.git
synced 2025-11-02 12:58:27 +00:00
[ty] Shrink size of AstNodeRef (#20028)
## Summary Removes the `module_ptr` field from `AstNodeRef` in release mode, and change `NodeIndex` to a `NonZeroU32` to reduce the size of `Option<AstNodeRef<_>>` fields. I believe CI runs in debug mode, so this won't show up in the memory report, but this reduces memory by ~2% in release mode.
This commit is contained in:
Ibraheem Ahmed
GitHub
parent
886c4e4773
commit
7abc41727b
648 changed files with 19641 additions and 20364 deletions
|
|
@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/valid/statement/raise.py
|
|||
```
|
||||
Module(
|
||||
ModModule {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 0..289,
|
||||
body: [
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 8..13,
|
||||
exc: None,
|
||||
cause: None,
|
||||
|
|
@ -20,12 +20,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 14..21,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 20..21,
|
||||
id: Name("a"),
|
||||
ctx: Load,
|
||||
|
|
@ -37,17 +37,17 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 22..34,
|
||||
exc: Some(
|
||||
Tuple(
|
||||
ExprTuple {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 28..34,
|
||||
elts: [
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 29..30,
|
||||
id: Name("a"),
|
||||
ctx: Load,
|
||||
|
|
@ -55,7 +55,7 @@ Module(
|
|||
),
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 32..33,
|
||||
id: Name("b"),
|
||||
ctx: Load,
|
||||
|
|
@ -72,16 +72,16 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 35..46,
|
||||
exc: Some(
|
||||
Compare(
|
||||
ExprCompare {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 41..46,
|
||||
left: NumberLiteral(
|
||||
ExprNumberLiteral {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 41..42,
|
||||
value: Int(
|
||||
1,
|
||||
|
|
@ -94,7 +94,7 @@ Module(
|
|||
comparators: [
|
||||
NumberLiteral(
|
||||
ExprNumberLiteral {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 45..46,
|
||||
value: Int(
|
||||
2,
|
||||
|
|
@ -110,18 +110,18 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 47..60,
|
||||
exc: Some(
|
||||
BoolOp(
|
||||
ExprBoolOp {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 53..60,
|
||||
op: And,
|
||||
values: [
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 53..54,
|
||||
id: Name("a"),
|
||||
ctx: Load,
|
||||
|
|
@ -129,7 +129,7 @@ Module(
|
|||
),
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 59..60,
|
||||
id: Name("b"),
|
||||
ctx: Load,
|
||||
|
|
@ -144,31 +144,29 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 61..78,
|
||||
exc: Some(
|
||||
Lambda(
|
||||
ExprLambda {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 67..78,
|
||||
parameters: Some(
|
||||
Parameters {
|
||||
range: 74..75,
|
||||
node_index: AtomicNodeIndex(
|
||||
0,
|
||||
),
|
||||
node_index: NodeIndex(None),
|
||||
posonlyargs: [],
|
||||
args: [
|
||||
ParameterWithDefault {
|
||||
range: 74..75,
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
parameter: Parameter {
|
||||
range: 74..75,
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
name: Identifier {
|
||||
id: Name("x"),
|
||||
range: 74..75,
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
},
|
||||
annotation: None,
|
||||
},
|
||||
|
|
@ -182,7 +180,7 @@ Module(
|
|||
),
|
||||
body: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 77..78,
|
||||
id: Name("y"),
|
||||
ctx: Load,
|
||||
|
|
@ -196,16 +194,16 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 79..92,
|
||||
exc: Some(
|
||||
Await(
|
||||
ExprAwait {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 85..92,
|
||||
value: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 91..92,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -219,23 +217,23 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 93..115,
|
||||
exc: Some(
|
||||
If(
|
||||
ExprIf {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 99..115,
|
||||
test: BooleanLiteral(
|
||||
ExprBooleanLiteral {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 104..108,
|
||||
value: true,
|
||||
},
|
||||
),
|
||||
body: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 99..100,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -243,7 +241,7 @@ Module(
|
|||
),
|
||||
orelse: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 114..115,
|
||||
id: Name("y"),
|
||||
ctx: Load,
|
||||
|
|
@ -257,12 +255,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 138..152,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 144..145,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -272,7 +270,7 @@ Module(
|
|||
cause: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 151..152,
|
||||
id: Name("a"),
|
||||
ctx: Load,
|
||||
|
|
@ -283,12 +281,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 153..172,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 159..160,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -298,12 +296,12 @@ Module(
|
|||
cause: Some(
|
||||
Tuple(
|
||||
ExprTuple {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 166..172,
|
||||
elts: [
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 167..168,
|
||||
id: Name("a"),
|
||||
ctx: Load,
|
||||
|
|
@ -311,7 +309,7 @@ Module(
|
|||
),
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 170..171,
|
||||
id: Name("b"),
|
||||
ctx: Load,
|
||||
|
|
@ -327,12 +325,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 173..191,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 179..180,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -342,11 +340,11 @@ Module(
|
|||
cause: Some(
|
||||
Compare(
|
||||
ExprCompare {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 186..191,
|
||||
left: NumberLiteral(
|
||||
ExprNumberLiteral {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 186..187,
|
||||
value: Int(
|
||||
1,
|
||||
|
|
@ -359,7 +357,7 @@ Module(
|
|||
comparators: [
|
||||
NumberLiteral(
|
||||
ExprNumberLiteral {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 190..191,
|
||||
value: Int(
|
||||
2,
|
||||
|
|
@ -374,12 +372,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 192..212,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 198..199,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -389,13 +387,13 @@ Module(
|
|||
cause: Some(
|
||||
BoolOp(
|
||||
ExprBoolOp {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 205..212,
|
||||
op: And,
|
||||
values: [
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 205..206,
|
||||
id: Name("a"),
|
||||
ctx: Load,
|
||||
|
|
@ -403,7 +401,7 @@ Module(
|
|||
),
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 211..212,
|
||||
id: Name("b"),
|
||||
ctx: Load,
|
||||
|
|
@ -417,12 +415,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 213..237,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 219..220,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -432,26 +430,24 @@ Module(
|
|||
cause: Some(
|
||||
Lambda(
|
||||
ExprLambda {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 226..237,
|
||||
parameters: Some(
|
||||
Parameters {
|
||||
range: 233..234,
|
||||
node_index: AtomicNodeIndex(
|
||||
0,
|
||||
),
|
||||
node_index: NodeIndex(None),
|
||||
posonlyargs: [],
|
||||
args: [
|
||||
ParameterWithDefault {
|
||||
range: 233..234,
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
parameter: Parameter {
|
||||
range: 233..234,
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
name: Identifier {
|
||||
id: Name("x"),
|
||||
range: 233..234,
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
},
|
||||
annotation: None,
|
||||
},
|
||||
|
|
@ -465,7 +461,7 @@ Module(
|
|||
),
|
||||
body: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 236..237,
|
||||
id: Name("y"),
|
||||
ctx: Load,
|
||||
|
|
@ -478,12 +474,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 238..258,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 244..245,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -493,11 +489,11 @@ Module(
|
|||
cause: Some(
|
||||
Await(
|
||||
ExprAwait {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 251..258,
|
||||
value: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 257..258,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -510,12 +506,12 @@ Module(
|
|||
),
|
||||
Raise(
|
||||
StmtRaise {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 259..288,
|
||||
exc: Some(
|
||||
Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 265..266,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -525,18 +521,18 @@ Module(
|
|||
cause: Some(
|
||||
If(
|
||||
ExprIf {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 272..288,
|
||||
test: BooleanLiteral(
|
||||
ExprBooleanLiteral {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 277..281,
|
||||
value: true,
|
||||
},
|
||||
),
|
||||
body: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 272..273,
|
||||
id: Name("x"),
|
||||
ctx: Load,
|
||||
|
|
@ -544,7 +540,7 @@ Module(
|
|||
),
|
||||
orelse: Name(
|
||||
ExprName {
|
||||
node_index: AtomicNodeIndex(..),
|
||||
node_index: NodeIndex(None),
|
||||
range: 287..288,
|
||||
id: Name("y"),
|
||||
ctx: Load,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue